From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Thu, 27 Sep 2018 20:43:18 +0000 (+0200)
Subject: Add missing props in network-name-gen chart
X-Git-Tag: 3.0.0-ONAP~221^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=db36b4231d31572a34fb83030f5bc580fb4b575d;p=oom.git

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>
---

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 0000000000..83cae95273
Binary files /dev/null and b/kubernetes/common/network-name-gen/resources/config/aai_keystore differ
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