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>
diff --git a/charts/aai-traversal/resources/config/aai_keystore b/charts/aai-traversal/resources/config/aai_keystore
deleted file mode 100644
index 1ddef0c..0000000
--- a/charts/aai-traversal/resources/config/aai_keystore
+++ /dev/null
Binary files differ
diff --git a/charts/aai-traversal/templates/configmap.yaml b/charts/aai-traversal/templates/configmap.yaml
index cc88444..373819e 100644
--- a/charts/aai-traversal/templates/configmap.yaml
+++ b/charts/aai-traversal/templates/configmap.yaml
@@ -53,12 +53,3 @@
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/charts/aai-traversal/templates/deployment.yaml b/charts/aai-traversal/templates/deployment.yaml
index bda80a0..b1b6f74 100644
--- a/charts/aai-traversal/templates/deployment.yaml
+++ b/charts/aai-traversal/templates/deployment.yaml
@@ -375,7 +375,7 @@
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/charts/aai-traversal/templates/job.yaml b/charts/aai-traversal/templates/job.yaml
index b9b2501..9d0acf6 100644
--- a/charts/aai-traversal/templates/job.yaml
+++ b/charts/aai-traversal/templates/job.yaml
@@ -125,7 +125,7 @@
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"