diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2019-08-12 18:08:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-08-12 18:08:41 +0000 |
| commit | 0307b8b767b8dfdb706933a6b34cf7b09e6bbe34 (patch) | |
| tree | d6d7f66ead9016594edc143c3ccca8f653da6420 | |
| parent | 82d0c37c9f1dcc3d188436c6d1f7f6848426b668 (diff) | |
| parent | d8ffb6e7989fbc38fa6713d805e9636565b695b9 (diff) | |
Merge "moving certificates from vid image to mounted catalog" into staging
| -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 }} |