4 files changed, 13 insertions, 10 deletions
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/dgbuilder/values.yaml b/kubernetes/common/dgbuilder/values.yaml
index e7c18c4140..e2d0c10709 100644
--- a/kubernetes/common/dgbuilder/values.yaml
+++ b/kubernetes/common/dgbuilder/values.yaml
@@ -33,7 +33,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/ccsdk-dgbuilder-image:0.2-STAGING-latest
+image: onap/ccsdk-dgbuilder-image:0.2.4
 pullPolicy: Always
 
 # flag to enable debugging - application support required
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