diff options
| author |   Kajur, Harish (vk250x) <vk250x@att.com> | 2018-04-26 11:26:45 -0400 |
|---|---|---|
| committer | Kajur, Harish (vk250x) <vk250x@att.com> | 2018-05-07 16:39:52 -0400 |
| commit | 450e363b6573d3b6d8b3ad19dc592d304284ee54 (patch) | |
| tree | f0540969669e25ffde87b27509dfb47b34884e7f /kubernetes/aai/charts/aai-traversal | |
| parent | 001f0e3ba057bf749bc1f11813d9b723aeeb828f (diff) | |
Update the keystore for resources and traversal
to use the aaf generated keystore for our apps
Issue-ID: AAI-1101
Change-Id: I5a5642f86e8bb924f2c01fa685a0493abf500623
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
Diffstat (limited to 'kubernetes/aai/charts/aai-traversal')
| -rw-r--r-- | kubernetes/aai/charts/aai-traversal/resources/config/aai_keystore | bin | 3811 -> 0 bytes | |||
| -rw-r--r-- | kubernetes/aai/charts/aai-traversal/templates/configmap.yaml | 9 | ||||
| -rw-r--r-- | kubernetes/aai/charts/aai-traversal/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/aai/charts/aai-traversal/templates/job.yaml | 2 |
4 files changed, 2 insertions, 11 deletions
diff --git a/kubernetes/aai/charts/aai-traversal/resources/config/aai_keystore b/kubernetes/aai/charts/aai-traversal/resources/config/aai_keystore Binary files differdeleted file mode 100644 index 1ddef0c9bd..0000000000 --- a/kubernetes/aai/charts/aai-traversal/resources/config/aai_keystore +++ /dev/null diff --git a/kubernetes/aai/charts/aai-traversal/templates/configmap.yaml b/kubernetes/aai/charts/aai-traversal/templates/configmap.yaml index cc88444ae2..373819e39e 100644 --- a/kubernetes/aai/charts/aai-traversal/templates/configmap.yaml +++ b/kubernetes/aai/charts/aai-traversal/templates/configmap.yaml @@ -53,12 +53,3 @@ metadata: namespace: {{ include "common.namespace" . }} data: {{ tpl (.Files.Glob "resources/config/realm.properties").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.fullname" . }}-auth-secret - namespace: {{ include "common.namespace" . }} -type: Opaque -data: -{{ tpl (.Files.Glob "resources/config/aai_keystore").AsSecrets . | indent 2 }}
\ No newline at end of file diff --git a/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml b/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml index bda80a0483..b1b6f74d3f 100644 --- a/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml +++ b/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml @@ -375,7 +375,7 @@ spec: name: {{ include "common.fullname" . }}-realm-configmap - name: {{ include "common.fullname" . }}-auth-sec secret: - secretName: {{ include "common.fullname" . }}-auth-secret + secretName: aai-auth-secret restartPolicy: {{ .Values.global.restartPolicy | default .Values.restartPolicy }} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/aai/charts/aai-traversal/templates/job.yaml b/kubernetes/aai/charts/aai-traversal/templates/job.yaml index b9b2501304..9d0acf6a63 100644 --- a/kubernetes/aai/charts/aai-traversal/templates/job.yaml +++ b/kubernetes/aai/charts/aai-traversal/templates/job.yaml @@ -125,7 +125,7 @@ spec: name: {{ include "common.fullname" . }}-realm-configmap - name: {{ include "common.fullname" . }}-auth-sec secret: - secretName: {{ include "common.fullname" . }}-auth-secret + secretName: aai-auth-secret restartPolicy: OnFailure imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |