diff options
| author |   Brian Freeman <bf1936@att.com> | 2019-08-13 12:46:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-08-13 12:46:35 +0000 |
| commit | ecdb2369e3b8083b0906b3cf4cace1d2d9f8ff09 (patch) | |
| tree | 19bd336a89f1b152f9b0489d1daf8d50d9244b4a | |
| parent | 802cb55d831fa1db6b35ef5c7fecefb7052fa789 (diff) | |
| parent | 533bbdb33f904216d405cf27e019792b1e187983 (diff) | |
Merge "moving certificates from vid image to mounted catalog"
| -rw-r--r-- | kubernetes/vid/resources/certs/org.onap.vid.jks | bin | 0 -> 3576 bytes | |||
| -rw-r--r-- | kubernetes/vid/resources/certs/org.onap.vid.trust.jks | bin | 0 -> 1413 bytes | |||
| -rw-r--r-- | kubernetes/vid/templates/deployment.yaml | 5 | ||||
| -rw-r--r-- | kubernetes/vid/templates/secrets.yaml | 14 |
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 Binary files differnew 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 Binary files differnew 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 }} |