diff options
57 files changed, 211 insertions, 226 deletions
diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml index 286a9aca53..162fb99bf9 100644 --- a/kubernetes/aai/templates/aai-deployment.yaml +++ b/kubernetes/aai/templates/aai-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: aai-service - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-aai" spec: selector: matchLabels: @@ -76,16 +76,16 @@ spec: volumes: - name: aai-service-certs hostPath: - path: /dockerdata-nfs/onap/aai/etc/ssl/certs/ + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/etc/ssl/certs/ - name: aai-service-logroot hostPath: - path: /dockerdata-nfs/onap/aai/opt/aai/logroot/ + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/opt/aai/logroot/ - name: aai-config hostPath: - path: /dockerdata-nfs/onap/aai/aai-config/ + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-config/ - name: aai-data hostPath: - path: /dockerdata-nfs/onap/aai/aai-data/ + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/ restartPolicy: Always imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml index 4a016f47b5..2c0fbc4a5b 100644 --- a/kubernetes/aai/templates/all-services.yaml +++ b/kubernetes/aai/templates/all-services.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: hbase - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-aai" labels: app: hbase spec: @@ -17,7 +17,7 @@ apiVersion: v1 kind: Service metadata: name: aai-service - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-aai" labels: app: aai-service spec: @@ -38,7 +38,7 @@ apiVersion: v1 kind: Service metadata: name: model-loader-service - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-aai" labels: app: model-loader-service spec: diff --git a/kubernetes/aai/templates/hbase-deployment.yaml b/kubernetes/aai/templates/hbase-deployment.yaml index 598fc0f02c..79983eba08 100644 --- a/kubernetes/aai/templates/hbase-deployment.yaml +++ b/kubernetes/aai/templates/hbase-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: hbase - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-aai" spec: selector: matchLabels: @@ -26,4 +26,4 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml index 96c9ee1990..f7d855bbf9 100644 --- a/kubernetes/aai/templates/modelloader-deployment.yaml +++ b/kubernetes/aai/templates/modelloader-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: model-loader-service - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-aai" spec: selector: matchLabels: @@ -56,7 +56,7 @@ spec: "env": [ { "name": "NAMESPACE", - "value": "onap-sdc" + "value": "{{ .Values.nsPrefix }}-sdc" } ], "image": "{{ .Values.image.readiness }}", @@ -68,7 +68,7 @@ spec: containers: - env: - name: DISTR_CLIENT_ASDC_ADDRESS - value: sdc-be.onap-sdc:8443 + value: sdc-be.{{ .Values.nsPrefix }}-sdc:8443 - name: DISTR_CLIENT_ENVIRONMENT_NAME value: AUTO - name: DISTR_CLIENT_USER @@ -76,7 +76,7 @@ spec: - name: DISTR_CLIENT_PASSWORD value: OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp - name: APP_SERVER_BASE_URL - value: https://aai-service.onap-aai:8443 + value: https://aai-service.{{ .Values.nsPrefix }}-aai:8443 - name: APP_SERVER_KEYSTORE_PASSWORD value: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o - name: APP_SERVER_AUTH_USER @@ -96,4 +96,4 @@ spec: periodSeconds: 10 restartPolicy: Always imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml index 12b8b3b244..3c6894c638 100644 --- a/kubernetes/aai/values.yaml +++ b/kubernetes/aai/values.yaml @@ -1,4 +1,4 @@ -NS: onap-aai +nsPrefix: onap pullPolicy: Always image: readiness: oomk8s/readiness-check:1.0.0 diff --git a/kubernetes/appc/templates/all-services.yaml b/kubernetes/appc/templates/all-services.yaml index 939ef7fba7..95472319ed 100644 --- a/kubernetes/appc/templates/all-services.yaml +++ b/kubernetes/appc/templates/all-services.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: dbhost - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-appc" labels: app: appc-dbhost spec: @@ -17,7 +17,7 @@ apiVersion: v1 kind: Service metadata: name: sdnctldb01 - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-appc" labels: app: appc-dbhost spec: @@ -31,7 +31,7 @@ apiVersion: v1 kind: Service metadata: name: sdnctldb02 - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-appc" labels: app: appc-dbhost spec: @@ -45,7 +45,7 @@ apiVersion: v1 kind: Service metadata: name: sdnhost - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-appc" labels: app: appc spec: @@ -65,7 +65,7 @@ apiVersion: v1 kind: Service metadata: name: dgbuilder - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-appc" labels: app: appc-dgbuilder spec: diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml index 0bd93f8fb6..049ac5d457 100644 --- a/kubernetes/appc/templates/appc-deployment.yaml +++ b/kubernetes/appc/templates/appc-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: appc - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-appc" spec: selector: matchLabels: @@ -70,9 +70,9 @@ spec: volumes: - name: appc-conf hostPath: - path: /dockerdata-nfs/onap/appc/conf + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/conf - name: sdnc-conf hostPath: - path: /dockerdata-nfs/onap/sdnc/conf + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/appc/templates/db-deployment.yaml b/kubernetes/appc/templates/db-deployment.yaml index f7b55187a0..239d76f083 100644 --- a/kubernetes/appc/templates/db-deployment.yaml +++ b/kubernetes/appc/templates/db-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: appc-dbhost - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-appc" spec: selector: matchLabels: @@ -35,6 +35,6 @@ spec: volumes: - name: appc-data hostPath: - path: /dockerdata-nfs/onap/appc/data + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/data imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/appc/templates/dgbuilder-deployment.yaml b/kubernetes/appc/templates/dgbuilder-deployment.yaml index 54bf596a97..e0342578bf 100644 --- a/kubernetes/appc/templates/dgbuilder-deployment.yaml +++ b/kubernetes/appc/templates/dgbuilder-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: appc-dgbuilder - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-appc" spec: selector: matchLabels: @@ -65,4 +65,4 @@ spec: periodSeconds: 10 restartPolicy: Always imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml index 22000a7a36..74b189f371 100644 --- a/kubernetes/appc/values.yaml +++ b/kubernetes/appc/values.yaml @@ -1,4 +1,4 @@ -NS: onap-appc +nsPrefix: onap pullPolicy: Always image: readiness: oomk8s/readiness-check:1.0.0 diff --git a/kubernetes/message-router/templates/all-services.yaml b/kubernetes/message-router/templates/all-services.yaml index 38fee01b22..f190b862aa 100644 --- a/kubernetes/message-router/templates/all-services.yaml +++ b/kubernetes/message-router/templates/all-services.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: zookeeper - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-message-router" labels: app: zookeeper spec: @@ -17,7 +17,7 @@ apiVersion: v1 kind: Service metadata: name: global-kafka - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-message-router" labels: app: global-kafka spec: @@ -32,7 +32,7 @@ apiVersion: v1 kind: Service metadata: name: dmaap - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-message-router" labels: app: dmaap version: 1.0.0 diff --git a/kubernetes/message-router/templates/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml index eda5093178..59c57f85f6 100644 --- a/kubernetes/message-router/templates/message-router-dmaap.yaml +++ b/kubernetes/message-router/templates/message-router-dmaap.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: dmaap - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-message-router" spec: selector: matchLabels: @@ -64,12 +64,12 @@ spec: volumes: - name: appprops hostPath: - path: /dockerdata-nfs/onap/message-router/dmaap/MsgRtrApi.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/MsgRtrApi.properties - name: cadi hostPath: - path: /dockerdata-nfs/onap/message-router/dmaap/cadi.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/cadi.properties - name: mykey hostPath: - path: /dockerdata-nfs/onap/message-router/dmaap/mykey + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/mykey imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml index cb2f3e97bf..19583bf18a 100644 --- a/kubernetes/message-router/templates/message-router-kafka.yaml +++ b/kubernetes/message-router/templates/message-router-kafka.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: global-kafka - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-message-router" spec: selector: matchLabels: @@ -52,7 +52,7 @@ spec: periodSeconds: 10 env: - name: KAFKA_ZOOKEEPER_CONNECT - value: "zookeeper.onap-message-router:2181" + value: "zookeeper.{{ .Values.nsPrefix }}-message-router:2181" - name: KAFKA_ADVERTISED_HOST_NAME value: "global-kafka" - name: KAFKA_BROKER_ID @@ -75,9 +75,9 @@ spec: path: /var/run/docker.sock - name: kafka-data hostPath: - path: /dockerdata-nfs/onap/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/ + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/ - name: start-kafka hostPath: - path: /dockerdata-nfs/onap/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/message-router/templates/message-router-zookeeper.yaml b/kubernetes/message-router/templates/message-router-zookeeper.yaml index ee9faa0c84..5b46dc02e3 100644 --- a/kubernetes/message-router/templates/message-router-zookeeper.yaml +++ b/kubernetes/message-router/templates/message-router-zookeeper.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: zookeeper - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-message-router" spec: selector: matchLabels: @@ -31,6 +31,6 @@ spec: volumes: - name: zookeeper-data hostPath: - path: /dockerdata-nfs/onap/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/message-router/values.yaml b/kubernetes/message-router/values.yaml index b69aa0081a..a3210c29c1 100644 --- a/kubernetes/message-router/values.yaml +++ b/kubernetes/message-router/values.yaml @@ -1,4 +1,4 @@ -NS: onap-message-router +nsPrefix: onap pullPolicy: Always image: readiness: oomk8s/readiness-check:1.0.0 diff --git a/kubernetes/mso/templates/all-services.yaml b/kubernetes/mso/templates/all-services.yaml index 6e2db71650..a0807d759e 100644 --- a/kubernetes/mso/templates/all-services.yaml +++ b/kubernetes/mso/templates/all-services.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: mariadb - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-mso" labels: app: mariadb spec: @@ -17,7 +17,7 @@ apiVersion: v1 kind: Service metadata: name: mso - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-mso" labels: app: mso spec: diff --git a/kubernetes/mso/templates/db-deployment.yaml b/kubernetes/mso/templates/db-deployment.yaml index ff1cf75350..76cf2ec912 100644 --- a/kubernetes/mso/templates/db-deployment.yaml +++ b/kubernetes/mso/templates/db-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: mariadb - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-mso" spec: replicas: 1 selector: @@ -43,9 +43,9 @@ spec: volumes: - name: mso-mariadb-conf hostPath: - path: /dockerdata-nfs/onap/mso/mariadb/conf.d + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mariadb/conf.d - name: mso-mariadb-docker-entrypoint-initdb hostPath: - path: /dockerdata-nfs/onap/mso/mariadb/docker-entrypoint-initdb.d + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mariadb/docker-entrypoint-initdb.d imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml index 6f12769d5a..0f3034f4cc 100644 --- a/kubernetes/mso/templates/mso-deployment.yaml +++ b/kubernetes/mso/templates/mso-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: mso - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-mso" spec: replicas: 1 selector: @@ -68,9 +68,9 @@ spec: volumes: - name: mso hostPath: - path: /dockerdata-nfs/onap/mso/mso + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mso - name: mso-docker-files hostPath: - path: /dockerdata-nfs/onap/mso/docker-files + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/mso/values.yaml b/kubernetes/mso/values.yaml index 41f9677029..1045224d43 100644 --- a/kubernetes/mso/values.yaml +++ b/kubernetes/mso/values.yaml @@ -1,4 +1,4 @@ -NS: onap-mso +nsPrefix: onap pullPolicy: IfNotPresent image: readiness: oomk8s/readiness-check:1.0.0 diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash index 95dd809027..829f27a4df 100755 --- a/kubernetes/oneclick/createAll.bash +++ b/kubernetes/oneclick/createAll.bash @@ -25,7 +25,7 @@ create_registry_key() { } create_onap_helm() { - helm install ../$2/ --name $2 + helm install ../$2/ --name $2 --namespace $1 --set nsPrefix=$1 } configure_app() { @@ -39,21 +39,7 @@ configure_app() { if [ -e "$2/Chart.yaml" ]; then sed -i-- 's/nodePort: [0-9]\{2\}[02468]\{1\}/nodePort: '"$4"'/g' $3/all-services.yaml sed -i-- 's/nodePort: [0-9]\{2\}[13579]\{1\}/nodePort: '"$5"'/g' $3/all-services.yaml - sed -i "s/onap-/$1-/g" ../$2/values.yaml fi - - - # replace the default 'onap' namespace qualification of K8s hostnames within - # the config files - # note: this will create a '-template' file within the component's directory - # this is not ideal and should be addressed (along with the replacement - # of sed commands for configuration) by the future configuration - # user stories (ie. OOM-51 to OOM-53) - find $3 -type f -exec sed -i -- "s/onap-/$1-/g" {} \; - - # replace the default '/dockerdata-nfs/onapdemo' volume mount paths - find $3 -iname "*.yaml" -type f -exec sed -i -e 's/dockerdata-nfs\/[a-zA-Z0-9\\-]*\//dockerdata-nfs\/'"$1"'\//g' {} \; - rm -f $3/*.yaml-e } @@ -130,7 +116,7 @@ for i in ${HELM_APPS[@]}; do create_namespace $NS $i printf "\nCreating registry secret **********\n" - create_registry_key $NS $i $ONAP_DOCKER_REGISTRY_KEY $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL + create_registry_key $NS $i ${NS}-docker-registry-key $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL printf "\nCreating deployments and services **********\n" _FILES_PATH=$(echo ../$i/templates) @@ -141,4 +127,3 @@ for i in ${HELM_APPS[@]}; do done printf "\n**** Done ****\n" - diff --git a/kubernetes/oneclick/deleteAll.bash b/kubernetes/oneclick/deleteAll.bash index dfa75b59c4..33ecb320e5 100755 --- a/kubernetes/oneclick/deleteAll.bash +++ b/kubernetes/oneclick/deleteAll.bash @@ -5,15 +5,15 @@ delete_namespace() { _NS=$1-$2 kubectl delete namespace $_NS - printf "Waiting for namespace $_NS termination...\n" - while kubectl get namespaces $_NS > /dev/null 2>&1; do - sleep 2 - done + printf "Waiting for namespace $_NS termination...\n" + while kubectl get namespaces $_NS > /dev/null 2>&1; do + sleep 2 + done printf "Namespace $_NS deleted.\n\n" } delete_registry_key() { - kubectl --namespace $1-$2 delete secret onap-docker-registry-key + kubectl --namespace $1-$2 delete secret ${1}-docker-registry-key } delete_app_helm() { diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash index c7f3aba024..8fd8cd4d3c 100644 --- a/kubernetes/oneclick/setenv.bash +++ b/kubernetes/oneclick/setenv.bash @@ -1,7 +1,6 @@ #!/bin/bash HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc') -ONAP_DOCKER_REGISTRY_KEY=${ONAP_DOCKER_REGISTRY_KEY:-onap-docker-registry-key} ONAP_DOCKER_REGISTRY=${ONAP_DOCKER_REGISTRY:-nexus3.onap.org:10001} ONAP_DOCKER_USER=${ONAP_DOCKER_USER:-docker} ONAP_DOCKER_PASS=${ONAP_DOCKER_PASS:-docker} diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml index e15b1298d7..82360334ac 100644 --- a/kubernetes/policy/templates/all-services.yaml +++ b/kubernetes/policy/templates/all-services.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: mariadb - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-policy" labels: app: mariadb spec: @@ -19,7 +19,7 @@ metadata: labels: app: nexus name: nexus - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-policy" spec: ports: - name: nexus-port @@ -34,7 +34,7 @@ metadata: labels: app: drools name: drools - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-policy" spec: ports: - name: "drools-port" @@ -48,7 +48,7 @@ apiVersion: v1 kind: Service metadata: name: pap - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-policy" labels: app: pap spec: @@ -67,7 +67,7 @@ apiVersion: v1 kind: Service metadata: name: pdp - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-policy" labels: app: pdp spec: @@ -83,7 +83,7 @@ apiVersion: v1 kind: Service metadata: name: pypdp - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-policy" labels: app: pypdp spec: @@ -99,7 +99,7 @@ apiVersion: v1 kind: Service metadata: name: brmsgw - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-policy" labels: app: brmsgw spec: diff --git a/kubernetes/policy/templates/dep-brmsgw.yaml b/kubernetes/policy/templates/dep-brmsgw.yaml index 3f59d218da..e535cf2306 100644 --- a/kubernetes/policy/templates/dep-brmsgw.yaml +++ b/kubernetes/policy/templates/dep-brmsgw.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: brmsgw - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-policy" spec: replicas: 1 selector: @@ -62,6 +62,6 @@ spec: volumes: - name: pe hostPath: - path: /dockerdata-nfs/onap/policy/opt/policy/config/pe/ + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml index 101066fb40..96eb5f08e7 100644 --- a/kubernetes/policy/templates/dep-drools.yaml +++ b/kubernetes/policy/templates/dep-drools.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: drools - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-policy" spec: replicas: 1 selector: @@ -73,9 +73,9 @@ spec: volumes: - name: drools-settingsxml hostPath: - path: /dockerdata-nfs/onap/policy/drools/settings.xml + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/drools/settings.xml - name: drools hostPath: - path: /dockerdata-nfs/onap/policy/opt/policy/config/drools/ + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/drools/ imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/policy/templates/dep-maria.yaml b/kubernetes/policy/templates/dep-maria.yaml index 63306d4f40..abbfdd8f4b 100644 --- a/kubernetes/policy/templates/dep-maria.yaml +++ b/kubernetes/policy/templates/dep-maria.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: mariadb - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-policy" spec: replicas: 1 selector: @@ -30,4 +30,4 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/policy/templates/dep-nexus.yaml b/kubernetes/policy/templates/dep-nexus.yaml index d45d77dcfb..4507508935 100644 --- a/kubernetes/policy/templates/dep-nexus.yaml +++ b/kubernetes/policy/templates/dep-nexus.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: nexus - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-policy" spec: selector: matchLabels: @@ -48,4 +48,4 @@ spec: imagePullPolicy: {{ .Values.pullPolicy }} name: nexus imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/policy/templates/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml index e7fe90297f..8ee2370c4a 100644 --- a/kubernetes/policy/templates/dep-pap.yaml +++ b/kubernetes/policy/templates/dep-pap.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: pap - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-policy" spec: selector: matchLabels: @@ -86,6 +86,6 @@ spec: volumes: - name: pe hostPath: - path: /dockerdata-nfs/onap/policy/opt/policy/config/pe/ + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml index f7d9bf345a..c5ea267ba5 100644 --- a/kubernetes/policy/templates/dep-pdp.yaml +++ b/kubernetes/policy/templates/dep-pdp.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: pdp - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-policy" spec: replicas: 1 selector: @@ -65,6 +65,6 @@ spec: volumes: - name: pe hostPath: - path: /dockerdata-nfs/onap/policy/opt/policy/config/pe/ + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/policy/templates/dep-pypdp.yaml b/kubernetes/policy/templates/dep-pypdp.yaml index 851438878c..4e2c9b62a1 100644 --- a/kubernetes/policy/templates/dep-pypdp.yaml +++ b/kubernetes/policy/templates/dep-pypdp.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: pypdp - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-policy" spec: replicas: 1 selector: @@ -67,6 +67,6 @@ spec: volumes: - name: pe hostPath: - path: /dockerdata-nfs/onap/policy/opt/policy/config/pe/ + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml index 19ff66c34a..0f990c94ff 100644 --- a/kubernetes/policy/values.yaml +++ b/kubernetes/policy/values.yaml @@ -1,9 +1,9 @@ -NS: onap-policy +nsPrefix: onap pullPolicy: Always image: readiness: oomk8s/readiness-check:1.0.0 - policyPe: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.1-STAGING-latest - policyDrools: nexus3.onap.org:10001/openecomp/policy/policy-drools:1.1-STAGING-latest - policyDb: nexus3.onap.org:10001/openecomp/policy/policy-db:1.1-STAGING-latest - policyNexus: nexus3.onap.org:10001/openecomp/policy/policy-nexus:1.1-STAGING-latest + policyPe: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.0-STAGING-latest + policyDrools: nexus3.onap.org:10001/openecomp/policy/policy-drools:1.0-STAGING-latest + policyDb: nexus3.onap.org:10001/openecomp/policy/policy-db:1.0-STAGING-latest + policyNexus: nexus3.onap.org:10001/openecomp/policy/policy-nexus:1.0-STAGING-latest ubuntu: ubuntu:16.04 diff --git a/kubernetes/portal/templates/all-services.yaml b/kubernetes/portal/templates/all-services.yaml index 488fb8045c..2107e2a30b 100644 --- a/kubernetes/portal/templates/all-services.yaml +++ b/kubernetes/portal/templates/all-services.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: portaldb - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-portal" labels: app: portaldb spec: @@ -19,7 +19,7 @@ metadata: labels: app: portalapps name: portalapps - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-portal" spec: ports: - name: portal-1 @@ -44,7 +44,7 @@ metadata: labels: app: vnc-portal name: vnc-portal - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-portal" spec: ports: - name: tcp-1 @@ -63,7 +63,7 @@ apiVersion: v1 kind: Service metadata: name: portalwidgets - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-portal" labels: app: portalwidgets spec: diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml index 23a645910a..a0818fab1b 100755 --- a/kubernetes/portal/templates/portal-apps-deployment.yaml +++ b/kubernetes/portal/templates/portal-apps-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: portalapps - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-portal" spec: selector: matchLabels: @@ -102,45 +102,45 @@ spec: volumes: - name: portal-fusion-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties - name: portal-openid-connect-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties - name: portal-system-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties - name: portal-portal-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties - name: dbcapp-fusion-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties - name: dbcapp-system-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties - name: dbcapp-portal-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties - name: dbcapp-dbcapp-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties - name: sdkapp-system-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties - name: sdkapp-portal-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties - name: sdkapp-fusion-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties - name: portal-mariadb-onboarding-sql hostPath: - path: /dockerdata-nfs/onap/portal/mariadb/oom_updates.sql + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/mariadb/oom_updates.sql - name: portal-root hostPath: - path: /dockerdata-nfs/onap/portal + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal - name: portal-logs hostPath: - path: /dockerdata-nfs/onap/portal/logs + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/logs imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml index cf8bbd68e0..a31c6a24b2 100755 --- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml +++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: portaldb - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-portal" spec: selector: matchLabels: @@ -19,7 +19,7 @@ spec: name: "portaldb" env: - name: MYSQL_HOST - value: portaldb.onap-portal + value: "portaldb.{{ .Values.nsPrefix }}-portal" - name: MYSQL_ROOT_PASSWORD value: password volumeMounts: @@ -36,6 +36,6 @@ spec: volumes: - name: portal-mariadb-data hostPath: - path: /dockerdata-nfs/onap/portal/mariadb/data + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/mariadb/data imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/portal/templates/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml index e4a8574458..fb7bd93e44 100644 --- a/kubernetes/portal/templates/portal-vnc-dep.yaml +++ b/kubernetes/portal/templates/portal-vnc-dep.yaml @@ -4,7 +4,7 @@ metadata: labels: app: vnc-portal name: vnc-portal - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-portal" spec: selector: matchLabels: @@ -50,7 +50,7 @@ spec: "env": [ { "name": "NAMESPACE", - "value": "onap-policy" + "value": "{{ .Values.nsPrefix }}-policy" } ], "image": "{{ .Values.image.readiness }}", @@ -68,7 +68,7 @@ spec: "env": [ { "name": "NAMESPACE", - "value": "onap-sdc" + "value": "{{ .Values.nsPrefix }}-sdc" } ], "image": "{{ .Values.image.readiness }}", @@ -86,7 +86,7 @@ spec: "env": [ { "name": "NAMESPACE", - "value": "onap-vid" + "value": "{{ .Values.nsPrefix }}-vid" } ], "image": "{{ .Values.image.readiness }}", @@ -95,7 +95,7 @@ spec: }, { "command": ["/bin/sh","-c"], - "args": ["echo `host sdc-be.onap-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host portalapps.onap-portal | awk ''{print$4}''` portal.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host pap.onap-policy | awk ''{print$4}''` policy.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sdc-fe.onap-sdc | awk ''{print$4}''` sdc.ui.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host vid-server.onap-vid | awk ''{print$4}''` vid.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sparky-fe.onap-aai | awk ''{print$4}''` aai.api.simpledemo.openecomp.org >> /ubuntu-init/hosts"], + "args": ["echo `host sdc-be.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host portalapps.{{ .Values.nsPrefix }}-portal | awk ''{print$4}''` portal.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host pap.{{ .Values.nsPrefix }}-policy | awk ''{print$4}''` policy.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sdc-fe.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.ui.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host vid-server.{{ .Values.nsPrefix }}-vid | awk ''{print$4}''` vid.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sparky-fe.{{ .Values.nsPrefix }}-aai | awk ''{print$4}''` aai.api.simpledemo.openecomp.org >> /ubuntu-init/hosts"], "image": "{{ .Values.image.ubuntuInit }}", "imagePullPolicy": "{{ .Values.pullPolicy }}", "name": "vnc-init-hosts", @@ -118,7 +118,6 @@ spec: env: - name: VNC_PASSWORD value: password - imagePullPolicy: IfNotPresent name: vnc-portal volumeMounts: - mountPath: /ubuntu-init/ @@ -130,4 +129,4 @@ spec: - name: ubuntu-init emptyDir: {} imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/portal/templates/portal-widgets-deployment.yaml b/kubernetes/portal/templates/portal-widgets-deployment.yaml index 0aea75648c..5b020e5865 100644 --- a/kubernetes/portal/templates/portal-widgets-deployment.yaml +++ b/kubernetes/portal/templates/portal-widgets-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: portalwidgets - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-portal" spec: selector: matchLabels: @@ -56,4 +56,6 @@ spec: volumes: - name: portalwidgets-application-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key"
\ No newline at end of file diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml index b88b644a08..ae9479e03a 100644 --- a/kubernetes/portal/values.yaml +++ b/kubernetes/portal/values.yaml @@ -1,4 +1,4 @@ -NS: onap-portal +nsPrefix: onap pullPolicy: Always image: readiness: oomk8s/readiness-check:1.0.0 diff --git a/kubernetes/robot/templates/all-services.yaml b/kubernetes/robot/templates/all-services.yaml index 2b80a29c83..a14dae777c 100644 --- a/kubernetes/robot/templates/all-services.yaml +++ b/kubernetes/robot/templates/all-services.yaml @@ -4,7 +4,7 @@ metadata: labels: app: robot name: robot - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-robot" spec: ports: - port: 88 diff --git a/kubernetes/robot/templates/robot-deployment.yaml b/kubernetes/robot/templates/robot-deployment.yaml index c4bc9544d8..a1b07dc410 100644 --- a/kubernetes/robot/templates/robot-deployment.yaml +++ b/kubernetes/robot/templates/robot-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: robot - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-robot" spec: selector: matchLabels: @@ -38,18 +38,18 @@ spec: volumes: - name: robot-eteshare hostPath: - path: /dockerdata-nfs/onap/robot/eteshare + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/eteshare - name: robot-assets hostPath: - path: /dockerdata-nfs/onap/robot/robot/assets + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/assets - name: robot-resources hostPath: - path: /dockerdata-nfs/onap/robot/robot/resources + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/resources - name: robot-testsuites hostPath: - path: /dockerdata-nfs/onap/robot/robot/testsuites + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/testsuites - name: lighttpd-authorization hostPath: - path: /dockerdata-nfs/onap/robot/authorization + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/authorization imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml index f906599dda..90566c4dd8 100644 --- a/kubernetes/robot/values.yaml +++ b/kubernetes/robot/values.yaml @@ -1,4 +1,4 @@ -NS: onap-robot +nsPrefix: onap pullPolicy: Always image: testsuite: nexus3.onap.org:10001/openecomp/testsuite:1.1-STAGING-latest diff --git a/kubernetes/sdc/templates/all-services.yaml b/kubernetes/sdc/templates/all-services.yaml index 25ca65e0da..93febccbed 100644 --- a/kubernetes/sdc/templates/all-services.yaml +++ b/kubernetes/sdc/templates/all-services.yaml @@ -4,7 +4,7 @@ metadata: labels: app: sdc-es name: sdc-es - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdc" spec: ports: - name: sdc-es-port-9200 @@ -21,7 +21,7 @@ metadata: labels: app: sdc-cs name: sdc-cs - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdc" spec: ports: - name: sdc-cs-port-9042 @@ -38,7 +38,7 @@ metadata: labels: app: sdc-kb name: sdc-kb - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdc" spec: ports: - name: sdc-kb-port-5601 @@ -53,7 +53,7 @@ metadata: labels: app: sdc-be name: sdc-be - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdc" spec: ports: - name: sdc-be-port-8443 @@ -72,7 +72,7 @@ metadata: labels: app: sdc-fe name: sdc-fe - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdc" spec: ports: - name: sdc-fe-port-9443 diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml index 96fee818da..38a239e714 100644 --- a/kubernetes/sdc/templates/sdc-be.yaml +++ b/kubernetes/sdc/templates/sdc-be.yaml @@ -4,7 +4,7 @@ metadata: labels: app: sdc-be name: sdc-be - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdc" spec: selector: matchLabels: @@ -54,7 +54,7 @@ spec: "env": [ { "name": "NAMESPACE", - "value": "onap-message-router" + "value": "{{ .Values.nsPrefix }}-message-router" } ], "image": "{{ .Values.image.readiness }}", @@ -96,18 +96,18 @@ spec: volumes: - name: sdc-sdc-es-es hostPath: - path: /dockerdata-nfs/onap/sdc/sdc-es/ES + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES - name: sdc-environments hostPath: - path: /dockerdata-nfs/onap/sdc/environments + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments - name: sdc-jetty-keystore hostPath: - path: /dockerdata-nfs/onap/sdc/jetty/keystore + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/jetty/keystore - name: sdc-localtime hostPath: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata-nfs/onap/sdc/logs + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/sdc/templates/sdc-cs.yaml b/kubernetes/sdc/templates/sdc-cs.yaml index 55a5613609..b660c90d64 100644 --- a/kubernetes/sdc/templates/sdc-cs.yaml +++ b/kubernetes/sdc/templates/sdc-cs.yaml @@ -4,7 +4,7 @@ metadata: labels: app: sdc-cs name: sdc-cs - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdc" spec: selector: matchLabels: @@ -74,15 +74,15 @@ spec: volumes: - name: sdc-sdc-cs-cs hostPath: - path: /dockerdata-nfs/onap/sdc/sdc-cs/CS + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-cs/CS - name: sdc-environments hostPath: - path: /dockerdata-nfs/onap/sdc/environments + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments - name: sdc-localtime hostPath: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata-nfs/onap/sdc/logs + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/sdc/templates/sdc-es.yaml b/kubernetes/sdc/templates/sdc-es.yaml index f1dfb43f0b..59e69dbfdc 100644 --- a/kubernetes/sdc/templates/sdc-es.yaml +++ b/kubernetes/sdc/templates/sdc-es.yaml @@ -4,7 +4,7 @@ metadata: labels: app: sdc-es name: sdc-es - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdc" spec: selector: matchLabels: @@ -48,15 +48,15 @@ spec: volumes: - name: sdc-sdc-es-es hostPath: - path: /dockerdata-nfs/onap/sdc/sdc-es/ES + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES - name: sdc-environments hostPath: - path: /dockerdata-nfs/onap/sdc/environments + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments - name: sdc-localtime hostPath: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata-nfs/onap/sdc/logs + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml index a566b15a02..53759dc685 100644 --- a/kubernetes/sdc/templates/sdc-fe.yaml +++ b/kubernetes/sdc/templates/sdc-fe.yaml @@ -4,7 +4,7 @@ metadata: labels: app: sdc-fe name: sdc-fe - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdc" spec: selector: matchLabels: @@ -82,21 +82,21 @@ spec: volumes: - name: sdc-sdc-es-es hostPath: - path: /dockerdata-nfs/onap/sdc/sdc-es/ES + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES - name: sdc-environments hostPath: - path: /dockerdata-nfs/onap/sdc/environments + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments - name: sdc-jetty-keystore hostPath: - path: /dockerdata-nfs/onap/sdc/jetty/keystore + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/jetty/keystore - name: sdc-localtime hostPath: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata-nfs/onap/sdc/logs + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs - name: sdc-fe-config hostPath: - path: /dockerdata-nfs/onap/sdc/sdc-fe/FE_2_setup_configuration.rb + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-fe/FE_2_setup_configuration.rb imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/sdc/templates/sdc-kb.yaml b/kubernetes/sdc/templates/sdc-kb.yaml index 0dca7e45a2..67110f1e8f 100644 --- a/kubernetes/sdc/templates/sdc-kb.yaml +++ b/kubernetes/sdc/templates/sdc-kb.yaml @@ -4,7 +4,7 @@ metadata: labels: app: sdc-kb name: sdc-kb - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdc" spec: selector: matchLabels: @@ -69,12 +69,12 @@ spec: volumes: - name: sdc-environments hostPath: - path: /dockerdata-nfs/onap/sdc/environments + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments - name: sdc-localtime hostPath: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata-nfs/onap/sdc/logs + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml index 066f0d0afb..139f08c4f3 100644 --- a/kubernetes/sdc/values.yaml +++ b/kubernetes/sdc/values.yaml @@ -1,4 +1,4 @@ -NS: onap-sdc +nsPrefix: onap pullPolicy: Always image: readiness: oomk8s/readiness-check:1.0.0 diff --git a/kubernetes/sdnc/templates/all-services.yaml b/kubernetes/sdnc/templates/all-services.yaml index af42db3063..311bd7b407 100644 --- a/kubernetes/sdnc/templates/all-services.yaml +++ b/kubernetes/sdnc/templates/all-services.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: dbhost - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdnc" labels: app: sdnc-dbhost spec: @@ -16,7 +16,7 @@ apiVersion: v1 kind: Service metadata: name: sdnctldb01 - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdnc" labels: app: sdnc-dbhost spec: @@ -30,7 +30,7 @@ apiVersion: v1 kind: Service metadata: name: sdnctldb02 - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdnc" labels: app: sdnc-dbhost spec: @@ -44,7 +44,7 @@ apiVersion: v1 kind: Service metadata: name: sdnc-dgbuilder - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdnc" labels: app: sdnc-dgbuilder spec: @@ -61,7 +61,7 @@ apiVersion: v1 kind: Service metadata: name: sdnhost - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdnc" labels: app: sdnc spec: @@ -78,7 +78,7 @@ apiVersion: v1 kind: Service metadata: name: sdnc-portal - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdnc" labels: app: sdnc-portal spec: diff --git a/kubernetes/sdnc/templates/db-deployment.yaml b/kubernetes/sdnc/templates/db-deployment.yaml index 1a2ecbae66..fc692ba58e 100644 --- a/kubernetes/sdnc/templates/db-deployment.yaml +++ b/kubernetes/sdnc/templates/db-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: sdnc-dbhost - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdnc" spec: selector: matchLabels: @@ -35,6 +35,6 @@ spec: volumes: - name: sdnc-data hostPath: - path: /dockerdata-nfs/onapdemo/sdnc/data + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/data imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml index 367043337b..6d911c3381 100644 --- a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml +++ b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: sdnc-dgbuilder - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdnc" spec: selector: matchLabels: @@ -63,4 +63,4 @@ spec: periodSeconds: 10 restartPolicy: Always imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/sdnc/templates/sdnc-deployment.yaml b/kubernetes/sdnc/templates/sdnc-deployment.yaml index eb1fdc89fb..cb296da498 100644 --- a/kubernetes/sdnc/templates/sdnc-deployment.yaml +++ b/kubernetes/sdnc/templates/sdnc-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: sdnc - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdnc" spec: selector: matchLabels: @@ -63,6 +63,6 @@ spec: volumes: - name: sdnc-conf hostPath: - path: /dockerdata-nfs/onapdemo/sdnc/conf + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/sdnc/templates/web-deployment.yaml b/kubernetes/sdnc/templates/web-deployment.yaml index 280bf25400..a141e765dc 100644 --- a/kubernetes/sdnc/templates/web-deployment.yaml +++ b/kubernetes/sdnc/templates/web-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: sdnc-portal - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-sdnc" spec: selector: matchLabels: @@ -63,4 +63,4 @@ spec: periodSeconds: 10 restartPolicy: Always imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index b9b3c0479f..5e17a96a5d 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -1,4 +1,4 @@ -NS: onap-sdnc +nsPrefix: onap pullPolicy: Always image: readiness: oomk8s/readiness-check:1.0.0 diff --git a/kubernetes/vid/templates/all-services.yaml b/kubernetes/vid/templates/all-services.yaml index 1018dedb2b..c0856711bb 100644 --- a/kubernetes/vid/templates/all-services.yaml +++ b/kubernetes/vid/templates/all-services.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: vid-mariadb - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-vid" spec: ports: - name: vid-mariadb @@ -17,7 +17,7 @@ metadata: labels: app: vid-server name: vid-server - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-vid" spec: ports: - name: vid-server diff --git a/kubernetes/vid/templates/vid-mariadb-deployment.yaml b/kubernetes/vid/templates/vid-mariadb-deployment.yaml index cf3b8a22e0..7623674ee9 100644 --- a/kubernetes/vid/templates/vid-mariadb-deployment.yaml +++ b/kubernetes/vid/templates/vid-mariadb-deployment.yaml @@ -4,7 +4,7 @@ metadata: labels: app: vid-mariadb name: vid-mariadb - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-vid" spec: selector: matchLabels: @@ -45,12 +45,12 @@ spec: volumes: - name: vid-mariadb-data hostPath: - path: /dockerdata-nfs/onap/vid/mariadb/data + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/vid/mariadb/data - name: vid-pre-init hostPath: - path: /dockerdata-nfs/onap/vid/vid/lf_config/vid-pre-init.sql + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/vid/vid/lf_config/vid-pre-init.sql - name: my-cnf hostPath: - path: /dockerdata-nfs/onap/vid/vid/lf_config/vid-my.cnf + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/vid/vid/lf_config/vid-my.cnf imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml index 58ce80b80b..c535b440c1 100644 --- a/kubernetes/vid/templates/vid-server-deployment.yaml +++ b/kubernetes/vid/templates/vid-server-deployment.yaml @@ -4,7 +4,7 @@ metadata: labels: app: vid-server name: vid-server - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-vid" spec: selector: matchLabels: @@ -44,19 +44,19 @@ spec: containers: - env: - name: ASDC_CLIENT_REST_HOST - value: sdc-be.onap-sdc + value: sdc-be.{{ .Values.nsPrefix }}-sdc - name: ASDC_CLIENT_REST_AUTH value: Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU= - name: ASDC_CLIENT_REST_PORT value: "8080" - name: VID_AAI_HOST - value: aai-service.onap-aai + value: aai-service.{{ .Values.nsPrefix }}-aai - name: VID_AAI_PORT value: "8443" - name: VID_ECOMP_SHARED_CONTEXT_REST_URL - value: http://portalapps.onap-portal:8989/ECOMPPORTAL/context + value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/context - name: VID_MSO_SERVER_URL - value: http://mso.onap-mso:8080 + value: http://mso.{{ .Values.nsPrefix }}-mso:8080 - name: VID_MSO_PASS value: 51515201a8d4c5c08d533db9bd1e1a9b - name: MSO_DME2_SERVER_URL @@ -64,13 +64,13 @@ spec: - name: MSO_DME2_ENABLED value: "false" - name: VID_ECOMP_REDIRECT_URL - value: http://portalapps.onap-portal:8989/ECOMPPORTAL/login.htm + value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/login.htm - name: VID_ECOMP_REST_URL - value: http://portalapps.onap-portal:8989/ECOMPPORTAL/auxapi + value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/auxapi - name: VID_CONTACT_US_LINK value: https://todo_contact_us_link.com - name: VID_UEB_URL_LIST - value: dmaap.onap-message-router + value: dmaap.{{ .Values.nsPrefix }}-message-router - name: VID_MYSQL_HOST value: vid-mariadb - name: VID_MYSQL_PORT @@ -94,4 +94,4 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml index a8d7a5b093..0bcbc22fa8 100644 --- a/kubernetes/vid/values.yaml +++ b/kubernetes/vid/values.yaml @@ -1,4 +1,4 @@ -NS: onap-vid +nsPrefix: onap pullPolicy: IfNotPresent image: readiness: oomk8s/readiness-check:1.0.0 |