summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartosz Gardziejewski <bartosz.gardziejewski@nokia.com>2019-08-07 14:49:10 +0200
committerIttay Stern <ittay.stern@att.com>2019-08-12 10:11:38 +0000
commitd8ffb6e7989fbc38fa6713d805e9636565b695b9 (patch)
tree2be5644ef9c2c63ecc73ff03285758faf28e858b
parent4b81773259ba002b28d14db2a17ded946876fba7 (diff)
moving certificates from vid image to mounted catalog
Issue-ID: VID-494 Change-Id: Ie1a3a9b362618d6b1821583bc6b3c39c28eb82c0 Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
-rw-r--r--kubernetes/vid/resources/certs/org.onap.vid.jksbin0 -> 3576 bytes
-rw-r--r--kubernetes/vid/resources/certs/org.onap.vid.trust.jksbin0 -> 1413 bytes
-rw-r--r--kubernetes/vid/templates/deployment.yaml5
-rw-r--r--kubernetes/vid/templates/secrets.yaml14
4 files changed, 19 insertions, 0 deletions
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
Binary files 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
--- /dev/null
+++ b/kubernetes/vid/resources/certs/org.onap.vid.trust.jks
Binary files 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 }}