Merge "Change ingress base hostname"

diff --git a/components/aai-babel/values.yaml b/components/aai-babel/values.yaml
index 441aab3..b0f29dd 100644 (file)
--- a/components/aai-babel/values.yaml
+++ b/components/aai-babel/values.yaml
@@ -67,7 +67,7 @@ ingress:
       name: "aai-babel"
       port: 9516
   config:
-    ssl: "none"
+    ssl: "redirect"
 
 resources:
   small:

diff --git a/components/aai-schema-service/values.yaml b/components/aai-schema-service/values.yaml
index 3344f41..08905d1 100644 (file)
--- a/components/aai-schema-service/values.yaml
+++ b/components/aai-schema-service/values.yaml
@@ -22,7 +22,7 @@ global: # global defaults
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aai-schema-service:1.6.7
+image: onap/aai-schema-service:1.6.8
 pullPolicy: Always
 restartPolicy: Always
 flavor: small

diff --git a/components/aai-sparky-be/resources/config/application-ssl.properties b/components/aai-sparky-be/resources/config/application-ssl.properties
index e40ff2c..50e8432 100644 (file)
--- a/components/aai-sparky-be/resources/config/application-ssl.properties
+++ b/components/aai-sparky-be/resources/config/application-ssl.properties
@@ -14,7 +14,7 @@
 
 server.port=8000
 server.ssl.key-store=file:${CONFIG_HOME}/auth/org.onap.aai.p12
-server.ssl.key-store-password=OBF:19qb1u9x1dpn1opn1zzw1fvi1fap1uuo1kiw1dbj1w9r1row1rpq1w7z1d8v1knq1uvi1f7x1fts20021orn1dn71u9l19q3
+server.ssl.key-store-password=OBF:1cqc1l4h1qhu1j751p3j1kmy1ncw1o6g1hf418571g7i1d9r1dan1ga8185f1hfy1o461ncu1kjo1p671j7x1qjg1l8t1cne
 server.ssl.enabled-protocols=TLSv1.1,TLSv1.2
 server.ssl.trust-store=file:${CONFIG_HOME}/auth/truststoreONAPall.jks
 server.ssl.trust-store-password=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0

diff --git a/components/aai-sparky-be/resources/config/auth/org.onap.aai.p12 b/components/aai-sparky-be/resources/config/auth/org.onap.aai.p12
index 5737e48..b2449c6 100644 (file)
Binary files a/components/aai-sparky-be/resources/config/auth/org.onap.aai.p12 and b/components/aai-sparky-be/resources/config/auth/org.onap.aai.p12 differ

diff --git a/components/aai-sparky-be/values.yaml b/components/aai-sparky-be/values.yaml
index 164b3b8..36820c4 100644 (file)
--- a/components/aai-sparky-be/values.yaml
+++ b/components/aai-sparky-be/values.yaml
@@ -95,7 +95,7 @@ ingress:
       name: "aai-sparky-be"
       port: 8000
   config:
-    ssl: "none"
+    ssl: "redirect"
 
 # Configure resource requests and limits
 # ref: http://kubernetes.io/docs/user-guide/compute-resources/