7 files changed, 45 insertions, 14 deletions
diff --git a/kubernetes/vid/charts/vid-mariadb-galera/values.yaml b/kubernetes/vid/charts/vid-mariadb-galera/values.yaml
index d5ed703767..e0da745ebe 100644
--- a/kubernetes/vid/charts/vid-mariadb-galera/values.yaml
+++ b/kubernetes/vid/charts/vid-mariadb-galera/values.yaml
@@ -27,7 +27,7 @@ global:
 
 #repository: mysql
 repository: nexus3.onap.org:10001
-image: adfinissygroup/k8s-mariadb-galera-centos:v002
+image: adfinissygroup/k8s-mariadb-galera-centos:v004
 imageInit: busybox
 pullPolicy: IfNotPresent
 
@@ -43,8 +43,7 @@ config:
 
 
 # default number of instances in the StatefulSet
-# keep in mind that if the number is increased you need to update vid-galera-config-job.yaml so that the job will know to wait for all pods.
-replicaCount: 1
+replicaCount: 2
 
 nodeSelector: {}
 
diff --git a/kubernetes/vid/resources/certs/org.onap.vid.jks b/kubernetes/vid/resources/certs/org.onap.vid.jks
new file mode 100644
index 0000000000..3c2ce9157d
--- /dev/null
+++ b/kubernetes/vid/resources/certs/org.onap.vid.jks
diff --git a/kubernetes/vid/resources/certs/org.onap.vid.trust.jks b/kubernetes/vid/resources/certs/org.onap.vid.trust.jks
new file mode 100644
index 0000000000..4caf7be652
--- /dev/null
+++ b/kubernetes/vid/resources/certs/org.onap.vid.trust.jks
diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 8bce2cf1dc..a4e821ed78 100644
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -109,6 +109,8 @@ spec:
             - name: VID_MYSQL_MAXCONNECTIONS
               value: "{{ .Values.config.vidmysqlmaxconnections }}"
           volumeMounts:
+          - mountPath: /opt/app/vid/etc
+            name: vid-certs
           - mountPath: /etc/localtime
             name: localtime
             readOnly: true
@@ -140,6 +142,9 @@ spec:
           - mountPath: /usr/share/filebeat/data
             name: vid-data-filebeat
       volumes:
+        - name: vid-certs
+          secret:
+            secretName: {{ include "common.fullname" . }}-certs
         - name: localtime
           hostPath:
             path: /etc/localtime
diff --git a/kubernetes/vid/templates/secrets.yaml b/kubernetes/vid/templates/secrets.yaml
index 729e0b17c0..222a3d582a 100644
--- a/kubernetes/vid/templates/secrets.yaml
+++ b/kubernetes/vid/templates/secrets.yaml
@@ -25,3 +25,17 @@ metadata:
 type: Opaque
 data:
   vid-password: {{ .Values.config.vidmysqlpassword | b64enc | quote }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "common.fullname" . }}-certs
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+type: Opaque
+data:
+{{ tpl (.Files.Glob "resources/certs/*").AsSecrets . | indent 2 }}
diff --git a/kubernetes/vid/templates/service.yaml b/kubernetes/vid/templates/service.yaml
index 36b35e40da..1e465c95e0 100644
--- a/kubernetes/vid/templates/service.yaml
+++ b/kubernetes/vid/templates/service.yaml
@@ -29,17 +29,32 @@ spec:
     - port: {{ .Values.service.internalPort }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
       name: {{ .Values.service.portName }}
-    - port: {{ .Values.service.internalPort2 }}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
-      name: {{ .Values.service.portName2 }}
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
       name: {{ .Values.service.portName }}
-    - port: {{ .Values.service.externalPort2 }}
-      targetPort: {{ .Values.service.internalPort2 }}
-      name: {{ .Values.service.portName2 }}
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
     release: {{ .Release.Name }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.servicename" . }}-http
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: ClusterIP
+  selector:
+    app: {{ include "common.name" . }}
+    release: {{ .Release.Name }}
+  ports:
+    - name: {{ .Values.service.portName }}-http
+      port: {{ .Values.service.externalHttpPort }}
+      targetPort: {{ .Values.service.internalHttpPort }}
+      protocol: TCP
diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index 0825c76fb0..6d365a4493 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -27,7 +27,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/vid:4.3.1
+image: onap/vid:5.0.1
 pullPolicy: Always
 
 # mariadb image for initializing
@@ -86,10 +86,8 @@ service:
   externalPort: 8443
   internalPort: 8443
   nodePort: "00"
-  portName2: vid-http
-  externalPort2: 8080
-  internalPort2: 8080
-  nodePort2: "38"
+  externalHttpPort: 8080
+  internalHttpPort: 8080
 
 ingress:
   enabled: false