Merge "Add ingress controler support to APPC"

diff --git a/kubernetes/appc/charts/appc-cdt/templates/ingress.yaml b/kubernetes/appc/charts/appc-cdt/templates/ingress.yaml
new file mode 100644 (file)
index 0000000..8f87c68
--- /dev/null
+++ b/kubernetes/appc/charts/appc-cdt/templates/ingress.yaml
@@ -0,0 +1 @@
+{{ include "common.ingress" . }}

diff --git a/kubernetes/appc/charts/appc-cdt/values.yaml b/kubernetes/appc/charts/appc-cdt/values.yaml
index 6c138fa..2fd2fb5 100644 (file)
--- a/kubernetes/appc/charts/appc-cdt/values.yaml
+++ b/kubernetes/appc/charts/appc-cdt/values.yaml
@@ -60,6 +60,12 @@ service:
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: appccdt
+      name: "appc-cdt"
+      port: 18080
+  config:
+    ssl: "none"
 
 # Configure resource requests and limits
 # ref: http://kubernetes.io/docs/user-guide/compute-resources/

diff --git a/kubernetes/appc/templates/ingress.yaml b/kubernetes/appc/templates/ingress.yaml
new file mode 100644 (file)
index 0000000..8f87c68
--- /dev/null
+++ b/kubernetes/appc/templates/ingress.yaml
@@ -0,0 +1 @@
+{{ include "common.ingress" . }}

diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 12defea..4dfb226 100644 (file)
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -163,6 +163,12 @@ persistence:
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: appc
+      name: "appc"
+      port: 8443
+  config:
+    ssl: "redirect"
 
 # Configure resource requests and limits
 # ref: http://kubernetes.io/docs/user-guide/compute-resources/