diff options
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/clamp/values.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/common/dgbuilder/templates/deployment.yaml | 8 | ||||
| -rw-r--r-- | kubernetes/common/mysql/templates/service.yaml | 10 | ||||
| -rw-r--r-- | kubernetes/common/mysql/values.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/esr/charts/esr-gui/values.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/esr/values.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/nbi/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/dev.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/disable-allcharts.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/portal/charts/portal-mariadb/values.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/sdnc/values.yaml | 2 |
11 files changed, 26 insertions, 17 deletions
diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml index 71752fcfc6..751e4a0c11 100644 --- a/kubernetes/clamp/values.yaml +++ b/kubernetes/clamp/values.yaml @@ -48,8 +48,8 @@ config: "clamp.config.sdc.serviceUsername": "clamp", "clamp.config.sdc.servicePassword": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981", "clamp.config.files.sdcController": "file:/opt/clamp/sdc-controllers-config.json", - "clamp.config.dcae.inventory.url": "http://dcaegen2.{{ include "common.namespace" . }}:8080", - "clamp.config.dcae.dispatcher.url": "http://dcaegen2.{{ include "common.namespace" . }}:8080", + "clamp.config.dcae.inventory.url": "http://inventory.{{ include "common.namespace" . }}:8080", + "clamp.config.dcae.dispatcher.url": "http://deployment-handler.{{ include "common.namespace" . }}:8443", "clamp.config.policy.pdpUrl1": "https://pdp.{{ include "common.namespace" . }}:9091/pdp/ , testpdp, alpha123", "clamp.config.policy.pdpUrl2": "https://pdp.{{ include "common.namespace" . }}:9091/pdp/ , testpdp, alpha123", "clamp.config.policy.papUrl": "https://pap.{{ include "common.namespace" . }}:8443/pap/ , testpap, alpha123", diff --git a/kubernetes/common/dgbuilder/templates/deployment.yaml b/kubernetes/common/dgbuilder/templates/deployment.yaml index b9c90f2681..328e058f5c 100644 --- a/kubernetes/common/dgbuilder/templates/deployment.yaml +++ b/kubernetes/common/dgbuilder/templates/deployment.yaml @@ -60,16 +60,16 @@ spec: mountPath: /opt/app/application.properties subPath: application.properties - name: config - mountPath: /opt/onap/sdnc/dgbuilder/releases/sdnc1.0/conf/svclogic.properties + mountPath: /opt/onap/ccsdk/dgbuilder/releases/sdnc1.0/conf/svclogic.properties subPath: svclogic.properties - name: config - mountPath: /opt/onap/sdnc/dgbuilder/svclogic/svclogic.properties + mountPath: /opt/onap/ccsdk/dgbuilder/svclogic/svclogic.properties subPath: svclogic.properties - name: scripts - mountPath: /opt/onap/sdnc/dgbuilder/createReleaseDir.sh + mountPath: /opt/onap/ccsdk/dgbuilder/createReleaseDir.sh subPath: createReleaseDir.sh - name: scripts - mountPath: /opt/onap/sdnc/dgbuilder/releases/sdnc1.0/customSettings.js + mountPath: /opt/onap/ccsdk/dgbuilder/releases/sdnc1.0/customSettings.js subPath: customSettings.js resources: {{ toYaml .Values.resources | indent 12 }} diff --git a/kubernetes/common/mysql/templates/service.yaml b/kubernetes/common/mysql/templates/service.yaml index ed4f72adc5..dc63e31029 100644 --- a/kubernetes/common/mysql/templates/service.yaml +++ b/kubernetes/common/mysql/templates/service.yaml @@ -115,15 +115,15 @@ metadata: statefulset.kubernetes.io/pod-name: {{ include "common.fullname" . }}-0 spec: ports: - - name: {{ .Values.service.internalPort }} + - name: {{ .Values.service.portName | default .Values.service.name }}-1 port: {{ .Values.service.internalPort }} targetPort: {{ .Values.service.internalPort }} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.externalPort1 }} - - name: {{ .Values.xtrabackup.internalPort }} + nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodeport1 }} + - name: {{ .Values.service.portName | default .Values.service.name }}-2 port: {{ .Values.xtrabackup.internalPort }} targetPort: {{ .Values.xtrabackup.internalPort }} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.externalPort2 }} - type: NodePort + nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodeport2 }} + type: {{ .Values.service.type }} selector: statefulset.kubernetes.io/pod-name: {{ include "common.fullname" . }}-0 release: {{ .Release.Name }} diff --git a/kubernetes/common/mysql/values.yaml b/kubernetes/common/mysql/values.yaml index b12e72d0a2..6805aa5e6c 100644 --- a/kubernetes/common/mysql/values.yaml +++ b/kubernetes/common/mysql/values.yaml @@ -87,6 +87,9 @@ service: mountdPort: 20048 rpcbindPort: 111 rpcbindUdpPort: 111 + type: NodePort + nodeport1: 72 + nodeport2: 73 ingress: enabled: false diff --git a/kubernetes/esr/charts/esr-gui/values.yaml b/kubernetes/esr/charts/esr-gui/values.yaml index 23ac080ab1..610d9eb17b 100644 --- a/kubernetes/esr/charts/esr-gui/values.yaml +++ b/kubernetes/esr/charts/esr-gui/values.yaml @@ -23,7 +23,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/aai/esr-gui:1.1.0-SNAPSHOT +image: onap/aai/esr-gui:latest pullPolicy: Always msbaddr: msb-iag.{{ include "common.namespace" . }}:80 diff --git a/kubernetes/esr/values.yaml b/kubernetes/esr/values.yaml index 750bcffa20..baa2155375 100644 --- a/kubernetes/esr/values.yaml +++ b/kubernetes/esr/values.yaml @@ -27,7 +27,7 @@ subChartsOnly: # application image repository: nexus3.onap.org:10001 -image: onap/aai/esr-server:1.1.0-SNAPSHOT +image: onap/aai/esr-server:latest pullPolicy: Always msbaddr: msb-iag.{{ include "common.namespace" . }}:80 diff --git a/kubernetes/nbi/templates/deployment.yaml b/kubernetes/nbi/templates/deployment.yaml index 42d610f351..06572492fd 100644 --- a/kubernetes/nbi/templates/deployment.yaml +++ b/kubernetes/nbi/templates/deployment.yaml @@ -76,13 +76,13 @@ spec: - name: NBI_URL value: "http://nbi.{{ include "common.namespace" . }}:8080/nbi/api/v1" - name: SDC_HOST - value: "http://sdc-fe.{{ include "common.namespace" . }}:8080" + value: "http://sdc-be.{{ include "common.namespace" . }}:8080" - name: SDC_HEADER_ECOMPINSTANCEID value: {{ .Values.config.ecompInstanceId }} - name: SDC_HEADER_AUTHORIZATION value: {{ .Values.sdc_authorization }} - name: AAI_HOST - value: "http://aai.{{ include "common.namespace" . }}:8443" + value: "https://aai.{{ include "common.namespace" . }}:8443" - name: AAI_HEADER_AUTHORIZATION value: {{ .Values.aai_authorization }} - name: SO_HOST diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml index 9b10012879..7a988a532f 100644 --- a/kubernetes/onap/resources/environments/dev.yaml +++ b/kubernetes/onap/resources/environments/dev.yaml @@ -78,6 +78,8 @@ msb: enabled: false multicloud: enabled: false +nbi: + enabled: false policy: enabled: false portal: diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml index 0f669beaab..8b66dab319 100644 --- a/kubernetes/onap/resources/environments/disable-allcharts.yaml +++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml @@ -51,6 +51,8 @@ msb: enabled: false multicloud: enabled: false +nbi: + enabled: false oof: enabled: false policy: diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml index ae5849eb27..fc4836bf07 100644 --- a/kubernetes/portal/charts/portal-mariadb/values.yaml +++ b/kubernetes/portal/charts/portal-mariadb/values.yaml @@ -77,14 +77,14 @@ affinity: {} # probe configuration parameters liveness: - initialDelaySeconds: 300 + initialDelaySeconds: 450 periodSeconds: 10 # necessary to disable liveness probe when setting breakpoints # in debugger so K8s doesn't restart unresponsive container enabled: true readiness: - initialDelaySeconds: 300 + initialDelaySeconds: 450 periodSeconds: 10 ## Persist data to a persitent volume diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index a550b22e11..89d6f7cc72 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -43,6 +43,7 @@ config: enableClustering: true binDir: /opt/onap/sdnc/bin geoEnabled: false +# if geoEnabled is set to true here, mysql.geoEnabled must be set to true # if geoEnabled is set to true the following 3 values must be set to their proper values myODLCluster: 127.0.0.1 peerODLCluster: 127.0.0.1 @@ -103,6 +104,7 @@ mysql: enabled: true disableNfsProvisioner: true replicaCount: 1 + geoEnabled: false dgbuilder: nameOverride: sdnc-dgbuilder |