summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hussey <sh8121@att.com>2018-12-14 14:11:02 -0600
committerScott Hussey <sh8121@att.com>2018-12-14 14:11:02 -0600
commitbb81a1cecd27520b858e00f0bcf519ceb2d07582 (patch)
tree9218464f1815537c215b8beca6d9f01009fe63cc
parent617607e42690befae69c86ad9b21134fdd467cbb (diff)
Support tuning of the ingress fallback error pages
- If the error pages service doesn't have endpoints, ingress will start up a default service. Allow the port for this service to be tunable. Change-Id: I3f60a7cb47570459da99fcd854c453e81330b052
Notes
Notes (review): Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Code-Review+2: Pete Birley <petebirley@gmail.com> Workflow+1: Pete Birley <petebirley@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sun, 16 Dec 2018 19:36:29 +0000 Reviewed-on: https://review.openstack.org/625338 Project: openstack/airship-maas Branch: refs/heads/master
-rw-r--r--charts/maas/templates/bin/_maas-ingress.sh.tpl1
-rw-r--r--charts/maas/templates/deployment-maas-ingress.yaml3
-rw-r--r--charts/maas/values.yaml2
3 files changed, 6 insertions, 0 deletions
diff --git a/charts/maas/templates/bin/_maas-ingress.sh.tpl b/charts/maas/templates/bin/_maas-ingress.sh.tpl
index 5dda64a..f8e47b2 100644
--- a/charts/maas/templates/bin/_maas-ingress.sh.tpl
+++ b/charts/maas/templates/bin/_maas-ingress.sh.tpl
@@ -28,6 +28,7 @@ function start () {
28 --status-port="${STATUS_PORT}" \ 28 --status-port="${STATUS_PORT}" \
29 --healthz-port="${HEALTHZ_PORT}" \ 29 --healthz-port="${HEALTHZ_PORT}" \
30 --election-id=${RELEASE_NAME} \ 30 --election-id=${RELEASE_NAME} \
31 --default-server-port=${DEFAULT_ERROR_PORT} \
31 --ingress-class=maas-ingress \ 32 --ingress-class=maas-ingress \
32 --default-backend-service=${POD_NAMESPACE}/${ERROR_PAGE_SERVICE} \ 33 --default-backend-service=${POD_NAMESPACE}/${ERROR_PAGE_SERVICE} \
33 --configmap=${POD_NAMESPACE}/maas-ingress-config \ 34 --configmap=${POD_NAMESPACE}/maas-ingress-config \
diff --git a/charts/maas/templates/deployment-maas-ingress.yaml b/charts/maas/templates/deployment-maas-ingress.yaml
index 842000e..b4142ff 100644
--- a/charts/maas/templates/deployment-maas-ingress.yaml
+++ b/charts/maas/templates/deployment-maas-ingress.yaml
@@ -252,6 +252,9 @@ spec:
252 value: {{ tuple "maas_ingress" "podport" "status" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} 252 value: {{ tuple "maas_ingress" "podport" "status" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
253 - name: ERROR_PAGE_SERVICE 253 - name: ERROR_PAGE_SERVICE
254 value: {{ tuple "maas_ingress" "error_pages" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" | quote }} 254 value: {{ tuple "maas_ingress" "error_pages" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" | quote }}
255 - name: DEFAULT_ERROR_PORT
256 value: {{ tuple "maas_ingress" "default" "ingress_default_server" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
257
255 volumeMounts: 258 volumeMounts:
256 - mountPath: /tmp/maas-ingress.sh 259 - mountPath: /tmp/maas-ingress.sh
257 name: maas-bin 260 name: maas-bin
diff --git a/charts/maas/values.yaml b/charts/maas/values.yaml
index c28e7e4..7be752f 100644
--- a/charts/maas/values.yaml
+++ b/charts/maas/values.yaml
@@ -357,6 +357,8 @@ endpoints:
357 error_pages: 357 error_pages:
358 default: 8080 358 default: 8080
359 podport: 10080 359 podport: 10080
360 ingress_default_server:
361 default: 8181
360 healthz: 362 healthz:
361 podport: 10254 363 podport: 10254
362 status: 364 status: