From 450e363b6573d3b6d8b3ad19dc592d304284ee54 Mon Sep 17 00:00:00 2001
From: "Kajur, Harish (vk250x)" <vk250x@att.com>
Date: Thu, 26 Apr 2018 11:26:45 -0400
Subject: [PATCH] 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>
---
 .../aai-resources/resources/config/aai_keystore    | Bin 3811 -> 0 bytes
 .../charts/aai-resources/templates/configmap.yaml  |   9 ---------
 .../charts/aai-resources/templates/deployment.yaml |   2 +-
 .../aai-traversal/resources/config/aai_keystore    | Bin 3811 -> 0 bytes
 .../charts/aai-traversal/templates/configmap.yaml  |   9 ---------
 .../charts/aai-traversal/templates/deployment.yaml |   2 +-
 .../aai/charts/aai-traversal/templates/job.yaml    |   2 +-
 kubernetes/aai/resources/config/aai/aai_keystore   | Bin 0 -> 4928 bytes
 kubernetes/aai/templates/configmap.yaml            |  21 ++++++++++++++++++++-
 kubernetes/aai/values.yaml                         |   2 +-
 10 files changed, 24 insertions(+), 23 deletions(-)
 delete mode 100644 kubernetes/aai/charts/aai-resources/resources/config/aai_keystore
 delete mode 100644 kubernetes/aai/charts/aai-traversal/resources/config/aai_keystore
 create mode 100644 kubernetes/aai/resources/config/aai/aai_keystore

diff --git a/kubernetes/aai/charts/aai-resources/resources/config/aai_keystore b/kubernetes/aai/charts/aai-resources/resources/config/aai_keystore
deleted file mode 100644
index 1ddef0c9bdfd4bcedbf6068115d69687664eceb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3811
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
Uqa7Y|Vd=pIubnfG)Q-3P3t9q14gdfE

diff --git a/kubernetes/aai/charts/aai-resources/templates/configmap.yaml b/kubernetes/aai/charts/aai-resources/templates/configmap.yaml
index 5e371ea5bf..373819e39e 100644
--- a/kubernetes/aai/charts/aai-resources/templates/configmap.yaml
+++ b/kubernetes/aai/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/kubernetes/aai/charts/aai-resources/templates/deployment.yaml b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
index 6c65bce4cc..72c7bc0379 100644
--- a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/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/kubernetes/aai/charts/aai-traversal/resources/config/aai_keystore b/kubernetes/aai/charts/aai-traversal/resources/config/aai_keystore
deleted file mode 100644
index 1ddef0c9bdfd4bcedbf6068115d69687664eceb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3811
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
Uqa7Y|Vd=pIubnfG)Q-3P3t9q14gdfE

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"
diff --git a/kubernetes/aai/resources/config/aai/aai_keystore b/kubernetes/aai/resources/config/aai/aai_keystore
new file mode 100644
index 0000000000000000000000000000000000000000..16d93a7e9f375e28e682dc36508763505daf9236
GIT binary patch
literal 4928
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
CuP3Ac

literal 0
HcmV?d00001

diff --git a/kubernetes/aai/templates/configmap.yaml b/kubernetes/aai/templates/configmap.yaml
index 592e4129d1..00d2a80d9c 100644
--- a/kubernetes/aai/templates/configmap.yaml
+++ b/kubernetes/aai/templates/configmap.yaml
@@ -13,6 +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 }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: aai-haproxy-secret
+  namespace: {{ include "common.namespace" . }}
+type: Opaque
+data:
+{{ tpl (.Files.Glob "resources/config/haproxy/aai.pem").AsSecrets . | indent 2 }}
+# This is a shared key for both resources and traversal
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: aai-auth-secret
+  namespace: {{ include "common.namespace" . }}
+type: Opaque
+data:
+{{ tpl (.Files.Glob "resources/config/aai/aai_keystore").AsSecrets . | indent 2 }}
 
 
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index e8798186ed..b29f8a2b13 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -57,7 +57,7 @@ global: # global defaults
 
 # application image
 dockerhubRepository: registry.hub.docker.com
-image: aaionap/haproxy:1.1.0
+image: aaionap/haproxy:1.2.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
-- 
2.16.6