From d683df86cf19b95116f60cb60b96c2f7fb271fd0 Mon Sep 17 00:00:00 2001 From: wrider Date: Thu, 12 Sep 2019 00:11:22 -0400 Subject: [PATCH] Fix chart verify job errot for aaf and portal charts Verify job lints chart individually, not as in hirechy. Thus each subchart's value should contain ALL global values thtat are used in templates. Change-Id: I9c837bcc520954c1ac791cc95a55d92924919f59 Signed-off-by: wrider --- .../helm/aaf/charts/aaf-cass/values.yaml | 77 ++++++++++++++++++++++ .../helm/aaf/charts/aaf-cm/values.yaml | 77 +++++++++++++++++++++- .../helm/aaf/charts/aaf-fs/values.yaml | 77 +++++++++++++++++++++- .../helm/aaf/charts/aaf-gui/values.yaml | 77 +++++++++++++++++++++- .../helm/aaf/charts/aaf-hello/values.yaml | 75 +++++++++++++++++++++ .../helm/aaf/charts/aaf-locate/values.yaml | 77 +++++++++++++++++++++- .../helm/aaf/charts/aaf-oauth/values.yaml | 75 +++++++++++++++++++++ .../helm/aaf/charts/aaf-service/values.yaml | 73 +++++++++++++++++++- .../aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml | 23 +++++++ .../charts/aaf-sshsm-distcenter/values.yaml | 21 ++++++ .../aaf-sshsm/charts/aaf-sshsm-testca/values.yaml | 23 +++++++ .../helm/aaf/charts/aaf-sshsm/values.yaml | 70 ++++++++++++++++++++ .../helm/portal/charts/portal-app/values.yaml | 11 ++++ .../helm/portal/charts/portal-sdk/values.yaml | 12 ++++ 14 files changed, 762 insertions(+), 6 deletions(-) diff --git a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cass/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cass/values.yaml index ee05a195..d821b410 100755 --- a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cass/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cass/values.yaml @@ -17,6 +17,83 @@ ################################################################# global: nodePortPrefix: 302 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.2 + ubuntuInitRepository: registry.hub.docker.com + ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 + persistence: + enabled: true + # Standard OOM + pullPolicy: "Always" + repository: "nexus3.onap.org:10001" + + # Use Local + #pullPolicy: IfNotPresent + #repository: "nexus3.onap.org:10003" + + aaf: + readiness: false + image: onap/aaf/aaf_core:2.1.15 + aaf_env: "DEV" + public_fqdn: "aaf.osaaf.org" + aaf_release: "El Alto" + # DUBLIN ONLY - for M4 compatibility with Casablanca + # aaf_locator_name: "public.%NS.%N" + # aaf_locator_name_oom: "%NS.%N" + # EL ALTO and Beyond + aaf_locator_name: "%NS.%N" + aaf_locator_name_oom: "%CNS.%NS.%N" + cadi_latitude: "38.0" + cadi_longitude: "-72.0" + cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US" + + config: + image: onap/aaf/aaf_config:2.1.15 + cass: + replicas: 1 + image: onap/aaf/aaf_cass:2.1.15 + fqdn: "aaf-cass" + cluster_name: "osaaf" + heap_new_size: "512M" + max_heap_size: "1024M" + storage_port: 7000 + ssl_storage_port: 7001 + native_trans_port: 9042 + rpc_port: 9160 + dc: "dc1" + service: + replicas: 1 + fqdn: "aaf-service" + internal_port: 8100 + public_port: 31110 + locate: + replicas: 1 + fqdn: "aaf-locate" + internal_port: 8095 + public_port: 31111 + oauth: + replicas: 1 + fqdn: "aaf0oauth" + internal_port: 8140 + public_port: 31112 + gui: + replicas: 1 + fqdn: "aaf-gui" + internal_port: 8200 + public_port: 31113 + cm: + replicas: 1 + fqdn: "aaf-cm" + internal_port: 8150 + public_port: 31114 + fs: + replicas: 1 + fqdn: "aaf-fs" + internal_port: 8096 + public_port: 31115 + hello: + replicas: 0 + flavor: small ################################################################# diff --git a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cm/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cm/values.yaml index 6ace7d11..773fdfe6 100755 --- a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cm/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-cm/values.yaml @@ -18,7 +18,82 @@ global: nodePortPrefix: 302 readinessRepository: oomk8s - readinessImage: readiness-check:2.0.0 + readinessImage: readiness-check:2.0.2 + ubuntuInitRepository: registry.hub.docker.com + ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 + persistence: + enabled: true + # Standard OOM + pullPolicy: "Always" + repository: "nexus3.onap.org:10001" + + # Use Local + #pullPolicy: IfNotPresent + #repository: "nexus3.onap.org:10003" + + aaf: + readiness: false + image: onap/aaf/aaf_core:2.1.15 + aaf_env: "DEV" + public_fqdn: "aaf.osaaf.org" + aaf_release: "El Alto" + # DUBLIN ONLY - for M4 compatibility with Casablanca + # aaf_locator_name: "public.%NS.%N" + # aaf_locator_name_oom: "%NS.%N" + # EL ALTO and Beyond + aaf_locator_name: "%NS.%N" + aaf_locator_name_oom: "%CNS.%NS.%N" + cadi_latitude: "38.0" + cadi_longitude: "-72.0" + cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US" + + config: + image: onap/aaf/aaf_config:2.1.15 + cass: + replicas: 1 + image: onap/aaf/aaf_cass:2.1.15 + fqdn: "aaf-cass" + cluster_name: "osaaf" + heap_new_size: "512M" + max_heap_size: "1024M" + storage_port: 7000 + ssl_storage_port: 7001 + native_trans_port: 9042 + rpc_port: 9160 + dc: "dc1" + service: + replicas: 1 + fqdn: "aaf-service" + internal_port: 8100 + public_port: 31110 + locate: + replicas: 1 + fqdn: "aaf-locate" + internal_port: 8095 + public_port: 31111 + oauth: + replicas: 1 + fqdn: "aaf0oauth" + internal_port: 8140 + public_port: 31112 + gui: + replicas: 1 + fqdn: "aaf-gui" + internal_port: 8200 + public_port: 31113 + cm: + replicas: 1 + fqdn: "aaf-cm" + internal_port: 8150 + public_port: 31114 + fs: + replicas: 1 + fqdn: "aaf-fs" + internal_port: 8096 + public_port: 31115 + hello: + replicas: 0 + flavor: small ################################################################# # Application configuration defaults. diff --git a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-fs/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-fs/values.yaml index 48ad7c10..b3a14ce4 100755 --- a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-fs/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-fs/values.yaml @@ -18,7 +18,82 @@ global: nodePortPrefix: 302 readinessRepository: oomk8s - readinessImage: readiness-check:2.0.0 + readinessImage: readiness-check:2.0.2 + ubuntuInitRepository: registry.hub.docker.com + ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 + persistence: + enabled: true + # Standard OOM + pullPolicy: "Always" + repository: "nexus3.onap.org:10001" + + # Use Local + #pullPolicy: IfNotPresent + #repository: "nexus3.onap.org:10003" + + aaf: + readiness: false + image: onap/aaf/aaf_core:2.1.15 + aaf_env: "DEV" + public_fqdn: "aaf.osaaf.org" + aaf_release: "El Alto" + # DUBLIN ONLY - for M4 compatibility with Casablanca + # aaf_locator_name: "public.%NS.%N" + # aaf_locator_name_oom: "%NS.%N" + # EL ALTO and Beyond + aaf_locator_name: "%NS.%N" + aaf_locator_name_oom: "%CNS.%NS.%N" + cadi_latitude: "38.0" + cadi_longitude: "-72.0" + cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US" + + config: + image: onap/aaf/aaf_config:2.1.15 + cass: + replicas: 1 + image: onap/aaf/aaf_cass:2.1.15 + fqdn: "aaf-cass" + cluster_name: "osaaf" + heap_new_size: "512M" + max_heap_size: "1024M" + storage_port: 7000 + ssl_storage_port: 7001 + native_trans_port: 9042 + rpc_port: 9160 + dc: "dc1" + service: + replicas: 1 + fqdn: "aaf-service" + internal_port: 8100 + public_port: 31110 + locate: + replicas: 1 + fqdn: "aaf-locate" + internal_port: 8095 + public_port: 31111 + oauth: + replicas: 1 + fqdn: "aaf0oauth" + internal_port: 8140 + public_port: 31112 + gui: + replicas: 1 + fqdn: "aaf-gui" + internal_port: 8200 + public_port: 31113 + cm: + replicas: 1 + fqdn: "aaf-cm" + internal_port: 8150 + public_port: 31114 + fs: + replicas: 1 + fqdn: "aaf-fs" + internal_port: 8096 + public_port: 31115 + hello: + replicas: 0 + flavor: small ################################################################# # Application configuration defaults. diff --git a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-gui/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-gui/values.yaml index 3068f14e..13ba96f2 100755 --- a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-gui/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-gui/values.yaml @@ -19,7 +19,82 @@ global: nodePortPrefix: 302 readinessRepository: oomk8s - readinessImage: readiness-check:2.0.0 + readinessImage: readiness-check:2.0.2 + ubuntuInitRepository: registry.hub.docker.com + ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 + persistence: + enabled: true + # Standard OOM + pullPolicy: "Always" + repository: "nexus3.onap.org:10001" + + # Use Local + #pullPolicy: IfNotPresent + #repository: "nexus3.onap.org:10003" + + aaf: + readiness: false + image: onap/aaf/aaf_core:2.1.15 + aaf_env: "DEV" + public_fqdn: "aaf.osaaf.org" + aaf_release: "El Alto" + # DUBLIN ONLY - for M4 compatibility with Casablanca + # aaf_locator_name: "public.%NS.%N" + # aaf_locator_name_oom: "%NS.%N" + # EL ALTO and Beyond + aaf_locator_name: "%NS.%N" + aaf_locator_name_oom: "%CNS.%NS.%N" + cadi_latitude: "38.0" + cadi_longitude: "-72.0" + cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US" + + config: + image: onap/aaf/aaf_config:2.1.15 + cass: + replicas: 1 + image: onap/aaf/aaf_cass:2.1.15 + fqdn: "aaf-cass" + cluster_name: "osaaf" + heap_new_size: "512M" + max_heap_size: "1024M" + storage_port: 7000 + ssl_storage_port: 7001 + native_trans_port: 9042 + rpc_port: 9160 + dc: "dc1" + service: + replicas: 1 + fqdn: "aaf-service" + internal_port: 8100 + public_port: 31110 + locate: + replicas: 1 + fqdn: "aaf-locate" + internal_port: 8095 + public_port: 31111 + oauth: + replicas: 1 + fqdn: "aaf0oauth" + internal_port: 8140 + public_port: 31112 + gui: + replicas: 1 + fqdn: "aaf-gui" + internal_port: 8200 + public_port: 31113 + cm: + replicas: 1 + fqdn: "aaf-cm" + internal_port: 8150 + public_port: 31114 + fs: + replicas: 1 + fqdn: "aaf-fs" + internal_port: 8096 + public_port: 31115 + hello: + replicas: 0 + flavor: small ################################################################# # Application configuration defaults. diff --git a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-hello/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-hello/values.yaml index ea6665c6..e23281f7 100755 --- a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-hello/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-hello/values.yaml @@ -19,6 +19,81 @@ global: nodePortPrefix: 302 readinessRepository: oomk8s readinessImage: readiness-check:2.0.2 + ubuntuInitRepository: registry.hub.docker.com + ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 + persistence: + enabled: true + # Standard OOM + pullPolicy: "Always" + repository: "nexus3.onap.org:10001" + + # Use Local + #pullPolicy: IfNotPresent + #repository: "nexus3.onap.org:10003" + + aaf: + readiness: false + image: onap/aaf/aaf_core:2.1.15 + aaf_env: "DEV" + public_fqdn: "aaf.osaaf.org" + aaf_release: "El Alto" + # DUBLIN ONLY - for M4 compatibility with Casablanca + # aaf_locator_name: "public.%NS.%N" + # aaf_locator_name_oom: "%NS.%N" + # EL ALTO and Beyond + aaf_locator_name: "%NS.%N" + aaf_locator_name_oom: "%CNS.%NS.%N" + cadi_latitude: "38.0" + cadi_longitude: "-72.0" + cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US" + + config: + image: onap/aaf/aaf_config:2.1.15 + cass: + replicas: 1 + image: onap/aaf/aaf_cass:2.1.15 + fqdn: "aaf-cass" + cluster_name: "osaaf" + heap_new_size: "512M" + max_heap_size: "1024M" + storage_port: 7000 + ssl_storage_port: 7001 + native_trans_port: 9042 + rpc_port: 9160 + dc: "dc1" + service: + replicas: 1 + fqdn: "aaf-service" + internal_port: 8100 + public_port: 31110 + locate: + replicas: 1 + fqdn: "aaf-locate" + internal_port: 8095 + public_port: 31111 + oauth: + replicas: 1 + fqdn: "aaf0oauth" + internal_port: 8140 + public_port: 31112 + gui: + replicas: 1 + fqdn: "aaf-gui" + internal_port: 8200 + public_port: 31113 + cm: + replicas: 1 + fqdn: "aaf-cm" + internal_port: 8150 + public_port: 31114 + fs: + replicas: 1 + fqdn: "aaf-fs" + internal_port: 8096 + public_port: 31115 + hello: + replicas: 0 + flavor: small ################################################################# # Application configuration defaults. diff --git a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-locate/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-locate/values.yaml index c13f8349..69abcae0 100755 --- a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-locate/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-locate/values.yaml @@ -18,7 +18,82 @@ global: nodePortPrefix: 302 readinessRepository: oomk8s - readinessImage: readiness-check:2.0.0 + readinessImage: readiness-check:2.0.2 + ubuntuInitRepository: registry.hub.docker.com + ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 + persistence: + enabled: true + # Standard OOM + pullPolicy: "Always" + repository: "nexus3.onap.org:10001" + + # Use Local + #pullPolicy: IfNotPresent + #repository: "nexus3.onap.org:10003" + + aaf: + readiness: false + image: onap/aaf/aaf_core:2.1.15 + aaf_env: "DEV" + public_fqdn: "aaf.osaaf.org" + aaf_release: "El Alto" + # DUBLIN ONLY - for M4 compatibility with Casablanca + # aaf_locator_name: "public.%NS.%N" + # aaf_locator_name_oom: "%NS.%N" + # EL ALTO and Beyond + aaf_locator_name: "%NS.%N" + aaf_locator_name_oom: "%CNS.%NS.%N" + cadi_latitude: "38.0" + cadi_longitude: "-72.0" + cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US" + + config: + image: onap/aaf/aaf_config:2.1.15 + cass: + replicas: 1 + image: onap/aaf/aaf_cass:2.1.15 + fqdn: "aaf-cass" + cluster_name: "osaaf" + heap_new_size: "512M" + max_heap_size: "1024M" + storage_port: 7000 + ssl_storage_port: 7001 + native_trans_port: 9042 + rpc_port: 9160 + dc: "dc1" + service: + replicas: 1 + fqdn: "aaf-service" + internal_port: 8100 + public_port: 31110 + locate: + replicas: 1 + fqdn: "aaf-locate" + internal_port: 8095 + public_port: 31111 + oauth: + replicas: 1 + fqdn: "aaf0oauth" + internal_port: 8140 + public_port: 31112 + gui: + replicas: 1 + fqdn: "aaf-gui" + internal_port: 8200 + public_port: 31113 + cm: + replicas: 1 + fqdn: "aaf-cm" + internal_port: 8150 + public_port: 31114 + fs: + replicas: 1 + fqdn: "aaf-fs" + internal_port: 8096 + public_port: 31115 + hello: + replicas: 0 + flavor: small ################################################################# # Application configuration defaults. diff --git a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-oauth/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-oauth/values.yaml index 3c29a629..45ebeb43 100755 --- a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-oauth/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-oauth/values.yaml @@ -19,6 +19,81 @@ global: nodePortPrefix: 302 readinessRepository: oomk8s readinessImage: readiness-check:2.0.2 + ubuntuInitRepository: registry.hub.docker.com + ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 + persistence: + enabled: true + # Standard OOM + pullPolicy: "Always" + repository: "nexus3.onap.org:10001" + + # Use Local + #pullPolicy: IfNotPresent + #repository: "nexus3.onap.org:10003" + + aaf: + readiness: false + image: onap/aaf/aaf_core:2.1.15 + aaf_env: "DEV" + public_fqdn: "aaf.osaaf.org" + aaf_release: "El Alto" + # DUBLIN ONLY - for M4 compatibility with Casablanca + # aaf_locator_name: "public.%NS.%N" + # aaf_locator_name_oom: "%NS.%N" + # EL ALTO and Beyond + aaf_locator_name: "%NS.%N" + aaf_locator_name_oom: "%CNS.%NS.%N" + cadi_latitude: "38.0" + cadi_longitude: "-72.0" + cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US" + + config: + image: onap/aaf/aaf_config:2.1.15 + cass: + replicas: 1 + image: onap/aaf/aaf_cass:2.1.15 + fqdn: "aaf-cass" + cluster_name: "osaaf" + heap_new_size: "512M" + max_heap_size: "1024M" + storage_port: 7000 + ssl_storage_port: 7001 + native_trans_port: 9042 + rpc_port: 9160 + dc: "dc1" + service: + replicas: 1 + fqdn: "aaf-service" + internal_port: 8100 + public_port: 31110 + locate: + replicas: 1 + fqdn: "aaf-locate" + internal_port: 8095 + public_port: 31111 + oauth: + replicas: 1 + fqdn: "aaf0oauth" + internal_port: 8140 + public_port: 31112 + gui: + replicas: 1 + fqdn: "aaf-gui" + internal_port: 8200 + public_port: 31113 + cm: + replicas: 1 + fqdn: "aaf-cm" + internal_port: 8150 + public_port: 31114 + fs: + replicas: 1 + fqdn: "aaf-fs" + internal_port: 8096 + public_port: 31115 + hello: + replicas: 0 + flavor: small ################################################################# # Application configuration defaults. diff --git a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-service/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-service/values.yaml index 77f036ad..77deb723 100755 --- a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-service/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-service/values.yaml @@ -18,13 +18,82 @@ global: nodePortPrefix: 302 readinessRepository: oomk8s - readinessImage: readiness-check:2.0.0 + readinessImage: readiness-check:2.0.2 + ubuntuInitRepository: registry.hub.docker.com + ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 + persistence: + enabled: true + # Standard OOM + pullPolicy: "Always" + repository: "nexus3.onap.org:10001" + + # Use Local + #pullPolicy: IfNotPresent + #repository: "nexus3.onap.org:10003" + aaf: + readiness: false + image: onap/aaf/aaf_core:2.1.15 + aaf_env: "DEV" + public_fqdn: "aaf.osaaf.org" + aaf_release: "El Alto" + # DUBLIN ONLY - for M4 compatibility with Casablanca + # aaf_locator_name: "public.%NS.%N" + # aaf_locator_name_oom: "%NS.%N" + # EL ALTO and Beyond + aaf_locator_name: "%NS.%N" + aaf_locator_name_oom: "%CNS.%NS.%N" + cadi_latitude: "38.0" + cadi_longitude: "-72.0" + cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US" + + config: + image: onap/aaf/aaf_config:2.1.15 + cass: + replicas: 1 + image: onap/aaf/aaf_cass:2.1.15 + fqdn: "aaf-cass" + cluster_name: "osaaf" + heap_new_size: "512M" + max_heap_size: "1024M" + storage_port: 7000 + ssl_storage_port: 7001 + native_trans_port: 9042 + rpc_port: 9160 + dc: "dc1" service: replicas: 1 fqdn: "aaf-service" internal_port: 8100 - public_port: 31110 + public_port: 31110 + locate: + replicas: 1 + fqdn: "aaf-locate" + internal_port: 8095 + public_port: 31111 + oauth: + replicas: 1 + fqdn: "aaf0oauth" + internal_port: 8140 + public_port: 31112 + gui: + replicas: 1 + fqdn: "aaf-gui" + internal_port: 8200 + public_port: 31113 + cm: + replicas: 1 + fqdn: "aaf-cm" + internal_port: 8150 + public_port: 31114 + fs: + replicas: 1 + fqdn: "aaf-fs" + internal_port: 8096 + public_port: 31115 + hello: + replicas: 0 + flavor: small ################################################################# # Application configuration defaults. diff --git a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml index 1fcc1558..7b6aa7fd 100755 --- a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml @@ -15,6 +15,29 @@ ################################################################# # Global configuration defaults. ################################################################# +global: + nodePortPrefix: 302 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + loggingRepository: docker.elastic.co + loggingImage: beats/filebeat:5.5.0 + ubuntuInitRepository: oomk8s + ubuntuInitImage: ubuntu-init:1.0.0 + tpm: + enabled: false + # if enabled, nodeselector will use the below + # values in the nodeselector section of the pod + nodeLabel: "tpm-node" + nodeLabelValue: "true" + abrmd: + enabled: true + distcenter: + enabled: true + testca: + enabled: true + persistence: {} + pullPolicy: "Always" + repository: "nexus3.onap.org:10001" ################################################################# # Application configuration defaults. diff --git a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml index e8d2f7ec..c881c3a7 100755 --- a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml @@ -16,7 +16,28 @@ # Global configuration defaults. ################################################################# global: + nodePortPrefix: 302 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + loggingRepository: docker.elastic.co + loggingImage: beats/filebeat:5.5.0 + ubuntuInitRepository: oomk8s + ubuntuInitImage: ubuntu-init:1.0.0 + tpm: + enabled: false + # if enabled, nodeselector will use the below + # values in the nodeselector section of the pod + nodeLabel: "tpm-node" + nodeLabelValue: "true" + abrmd: + enabled: true + distcenter: + enabled: true + testca: + enabled: true persistence: {} + pullPolicy: "Always" + repository: "nexus3.onap.org:10001" ################################################################# # Application configuration defaults. diff --git a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml index 5c3618d2..0754fd19 100755 --- a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml @@ -17,6 +17,29 @@ ################################################################# enabled: true +global: + nodePortPrefix: 302 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + loggingRepository: docker.elastic.co + loggingImage: beats/filebeat:5.5.0 + ubuntuInitRepository: oomk8s + ubuntuInitImage: ubuntu-init:1.0.0 + tpm: + enabled: false + # if enabled, nodeselector will use the below + # values in the nodeselector section of the pod + nodeLabel: "tpm-node" + nodeLabelValue: "true" + abrmd: + enabled: true + distcenter: + enabled: true + testca: + enabled: true + persistence: {} + pullPolicy: "Always" + repository: "nexus3.onap.org:10001" ################################################################# # Application configuration defaults. diff --git a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/values.yaml index 2d20d579..5909a707 100755 --- a/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/aaf/charts/aaf-sshsm/values.yaml @@ -36,6 +36,76 @@ global: testca: enabled: true persistence: {} + pullPolicy: "Always" + repository: "nexus3.onap.org:10001" + + # Use Local + #pullPolicy: IfNotPresent + #repository: "nexus3.onap.org:10003" + + aaf: + readiness: false + image: onap/aaf/aaf_core:2.1.15 + aaf_env: "DEV" + public_fqdn: "aaf.osaaf.org" + aaf_release: "El Alto" + # DUBLIN ONLY - for M4 compatibility with Casablanca + # aaf_locator_name: "public.%NS.%N" + # aaf_locator_name_oom: "%NS.%N" + # EL ALTO and Beyond + aaf_locator_name: "%NS.%N" + aaf_locator_name_oom: "%CNS.%NS.%N" + cadi_latitude: "38.0" + cadi_longitude: "-72.0" + cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US" + + config: + image: onap/aaf/aaf_config:2.1.15 + cass: + replicas: 1 + image: onap/aaf/aaf_cass:2.1.15 + fqdn: "aaf-cass" + cluster_name: "osaaf" + heap_new_size: "512M" + max_heap_size: "1024M" + storage_port: 7000 + ssl_storage_port: 7001 + native_trans_port: 9042 + rpc_port: 9160 + dc: "dc1" + service: + replicas: 1 + fqdn: "aaf-service" + internal_port: 8100 + public_port: 31110 + locate: + replicas: 1 + fqdn: "aaf-locate" + internal_port: 8095 + public_port: 31111 + oauth: + replicas: 1 + fqdn: "aaf0oauth" + internal_port: 8140 + public_port: 31112 + gui: + replicas: 1 + fqdn: "aaf-gui" + internal_port: 8200 + public_port: 31113 + cm: + replicas: 1 + fqdn: "aaf-cm" + internal_port: 8150 + public_port: 31114 + fs: + replicas: 1 + fqdn: "aaf-fs" + internal_port: 8096 + public_port: 31115 + hello: + replicas: 0 + persistence: enabled: true diff --git a/ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/values.yaml index aa8951c0..3b94df2c 100755 --- a/ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-app/values.yaml @@ -22,6 +22,17 @@ global: readinessImage: readiness-check:2.0.0 loggingRepository: docker.elastic.co loggingImage: beats/filebeat:5.5.0 + env: + tomcatDir: "/opt/apache-tomcat-8.0.37" + # portal frontend port + portalPort: "8989" + portalFEPort: "30225" + # application's front end hostname. Must be resolvable on the client side environment + portalHostName: "portal.api.simpledemo.onap.org" + keystoreFile: "keystoreONAPPortal.p12" + truststoreFile: "truststoreONAPall.jks" + keypass: ",@{9!OOv%HO@#c+0Z}axu!xV" + trustpass: "changeit" ################################################################# # Application configuration defaults. diff --git a/ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-sdk/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-sdk/values.yaml index be5d8aee..221c0709 100755 --- a/ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-sdk/values.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/portal/charts/portal-sdk/values.yaml @@ -22,6 +22,18 @@ global: readinessImage: readiness-check:2.0.0 loggingRepository: docker.elastic.co loggingImage: beats/filebeat:5.5.0 + env: + tomcatDir: "/opt/apache-tomcat-8.0.37" + # portal frontend port + portalPort: "8989" + portalFEPort: "30225" + # application's front end hostname. Must be resolvable on the client side environment + portalHostName: "portal.api.simpledemo.onap.org" + keystoreFile: "keystoreONAPPortal.p12" + truststoreFile: "truststoreONAPall.jks" + keypass: ",@{9!OOv%HO@#c+0Z}axu!xV" + trustpass: "changeit" + ################################################################# # Application configuration defaults. -- 2.16.6