diff options
author | 2018-10-04 21:10:26 +0000 | |
---|---|---|
committer | 2018-10-04 21:10:26 +0000 | |
commit | e74509ca3d7fcefdd79117241ad6704c957e5572 (patch) | |
tree | 3d5dcc706231e2aa10613333ef092e4ba202cae6 /kubernetes/common | |
parent | 14ae546169f810b905e2a0d5279504217c0d37aa (diff) | |
parent | db36b4231d31572a34fb83030f5bc580fb4b575d (diff) |
Merge "Add missing props in network-name-gen chart"
Diffstat (limited to 'kubernetes/common')
-rw-r--r-- | kubernetes/common/network-name-gen/resources/config/aai_keystore | bin | 0 -> 4929 bytes | |||
-rw-r--r-- | kubernetes/common/network-name-gen/templates/deployment.yaml | 12 | ||||
-rw-r--r-- | kubernetes/common/network-name-gen/templates/secrets.yaml | 8 | ||||
-rw-r--r-- | kubernetes/common/network-name-gen/values.yaml | 13 |
4 files changed, 26 insertions, 7 deletions
diff --git a/kubernetes/common/network-name-gen/resources/config/aai_keystore b/kubernetes/common/network-name-gen/resources/config/aai_keystore Binary files differnew file mode 100644 index 0000000000..83cae95273 --- /dev/null +++ b/kubernetes/common/network-name-gen/resources/config/aai_keystore 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 |