From cfc904137c88e459c73603d9ddecab09c489da25 Mon Sep 17 00:00:00 2001
From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Wed, 6 May 2020 15:17:55 +0200
Subject: [PATCH] [AAF] Fix AAF Configuration

set redirect to service providing SSL
add ingress for aaf-oauth

Issue-ID: OOM-2170
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Iec05ec5798cc8240ca45d7d08c973bc3516f5e8f
---
 kubernetes/aaf/charts/aaf-cm/values.yaml                | 2 +-
 kubernetes/aaf/charts/aaf-gui/values.yaml               | 2 +-
 kubernetes/aaf/charts/aaf-locate/templates/ingress.yaml | 2 --
 kubernetes/aaf/charts/aaf-locate/values.yaml            | 2 +-
 kubernetes/aaf/charts/aaf-oauth/templates/ingress.yaml  | 2 ++
 kubernetes/aaf/charts/aaf-oauth/values.yaml             | 2 +-
 kubernetes/aaf/charts/aaf-service/values.yaml           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 kubernetes/aaf/charts/aaf-oauth/templates/ingress.yaml

diff --git a/kubernetes/aaf/charts/aaf-cm/values.yaml b/kubernetes/aaf/charts/aaf-cm/values.yaml
index befbdc191d..37d6c5e2c5 100644
--- a/kubernetes/aaf/charts/aaf-cm/values.yaml
+++ b/kubernetes/aaf/charts/aaf-cm/values.yaml
@@ -52,7 +52,7 @@ ingress:
       name: "aaf-cm"
       port: 8150
   config:
-    ssl: "none"
+    ssl: "redirect"
 
 # Configure resource requests and limits
 resources:
diff --git a/kubernetes/aaf/charts/aaf-gui/values.yaml b/kubernetes/aaf/charts/aaf-gui/values.yaml
index bc013d07f7..8811b3300a 100644
--- a/kubernetes/aaf/charts/aaf-gui/values.yaml
+++ b/kubernetes/aaf/charts/aaf-gui/values.yaml
@@ -54,7 +54,7 @@ ingress:
       name: "aaf-gui"
       port: 8200
   config:
-    ssl: "none"
+    ssl: "redirect"
 
 # Configure resource requests and limits
 resources:
diff --git a/kubernetes/aaf/charts/aaf-locate/templates/ingress.yaml b/kubernetes/aaf/charts/aaf-locate/templates/ingress.yaml
index 40b4bba0ce..1b33c1f8d1 100644
--- a/kubernetes/aaf/charts/aaf-locate/templates/ingress.yaml
+++ b/kubernetes/aaf/charts/aaf-locate/templates/ingress.yaml
@@ -1,4 +1,2 @@
 
 {{ include "common.ingress" . }}
-
-
diff --git a/kubernetes/aaf/charts/aaf-locate/values.yaml b/kubernetes/aaf/charts/aaf-locate/values.yaml
index 2083f1af3d..9209b9d027 100644
--- a/kubernetes/aaf/charts/aaf-locate/values.yaml
+++ b/kubernetes/aaf/charts/aaf-locate/values.yaml
@@ -51,7 +51,7 @@ ingress:
       name: "aaf-locate"
       port: 8095
   config:
-    ssl: "none"
+    ssl: "redirect"
 
 # Configure resource requests and limits
 resources:
diff --git a/kubernetes/aaf/charts/aaf-oauth/templates/ingress.yaml b/kubernetes/aaf/charts/aaf-oauth/templates/ingress.yaml
new file mode 100644
index 0000000000..1b33c1f8d1
--- /dev/null
+++ b/kubernetes/aaf/charts/aaf-oauth/templates/ingress.yaml
@@ -0,0 +1,2 @@
+
+{{ include "common.ingress" . }}
diff --git a/kubernetes/aaf/charts/aaf-oauth/values.yaml b/kubernetes/aaf/charts/aaf-oauth/values.yaml
index deadf2976f..c25327ce03 100644
--- a/kubernetes/aaf/charts/aaf-oauth/values.yaml
+++ b/kubernetes/aaf/charts/aaf-oauth/values.yaml
@@ -51,7 +51,7 @@ ingress:
       name: "aaf-oauth"
       port: 8140
   config:
-    ssl: "none"
+    ssl: "redirect"
 
 # Configure resource requests and limits
 resources:
diff --git a/kubernetes/aaf/charts/aaf-service/values.yaml b/kubernetes/aaf/charts/aaf-service/values.yaml
index 5f3c1878dd..1eb5bb2523 100644
--- a/kubernetes/aaf/charts/aaf-service/values.yaml
+++ b/kubernetes/aaf/charts/aaf-service/values.yaml
@@ -52,7 +52,7 @@ ingress:
       name: "aaf-service"
       port: 8100
   config:
-    ssl: "none"
+    ssl: "redirect"
 
 # Configure resource requests and limits
 resources:
-- 
2.16.6