summaryrefslogtreecommitdiffstats
path: root/charts
diff options
context:
space:
mode:
Diffstat (limited to 'charts')
-rw-r--r--charts/aai-resources/resources/config/aai_keystorebin3811 -> 0 bytes
-rw-r--r--charts/aai-resources/templates/configmap.yaml9
-rw-r--r--charts/aai-resources/templates/deployment.yaml2
-rw-r--r--charts/aai-traversal/resources/config/aai_keystorebin3811 -> 0 bytes
-rw-r--r--charts/aai-traversal/templates/configmap.yaml9
-rw-r--r--charts/aai-traversal/templates/deployment.yaml2
-rw-r--r--charts/aai-traversal/templates/job.yaml2
7 files changed, 3 insertions, 21 deletions
diff --git a/charts/aai-resources/resources/config/aai_keystore b/charts/aai-resources/resources/config/aai_keystore
deleted file mode 100644
index 1ddef0c..0000000
--- a/charts/aai-resources/resources/config/aai_keystore
+++ /dev/null
Binary files differ
diff --git a/charts/aai-resources/templates/configmap.yaml b/charts/aai-resources/templates/configmap.yaml
index 5e371ea..373819e 100644
--- a/charts/aai-resources/templates/configmap.yaml
+++ b/charts/aai-resources/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 }}
diff --git a/charts/aai-resources/templates/deployment.yaml b/charts/aai-resources/templates/deployment.yaml
index 6c65bce..72c7bc0 100644
--- a/charts/aai-resources/templates/deployment.yaml
+++ b/charts/aai-resources/templates/deployment.yaml
@@ -542,7 +542,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.restartPolicy }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
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 @@ 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/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 @@ 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/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 @@ 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"