diff options
23 files changed, 51 insertions, 56 deletions
diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml index 6e4084483e..63b9b005b9 100644 --- a/kubernetes/aai/templates/all-services.yaml +++ b/kubernetes/aai/templates/all-services.yaml @@ -154,11 +154,11 @@ spec: - name: "aai-service-port-8443" port: 8443 targetPort: 8443 - nodePort: 30233 + nodePort: {{ .Values.nodePortPrefix }}33 - name: "aai-service-port-8080" port: 8080 targetPort: 8080 - nodePort: 30232 + nodePort: {{ .Values.nodePortPrefix }}32 type: NodePort selector: app: aai-service @@ -174,10 +174,10 @@ spec: ports: - name: "model-loader-service-port-8443" port: 8443 - nodePort: 30229 + nodePort: {{ .Values.nodePortPrefix }}29 - name: "model-loader-service-port-8080" port: 8080 - nodePort: 30210 + nodePort: {{ .Values.nodePortPrefix }}10 type: NodePort selector: app: model-loader-service diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml index c0715382e6..290ffc5c21 100644 --- a/kubernetes/aai/values.yaml +++ b/kubernetes/aai/values.yaml @@ -1,5 +1,6 @@ nsPrefix: onap pullPolicy: Always +nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 aaiProxy: aaionap/haproxy diff --git a/kubernetes/appc/templates/all-services.yaml b/kubernetes/appc/templates/all-services.yaml index 95472319ed..5c42d72a01 100644 --- a/kubernetes/appc/templates/all-services.yaml +++ b/kubernetes/appc/templates/all-services.yaml @@ -53,10 +53,10 @@ spec: - name: "appc-port-8282" port: 8282 targetPort: 8181 - nodePort: 30230 + nodePort: {{ .Values.nodePortPrefix }}30 - name: "appc-port-1830" port: 1830 - nodePort: 30231 + nodePort: {{ .Values.nodePortPrefix }}31 type: NodePort selector: app: appc @@ -73,7 +73,7 @@ spec: - name: "appc-dgbuilder-port" port: 3000 targetPort: 3100 - nodePort: 30228 + nodePort: {{ .Values.nodePortPrefix }}28 type: NodePort selector: app: appc-dgbuilder diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml index 74b189f371..7916b734aa 100644 --- a/kubernetes/appc/values.yaml +++ b/kubernetes/appc/values.yaml @@ -1,5 +1,6 @@ nsPrefix: onap pullPolicy: Always +nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 appc: nexus3.onap.org:10001/openecomp/appc-image:1.1-STAGING-latest diff --git a/kubernetes/message-router/templates/all-services.yaml b/kubernetes/message-router/templates/all-services.yaml index f190b862aa..85c4f010cf 100644 --- a/kubernetes/message-router/templates/all-services.yaml +++ b/kubernetes/message-router/templates/all-services.yaml @@ -40,10 +40,10 @@ spec: ports: - name: mr1 port: 3904 - nodePort: 30227 + nodePort: {{ .Values.nodePortPrefix }}27 - name: mr2 port: 3905 - nodePort: 30226 + nodePort: {{ .Values.nodePortPrefix }}26 selector: app: dmaap type: NodePort diff --git a/kubernetes/message-router/values.yaml b/kubernetes/message-router/values.yaml index a3210c29c1..92067294f8 100644 --- a/kubernetes/message-router/values.yaml +++ b/kubernetes/message-router/values.yaml @@ -1,5 +1,6 @@ nsPrefix: onap pullPolicy: Always +nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 dmaap: attos/dmaap:latest diff --git a/kubernetes/mso/templates/all-services.yaml b/kubernetes/mso/templates/all-services.yaml index a674adb35e..96c7fd79e8 100644 --- a/kubernetes/mso/templates/all-services.yaml +++ b/kubernetes/mso/templates/all-services.yaml @@ -8,7 +8,7 @@ metadata: spec: ports: - port: 3306 - nodePort: 30252 + nodePort: {{ .Values.nodePortPrefix }}52 selector: app: mariadb type: NodePort @@ -46,17 +46,17 @@ spec: ports: - name: mso1 port: 8080 - nodePort: 30223 + nodePort: {{ .Values.nodePortPrefix }}23 - name: mso2 port: 3904 - nodePort: 30225 + nodePort: {{ .Values.nodePortPrefix }}25 - name: mso3 port: 3905 - nodePort: 30224 + nodePort: {{ .Values.nodePortPrefix }}24 - name: mso4 port: 9990 - nodePort: 30222 + nodePort: {{ .Values.nodePortPrefix }}22 - name: mso5 port: 8787 - nodePort: 30250 + nodePort: {{ .Values.nodePortPrefix }}50 type: NodePort diff --git a/kubernetes/mso/values.yaml b/kubernetes/mso/values.yaml index a7eed4797d..883db87a8d 100644 --- a/kubernetes/mso/values.yaml +++ b/kubernetes/mso/values.yaml @@ -1,5 +1,6 @@ nsPrefix: onap pullPolicy: Always +nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 mso: nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash index 829f27a4df..e408d67477 100755 --- a/kubernetes/oneclick/createAll.bash +++ b/kubernetes/oneclick/createAll.bash @@ -25,21 +25,7 @@ create_registry_key() { } create_onap_helm() { - helm install ../$2/ --name $2 --namespace $1 --set nsPrefix=$1 -} - -configure_app() { - # if previous configuration exists put back original template file - for file in $3/*.yaml; do - if [ -e "$file-template" ]; then - mv "$file-template" "${file%}" - fi - done - - 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 - fi + helm install ../$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1 --set nodePortPrefix=$3 } @@ -51,6 +37,7 @@ INSTANCE=1 MAX_INSTANCE=5 DU=$ONAP_DOCKER_USER DP=$ONAP_DOCKER_PASS +_FILES_PATH=$(echo ../$i/templates) while getopts ":n:u:s:i:a:du:dp:" PARAM; do case $PARAM in @@ -119,9 +106,7 @@ for i in ${HELM_APPS[@]}; do 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) - configure_app $NS $i $_FILES_PATH $start $end - create_onap_helm $NS $i + create_onap_helm $NS $i $start printf "\n" done diff --git a/kubernetes/oneclick/deleteAll.bash b/kubernetes/oneclick/deleteAll.bash index 33ecb320e5..40d070124a 100755 --- a/kubernetes/oneclick/deleteAll.bash +++ b/kubernetes/oneclick/deleteAll.bash @@ -17,7 +17,7 @@ delete_registry_key() { } delete_app_helm() { - helm delete $1 --purge + helm delete $1-$2 --purge } usage() { @@ -74,7 +74,7 @@ printf "\n********** Cleaning up ONAP: ${ONAP_APPS[*]}\n" for i in ${HELM_APPS[@]}; do - delete_app_helm $i + delete_app_helm $NS $i delete_namespace $NS $i done diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml index eb524edfc4..cd01b54ee8 100644 --- a/kubernetes/policy/templates/all-services.yaml +++ b/kubernetes/policy/templates/all-services.yaml @@ -39,7 +39,7 @@ spec: ports: - name: "drools-port" port: 6969 - nodePort: 30217 + nodePort: {{ .Values.nodePortPrefix }}17 selector: app: drools type: NodePort @@ -55,10 +55,10 @@ spec: ports: - name: 8443-port port: 8443 - nodePort: 30219 + nodePort: {{ .Values.nodePortPrefix }}19 - name: 9091-port port: 9091 - nodePort: 30218 + nodePort: {{ .Values.nodePortPrefix }}18 selector: app: pap type: NodePort @@ -94,7 +94,7 @@ spec: ports: - name: 8081-port port: 8081 - nodePort: 30220 + nodePort: {{ .Values.nodePortPrefix }}20 selector: app: pdp type: NodePort @@ -110,7 +110,7 @@ spec: ports: - name: tcp-31032-8480-bm91k port: 8480 - nodePort: 30221 + nodePort: {{ .Values.nodePortPrefix }}21 selector: app: pypdp type: NodePort @@ -126,7 +126,7 @@ spec: ports: - name: 9989-port port: 9989 - nodePort: 30216 + nodePort: {{ .Values.nodePortPrefix }}16 selector: app: brmsgw type: NodePort diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml index 0f990c94ff..25823b0969 100644 --- a/kubernetes/policy/values.yaml +++ b/kubernetes/policy/values.yaml @@ -1,5 +1,6 @@ nsPrefix: onap pullPolicy: Always +nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 policyPe: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.0-STAGING-latest diff --git a/kubernetes/portal/templates/all-services.yaml b/kubernetes/portal/templates/all-services.yaml index 2107e2a30b..b3fabb2932 100644 --- a/kubernetes/portal/templates/all-services.yaml +++ b/kubernetes/portal/templates/all-services.yaml @@ -23,15 +23,15 @@ metadata: spec: ports: - name: portal-1 - nodePort: 30213 + nodePort: {{ .Values.nodePortPrefix }}13 port: 8006 targetPort: 8005 - name: portal-2 - nodePort: 30214 + nodePort: {{ .Values.nodePortPrefix }}14 port: 8010 targetPort: 8009 - name: portal-3 - nodePort: 30215 + nodePort: {{ .Values.nodePortPrefix }}15 port: 8989 targetPort: 8080 selector: @@ -50,11 +50,11 @@ spec: - name: tcp-1 port: 6080 targetPort: 80 - nodePort: 30211 + nodePort: {{ .Values.nodePortPrefix }}11 - name: tcp-2 port: 5900 targetPort: 5900 - nodePort: 30212 + nodePort: {{ .Values.nodePortPrefix }}12 selector: app: vnc-portal type: NodePort diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml index ae9479e03a..f4d1919904 100644 --- a/kubernetes/portal/values.yaml +++ b/kubernetes/portal/values.yaml @@ -1,5 +1,6 @@ nsPrefix: onap pullPolicy: Always +nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 portalapps: nexus3.onap.org:10001/openecomp/portalapps:1.1-STAGING-latest diff --git a/kubernetes/robot/all-services.yaml b/kubernetes/robot/all-services.yaml index b152454125..1fbabe2df6 100644 --- a/kubernetes/robot/all-services.yaml +++ b/kubernetes/robot/all-services.yaml @@ -7,7 +7,7 @@ metadata: spec: ports: - port: 88 - nodePort: 30209 + nodePort: {{ .Values.nodePortPrefix }}09 selector: app: robot type: NodePort diff --git a/kubernetes/robot/templates/all-services.yaml b/kubernetes/robot/templates/all-services.yaml index a14dae777c..f126bc9b74 100644 --- a/kubernetes/robot/templates/all-services.yaml +++ b/kubernetes/robot/templates/all-services.yaml @@ -8,7 +8,7 @@ metadata: spec: ports: - port: 88 - nodePort: 30209 + nodePort: {{ .Values.nodePortPrefix }}09 selector: app: robot type: NodePort diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml index 90566c4dd8..221b572264 100644 --- a/kubernetes/robot/values.yaml +++ b/kubernetes/robot/values.yaml @@ -1,5 +1,6 @@ nsPrefix: onap pullPolicy: Always +nodePortPrefix: 302 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 93febccbed..88cbe8eeb8 100644 --- a/kubernetes/sdc/templates/all-services.yaml +++ b/kubernetes/sdc/templates/all-services.yaml @@ -57,10 +57,10 @@ metadata: spec: ports: - name: sdc-be-port-8443 - nodePort: 30204 + nodePort: {{ .Values.nodePortPrefix }}04 port: 8443 - name: sdc-be-port-8080 - nodePort: 30205 + nodePort: {{ .Values.nodePortPrefix }}05 port: 8080 selector: app: sdc-be @@ -76,10 +76,10 @@ metadata: spec: ports: - name: sdc-fe-port-9443 - nodePort: 30207 + nodePort: {{ .Values.nodePortPrefix }}07 port: 9443 - name: sdc-fe-port-8181 - nodePort: 30206 + nodePort: {{ .Values.nodePortPrefix }}06 port: 8181 selector: app: sdc-fe diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml index 139f08c4f3..58bcf1c3f3 100644 --- a/kubernetes/sdc/values.yaml +++ b/kubernetes/sdc/values.yaml @@ -1,5 +1,6 @@ nsPrefix: onap pullPolicy: Always +nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 sdcKibana: nexus3.onap.org:10001/openecomp/sdc-kibana:1.1-STAGING-latest diff --git a/kubernetes/sdnc/templates/all-services.yaml b/kubernetes/sdnc/templates/all-services.yaml index 311bd7b407..4a24947544 100644 --- a/kubernetes/sdnc/templates/all-services.yaml +++ b/kubernetes/sdnc/templates/all-services.yaml @@ -52,7 +52,7 @@ spec: - name: "sdnc-dgbuilder-port" port: 3000 targetPort: 3100 - nodePort: 30203 + nodePort: {{ .Values.nodePortPrefix }}03 type: NodePort selector: app: sdnc-dgbuilder @@ -69,7 +69,7 @@ spec: - name: "sdnc-port" port: 8282 targetPort: 8181 - nodePort: 30202 + nodePort: {{ .Values.nodePortPrefix }}02 type: NodePort selector: app: sdnc @@ -85,7 +85,7 @@ spec: ports: - name: "sdnc-portal-port" port: 8843 - nodePort: 30201 + nodePort: {{ .Values.nodePortPrefix }}01 type: NodePort selector: app: sdnc-portal diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 5e17a96a5d..0ccc357526 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -1,5 +1,6 @@ nsPrefix: onap pullPolicy: Always +nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 mysqlServer: mysql/mysql-server:5.6 diff --git a/kubernetes/vid/templates/all-services.yaml b/kubernetes/vid/templates/all-services.yaml index c0856711bb..270aab9fc1 100644 --- a/kubernetes/vid/templates/all-services.yaml +++ b/kubernetes/vid/templates/all-services.yaml @@ -21,7 +21,7 @@ metadata: spec: ports: - name: vid-server - nodePort: 30200 + nodePort: {{ .Values.nodePortPrefix }}00 port: 8080 selector: app: vid-server diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml index ed9e12dd0b..a7d494c73c 100644 --- a/kubernetes/vid/values.yaml +++ b/kubernetes/vid/values.yaml @@ -1,5 +1,6 @@ nsPrefix: onap pullPolicy: IfNotPresent +nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 mariadb: nexus3.onap.org:10001/library/mariadb:10 |