diff options
| author |   Alexis de Talhouët <adetalhouet89@gmail.com> | 2018-09-27 22:43:18 +0200 |
|---|---|---|
| committer |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-10-02 14:14:36 +0000 |
| commit | db36b4231d31572a34fb83030f5bc580fb4b575d (patch) | |
| tree | 88411b210a3e0364241e6a821f402f98542d4d8a /kubernetes/common/network-name-gen/templates | |
| parent | c1f19899e4fd486b396b49a81b9f870112085fad (diff) | |
Add missing props in network-name-gen chart
Add missing aai keystore
Add support for aai auth
Issue-ID: OOM-1448
Change-Id: Ic8213b42f2a2bdfca8162e2a9f75251a2169ee0f
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Diffstat (limited to 'kubernetes/common/network-name-gen/templates')
| -rw-r--r-- | kubernetes/common/network-name-gen/templates/deployment.yaml | 12 | ||||
| -rw-r--r-- | kubernetes/common/network-name-gen/templates/secrets.yaml | 8 |
2 files changed, 19 insertions, 1 deletions
diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml index 743c8be02e..dac4e0d4ce 100644 --- a/kubernetes/common/network-name-gen/templates/deployment.yaml +++ b/kubernetes/common/network-name-gen/templates/deployment.yaml @@ -77,6 +77,13 @@ spec: value: "{{ .Values.config.aaiCertPath }}" - name: AAI_URI value: "{{ .Values.config.aaiUri }}" + - name: AAI_AUTH + value: "{{ .Values.config.aaiAuth }}" + volumeMounts: + - name: certs + mountPath: /opt/etc/config/aai_keystore + subPath: aai_keystore + readOnly: true resources: {{ include "common.resources" . | indent 12 }} {{- if .Values.nodeSelector }} @@ -87,6 +94,9 @@ spec: affinity: {{ toYaml .Values.affinity | indent 10 }} {{- end }} - + volumes: + - name: certs + secret: + secretName: {{ .Release.Name}}-aai-keystore imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/common/network-name-gen/templates/secrets.yaml b/kubernetes/common/network-name-gen/templates/secrets.yaml index b50ad4eb26..4b6d97acad 100644 --- a/kubernetes/common/network-name-gen/templates/secrets.yaml +++ b/kubernetes/common/network-name-gen/templates/secrets.yaml @@ -25,3 +25,11 @@ metadata: type: Opaque data: db-root-password: {{ index .Values "mariadb-galera" "config" "mariadbRootPassword" | b64enc | quote }} +--- +apiVersion: v1 +data: +{{ tpl (.Files.Glob "resources/config/aai_keystore").AsConfig . | indent 2 }} +metadata: + name: {{ .Release.Name}}-aai-keystore + namespace: {{ include "common.namespace" . }} +kind: Secret |