Merge "Support for custom Ingress host"

Juniper · Jul 17, 2018 · 8067623 · 8067623
2 parents 535eea6 + ee3a608
commit 8067623
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/contrail-analytics/templates/ingress-analytics-api.yaml b/contrail-analytics/templates/ingress-analytics-api.yaml
@@ -8,21 +8,21 @@ metadata:
   name: contrail-analytics-api
 spec:
   rules:
-  - host: contrail-analytics-api
+  - host: {{ .Values.ingress.analytics_api_host }}
     http:
       paths:
       - backend:
           serviceName: analytics-api-server
           servicePort: api
         path: /
-  - host: contrail-analytics-api.{{ .Release.Namespace }}
+  - host: {{ .Values.ingress.analytics_api_host }}.{{ .Release.Namespace }}
     http:
       paths:
       - backend:
           serviceName: analytics-api-server
           servicePort: api
         path: /
-  - host: contrail-analytics-api.{{ .Release.Namespace }}.svc.cluster.local
+  - host: {{ .Values.ingress.analytics_api_host }}.{{ .Release.Namespace }}.svc.cluster.local
     http:
       paths:
       - backend:

diff --git a/contrail-analytics/values.yaml b/contrail-analytics/values.yaml
@@ -91,6 +91,10 @@ pod:
 service:
   analytics_api_public_port: ""
 
+# Ingress related inputs are defined here
+ingress:
+  analytics_api_host: "contrail-analytics-api"
+
 manifests:
   configmap_analytics_env: true
   configmap_analytics_keystone: true

diff --git a/contrail-controller/templates/ingress-config-api.yaml b/contrail-controller/templates/ingress-config-api.yaml
@@ -8,21 +8,21 @@ metadata:
   name: contrail-config-api
 spec:
   rules:
-  - host: contrail-config-api
+  - host: {{ .Values.ingress.config_api_host }}
     http:
       paths:
       - backend:
           serviceName: config-api-server
           servicePort: api
         path: /
-  - host: contrail-config-api.{{ .Release.Namespace }}
+  - host: {{ .Values.ingress.config_api_host }}.{{ .Release.Namespace }}
     http:
       paths:
       - backend:
           serviceName: config-api-server
           servicePort: api
         path: /
-  - host: contrail-config-api.{{ .Release.Namespace }}.svc.cluster.local
+  - host: {{ .Values.ingress.config_api_host }}.{{ .Release.Namespace }}.svc.cluster.local
     http:
       paths:
       - backend:

diff --git a/contrail-controller/templates/ingress-webui.yaml b/contrail-controller/templates/ingress-webui.yaml
@@ -16,25 +16,25 @@ metadata:
 spec:
   tls:
   - hosts:
-    - contrail-webui.contrail.svc.cluster.local
-    - contrail-webui.contrail
-    - contrail-webui
+    - {{ .Values.ingress.webui_host }}.contrail.svc.cluster.local
+    - {{ .Values.ingress.webui_host }}.contrail
+    - {{ .Values.ingress.webui_host }}
   rules:
-  - host: contrail-webui
+  - host: {{ .Values.ingress.webui_host }}
     http:
       paths:
       - backend:
           serviceName: contrail-web-controller
           servicePort: https
         path: /
-  - host: contrail-webui.{{ .Release.Namespace }}
+  - host: {{ .Values.ingress.webui_host }}.{{ .Release.Namespace }}
     http:
       paths:
       - backend:
           serviceName: contrail-web-controller
           servicePort: https
         path: /
-  - host: contrail-webui.{{ .Release.Namespace }}.svc.cluster.local
+  - host: {{ .Values.ingress.webui_host }}.{{ .Release.Namespace }}.svc.cluster.local
     http:
       paths:
       - backend:

diff --git a/contrail-controller/values.yaml b/contrail-controller/values.yaml
@@ -203,6 +203,11 @@ pod:
 service:
   config_api_public_port: ""
 
+# Ingress related inputs are defined here
+ingress:
+  config_api_host: "contrail-config-api"
+  webui_host: "contrail-webui"
+
 manifests:
   configmap_controller_env: true
   configmap_controller_keystone: true