From db36b4231d31572a34fb83030f5bc580fb4b575d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= Date: Thu, 27 Sep 2018 22:43:18 +0200 Subject: [PATCH] Add missing props in network-name-gen chart MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Add missing aai keystore Add support for aai auth Issue-ID: OOM-1448 Change-Id: Ic8213b42f2a2bdfca8162e2a9f75251a2169ee0f Signed-off-by: Alexis de Talhouët --- .../network-name-gen/resources/config/aai_keystore | Bin 0 -> 4929 bytes .../common/network-name-gen/templates/deployment.yaml | 12 +++++++++++- .../common/network-name-gen/templates/secrets.yaml | 8 ++++++++ kubernetes/common/network-name-gen/values.yaml | 13 +++++++------ 4 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 kubernetes/common/network-name-gen/resources/config/aai_keystore diff --git a/kubernetes/common/network-name-gen/resources/config/aai_keystore b/kubernetes/common/network-name-gen/resources/config/aai_keystore new file mode 100644 index 0000000000000000000000000000000000000000..83cae95273e9c975f891f4ac8c0ea33c9973b358 GIT binary patch literal 4929 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 Mbgr|7JL%Rx08Cf%rvLx| literal 0 HcmV?d00001 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 diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml index b40ac91cbc..67ba1ce274 100644 --- a/kubernetes/common/network-name-gen/values.yaml +++ b/kubernetes/common/network-name-gen/values.yaml @@ -61,14 +61,15 @@ pullPolicy: IfNotPresent config: dbUrl: jdbc:mysql://nengdb:3306/nengdb springProfile: live - polClientAuth: TBD - polBasicAuth: TBD - polUrl: TBD + polClientAuth: cHl0aG9uOnRlc3Q= + polBasicAuth: dGVzdHBkcDphbHBoYTEyMw== + polUrl: https://pdp:8081/pdp/api/getConfig polEnv: TEST polReqId: xx - aaiCertPass: TBD - aaiCertPath: TBD - aaiUri: TBD + aaiCertPass: changeit + aaiCertPath: /opt/etc/config/aai_keystore + aaiAuth: QUFJOkFBSQ== + aaiUri: https://aai:8443/aai/v14/ # default number of instances replicaCount: 1 -- 2.16.6