parameterization of node ports, and create/delete update to fix multi ONAP instances creation(in diff NS).
Issue-ID: OOM-52
Change-Id: Iaa3f5bc43f70b95cdc349389e25ef8b804a7a329
Signed-off-by: kerenj <keren.joseph@amdocs.com>
23 files changed:
- name: "aai-service-port-8443"
port: 8443
targetPort: 8443
- name: "aai-service-port-8443"
port: 8443
targetPort: 8443
+ nodePort: {{ .Values.nodePortPrefix }}33
- name: "aai-service-port-8080"
port: 8080
targetPort: 8080
- name: "aai-service-port-8080"
port: 8080
targetPort: 8080
+ nodePort: {{ .Values.nodePortPrefix }}32
type: NodePort
selector:
app: aai-service
type: NodePort
selector:
app: aai-service
ports:
- name: "model-loader-service-port-8443"
port: 8443
ports:
- name: "model-loader-service-port-8443"
port: 8443
+ nodePort: {{ .Values.nodePortPrefix }}29
- name: "model-loader-service-port-8080"
port: 8080
- name: "model-loader-service-port-8080"
port: 8080
+ nodePort: {{ .Values.nodePortPrefix }}10
type: NodePort
selector:
app: model-loader-service
type: NodePort
selector:
app: model-loader-service
nsPrefix: onap
pullPolicy: Always
nsPrefix: onap
pullPolicy: Always
image:
readiness: oomk8s/readiness-check:1.0.0
ajscAai: nexus3.onap.org:10001/openecomp/ajsc-aai:1.0-STAGING-latest
image:
readiness: oomk8s/readiness-check:1.0.0
ajscAai: nexus3.onap.org:10001/openecomp/ajsc-aai:1.0-STAGING-latest
- name: "appc-port-8282"
port: 8282
targetPort: 8181
- name: "appc-port-8282"
port: 8282
targetPort: 8181
+ nodePort: {{ .Values.nodePortPrefix }}30
- name: "appc-port-1830"
port: 1830
- name: "appc-port-1830"
port: 1830
+ nodePort: {{ .Values.nodePortPrefix }}31
type: NodePort
selector:
app: appc
type: NodePort
selector:
app: appc
- name: "appc-dgbuilder-port"
port: 3000
targetPort: 3100
- name: "appc-dgbuilder-port"
port: 3000
targetPort: 3100
+ nodePort: {{ .Values.nodePortPrefix }}28
type: NodePort
selector:
app: appc-dgbuilder
type: NodePort
selector:
app: appc-dgbuilder
nsPrefix: onap
pullPolicy: Always
nsPrefix: onap
pullPolicy: Always
image:
readiness: oomk8s/readiness-check:1.0.0
appc: nexus3.onap.org:10001/openecomp/appc-image:1.1-STAGING-latest
image:
readiness: oomk8s/readiness-check:1.0.0
appc: nexus3.onap.org:10001/openecomp/appc-image:1.1-STAGING-latest
ports:
- name: mr1
port: 3904
ports:
- name: mr1
port: 3904
+ nodePort: {{ .Values.nodePortPrefix }}27
+ nodePort: {{ .Values.nodePortPrefix }}26
selector:
app: dmaap
type: NodePort
selector:
app: dmaap
type: NodePort
nsPrefix: onap
pullPolicy: Always
nsPrefix: onap
pullPolicy: Always
image:
readiness: oomk8s/readiness-check:1.0.0
dmaap: attos/dmaap:latest
image:
readiness: oomk8s/readiness-check:1.0.0
dmaap: attos/dmaap:latest
spec:
ports:
- port: 3306
spec:
ports:
- port: 3306
+ nodePort: {{ .Values.nodePortPrefix }}52
selector:
app: mariadb
type: NodePort
selector:
app: mariadb
type: NodePort
ports:
- name: mso1
port: 8080
ports:
- name: mso1
port: 8080
+ nodePort: {{ .Values.nodePortPrefix }}23
+ nodePort: {{ .Values.nodePortPrefix }}25
+ nodePort: {{ .Values.nodePortPrefix }}24
+ nodePort: {{ .Values.nodePortPrefix }}22
+ nodePort: {{ .Values.nodePortPrefix }}50
nsPrefix: onap
pullPolicy: Always
nsPrefix: onap
pullPolicy: Always
image:
readiness: oomk8s/readiness-check:1.0.0
mso: nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest
image:
readiness: oomk8s/readiness-check:1.0.0
mso: nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest
- 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
MAX_INSTANCE=5
DU=$ONAP_DOCKER_USER
DP=$ONAP_DOCKER_PASS
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
while getopts ":n:u:s:i:a:du:dp:" PARAM; do
case $PARAM in
create_registry_key $NS $i ${NS}-docker-registry-key $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL
printf "\nCreating deployments and services **********\n"
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
+ helm delete $1-$2 --purge
for i in ${HELM_APPS[@]}; do
for i in ${HELM_APPS[@]}; do
delete_namespace $NS $i
done
delete_namespace $NS $i
done
ports:
- name: "drools-port"
port: 6969
ports:
- name: "drools-port"
port: 6969
+ nodePort: {{ .Values.nodePortPrefix }}17
selector:
app: drools
type: NodePort
selector:
app: drools
type: NodePort
ports:
- name: 8443-port
port: 8443
ports:
- name: 8443-port
port: 8443
+ nodePort: {{ .Values.nodePortPrefix }}19
- name: 9091-port
port: 9091
- name: 9091-port
port: 9091
+ nodePort: {{ .Values.nodePortPrefix }}18
selector:
app: pap
type: NodePort
selector:
app: pap
type: NodePort
ports:
- name: 8081-port
port: 8081
ports:
- name: 8081-port
port: 8081
+ nodePort: {{ .Values.nodePortPrefix }}20
selector:
app: pdp
type: NodePort
selector:
app: pdp
type: NodePort
ports:
- name: tcp-31032-8480-bm91k
port: 8480
ports:
- name: tcp-31032-8480-bm91k
port: 8480
+ nodePort: {{ .Values.nodePortPrefix }}21
selector:
app: pypdp
type: NodePort
selector:
app: pypdp
type: NodePort
ports:
- name: 9989-port
port: 9989
ports:
- name: 9989-port
port: 9989
+ nodePort: {{ .Values.nodePortPrefix }}16
selector:
app: brmsgw
type: NodePort
selector:
app: brmsgw
type: NodePort
nsPrefix: onap
pullPolicy: Always
nsPrefix: onap
pullPolicy: Always
image:
readiness: oomk8s/readiness-check:1.0.0
policyPe: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.0-STAGING-latest
image:
readiness: oomk8s/readiness-check:1.0.0
policyPe: nexus3.onap.org:10001/openecomp/policy/policy-pe:1.0-STAGING-latest
spec:
ports:
- name: portal-1
spec:
ports:
- name: portal-1
+ nodePort: {{ .Values.nodePortPrefix }}13
port: 8006
targetPort: 8005
- name: portal-2
port: 8006
targetPort: 8005
- name: portal-2
+ nodePort: {{ .Values.nodePortPrefix }}14
port: 8010
targetPort: 8009
- name: portal-3
port: 8010
targetPort: 8009
- name: portal-3
+ nodePort: {{ .Values.nodePortPrefix }}15
port: 8989
targetPort: 8080
selector:
port: 8989
targetPort: 8080
selector:
- name: tcp-1
port: 6080
targetPort: 80
- name: tcp-1
port: 6080
targetPort: 80
+ nodePort: {{ .Values.nodePortPrefix }}11
- name: tcp-2
port: 5900
targetPort: 5900
- name: tcp-2
port: 5900
targetPort: 5900
+ nodePort: {{ .Values.nodePortPrefix }}12
selector:
app: vnc-portal
type: NodePort
selector:
app: vnc-portal
type: NodePort
nsPrefix: onap
pullPolicy: Always
nsPrefix: onap
pullPolicy: Always
image:
readiness: oomk8s/readiness-check:1.0.0
portalapps: nexus3.onap.org:10001/openecomp/portalapps:1.1-STAGING-latest
image:
readiness: oomk8s/readiness-check:1.0.0
portalapps: nexus3.onap.org:10001/openecomp/portalapps:1.1-STAGING-latest
+ nodePort: {{ .Values.nodePortPrefix }}09
selector:
app: robot
type: NodePort
selector:
app: robot
type: NodePort
+ nodePort: {{ .Values.nodePortPrefix }}09
selector:
app: robot
type: NodePort
selector:
app: robot
type: NodePort
nsPrefix: onap
pullPolicy: Always
nsPrefix: onap
pullPolicy: Always
image:
testsuite: nexus3.onap.org:10001/openecomp/testsuite:1.1-STAGING-latest
image:
testsuite: nexus3.onap.org:10001/openecomp/testsuite:1.1-STAGING-latest
spec:
ports:
- name: sdc-be-port-8443
spec:
ports:
- name: sdc-be-port-8443
+ nodePort: {{ .Values.nodePortPrefix }}04
port: 8443
- name: sdc-be-port-8080
port: 8443
- name: sdc-be-port-8080
+ nodePort: {{ .Values.nodePortPrefix }}05
port: 8080
selector:
app: sdc-be
port: 8080
selector:
app: sdc-be
spec:
ports:
- name: sdc-fe-port-9443
spec:
ports:
- name: sdc-fe-port-9443
+ nodePort: {{ .Values.nodePortPrefix }}07
port: 9443
- name: sdc-fe-port-8181
port: 9443
- name: sdc-fe-port-8181
+ nodePort: {{ .Values.nodePortPrefix }}06
port: 8181
selector:
app: sdc-fe
port: 8181
selector:
app: sdc-fe
nsPrefix: onap
pullPolicy: Always
nsPrefix: onap
pullPolicy: Always
image:
readiness: oomk8s/readiness-check:1.0.0
sdcKibana: nexus3.onap.org:10001/openecomp/sdc-kibana:1.1-STAGING-latest
image:
readiness: oomk8s/readiness-check:1.0.0
sdcKibana: nexus3.onap.org:10001/openecomp/sdc-kibana:1.1-STAGING-latest
- name: "sdnc-dgbuilder-port"
port: 3000
targetPort: 3100
- name: "sdnc-dgbuilder-port"
port: 3000
targetPort: 3100
+ nodePort: {{ .Values.nodePortPrefix }}03
type: NodePort
selector:
app: sdnc-dgbuilder
type: NodePort
selector:
app: sdnc-dgbuilder
- name: "sdnc-port"
port: 8282
targetPort: 8181
- name: "sdnc-port"
port: 8282
targetPort: 8181
+ nodePort: {{ .Values.nodePortPrefix }}02
type: NodePort
selector:
app: sdnc
type: NodePort
selector:
app: sdnc
ports:
- name: "sdnc-portal-port"
port: 8843
ports:
- name: "sdnc-portal-port"
port: 8843
+ nodePort: {{ .Values.nodePortPrefix }}01
type: NodePort
selector:
app: sdnc-portal
type: NodePort
selector:
app: sdnc-portal
nsPrefix: onap
pullPolicy: Always
nsPrefix: onap
pullPolicy: Always
image:
readiness: oomk8s/readiness-check:1.0.0
mysqlServer: mysql/mysql-server:5.6
image:
readiness: oomk8s/readiness-check:1.0.0
mysqlServer: mysql/mysql-server:5.6
spec:
ports:
- name: vid-server
spec:
ports:
- name: vid-server
+ nodePort: {{ .Values.nodePortPrefix }}00
port: 8080
selector:
app: vid-server
port: 8080
selector:
app: vid-server
nsPrefix: onap
pullPolicy: IfNotPresent
nsPrefix: onap
pullPolicy: IfNotPresent
image:
readiness: oomk8s/readiness-check:1.0.0
mariadb: nexus3.onap.org:10001/library/mariadb:10
image:
readiness: oomk8s/readiness-check:1.0.0
mariadb: nexus3.onap.org:10001/library/mariadb:10