aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2019-12-11 10:00:22 +0000
committerGerrit Code Review <gerrit@onap.org>2019-12-11 10:00:22 +0000
commitb500d833613a478a1c9d8ac36a665e25f3ec5ef0 (patch)
tree319c8f3a11a550404f5f5216a16ea3c9701611a3
parent4d31247da5a8202f89db9761cae62cbb2c66a585 (diff)
parentac1080a7e6e8df5c2a35a0a7aa98603ab3fa246c (diff)
Merge "Add ingress controller support to portal"
-rw-r--r--kubernetes/portal/charts/portal-app/templates/ingress.yaml1
-rw-r--r--kubernetes/portal/charts/portal-app/values.yaml6
-rw-r--r--kubernetes/portal/charts/portal-sdk/templates/ingress.yaml1
-rw-r--r--kubernetes/portal/charts/portal-sdk/values.yaml6
-rw-r--r--kubernetes/portal/values.yaml3
5 files changed, 17 insertions, 0 deletions
diff --git a/kubernetes/portal/charts/portal-app/templates/ingress.yaml b/kubernetes/portal/charts/portal-app/templates/ingress.yaml
new file mode 100644
index 0000000000..8f87c68f1e
--- /dev/null
+++ b/kubernetes/portal/charts/portal-app/templates/ingress.yaml
@@ -0,0 +1 @@
+{{ include "common.ingress" . }}
diff --git a/kubernetes/portal/charts/portal-app/values.yaml b/kubernetes/portal/charts/portal-app/values.yaml
index a0c3d360c9..59a11ad6cf 100644
--- a/kubernetes/portal/charts/portal-app/values.yaml
+++ b/kubernetes/portal/charts/portal-app/values.yaml
@@ -88,6 +88,12 @@ messageRouter:
ingress:
enabled: false
+ service:
+ - baseaddr: portalapp
+ name: "portal-app"
+ port: 8443
+ config:
+ ssl: "redirect"
# Resource Limit flavor -By Default using small
flavor: small
diff --git a/kubernetes/portal/charts/portal-sdk/templates/ingress.yaml b/kubernetes/portal/charts/portal-sdk/templates/ingress.yaml
new file mode 100644
index 0000000000..8f87c68f1e
--- /dev/null
+++ b/kubernetes/portal/charts/portal-sdk/templates/ingress.yaml
@@ -0,0 +1 @@
+{{ include "common.ingress" . }}
diff --git a/kubernetes/portal/charts/portal-sdk/values.yaml b/kubernetes/portal/charts/portal-sdk/values.yaml
index 8daa14831f..8572ff83da 100644
--- a/kubernetes/portal/charts/portal-sdk/values.yaml
+++ b/kubernetes/portal/charts/portal-sdk/values.yaml
@@ -82,6 +82,12 @@ messageRouter:
ingress:
enabled: false
+ service:
+ - baseaddr: portalsdk
+ name: "portal-sdk"
+ port: 8080
+ config:
+ ssl: "none"
# Resource Limit flavor -By Default using small
flavor: small
diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index 9dbdd7cfd9..8c84cbdbb4 100644
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -52,3 +52,6 @@ zookeeper:
messageRouter:
service:
name: message-router
+
+ingress:
+ enabled: false \ No newline at end of file