Merge "clamphealth check"

[oom.git] / kubernetes / aai / templates / configmap.yaml

diff --git a/kubernetes/aai/templates/configmap.yaml b/kubernetes/aai/templates/configmap.yaml
index 78235bc..00d2a80 100644 (file)
--- a/kubernetes/aai/templates/configmap.yaml
+++ b/kubernetes/aai/templates/configmap.yaml
@@ -13,23 +13,25 @@ metadata:
   name: aai-deployment-configmap
   namespace: {{ include "common.namespace" . }}
 data:
-{{ tpl (.Files.Glob "resources/config/haproxy/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/haproxy/haproxy.cfg").AsConfig . | indent 2 }}
 ---
-# this is a shared resource for subcharts
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
-  name: aai-chef-config
+  name: aai-haproxy-secret
   namespace: {{ include "common.namespace" . }}
+type: Opaque
 data:
-{{ tpl (.Files.Glob "resources/config/aai-data/chef-config/dev/.knife/solo.rb").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/haproxy/aai.pem").AsSecrets . | indent 2 }}
+# This is a shared key for both resources and traversal
 ---
-# this is a shared resource for subcharts
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
-  name: aai-resources-environments
+  name: aai-auth-secret
   namespace: {{ include "common.namespace" . }}
+type: Opaque
 data:
-{{ tpl (.Files.Glob "resources/config/aai-data/environments/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/aai/aai_keystore").AsSecrets . | indent 2 }}
+