From d8ffb6e7989fbc38fa6713d805e9636565b695b9 Mon Sep 17 00:00:00 2001
From: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
Date: Wed, 7 Aug 2019 14:49:10 +0200
Subject: moving certificates from vid image to mounted catalog

Issue-ID: VID-494
Change-Id: Ie1a3a9b362618d6b1821583bc6b3c39c28eb82c0
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
---
 kubernetes/vid/resources/certs/org.onap.vid.jks       | Bin 0 -> 3576 bytes
 kubernetes/vid/resources/certs/org.onap.vid.trust.jks | Bin 0 -> 1413 bytes
 kubernetes/vid/templates/deployment.yaml              |   5 +++++
 kubernetes/vid/templates/secrets.yaml                 |  14 ++++++++++++++
 4 files changed, 19 insertions(+)
 create mode 100644 kubernetes/vid/resources/certs/org.onap.vid.jks
 create mode 100644 kubernetes/vid/resources/certs/org.onap.vid.trust.jks

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
Binary files /dev/null and b/kubernetes/vid/resources/certs/org.onap.vid.jks differ
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
Binary files /dev/null and b/kubernetes/vid/resources/certs/org.onap.vid.trust.jks differ
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 }}
-- 
cgit 1.2.3-korg