summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-28 18:58:40 +0000
committerGerrit Code Review <review@openstack.org>2019-02-28 18:58:40 +0000
commit5e4ab93da83733a3ccc3f2f50d812242f11fe82e (patch)
tree238229c46864c71edcf2178a5803b8553c6f809c
parent361b13342ef60b6aa0e3ad523fb2084c95881a31 (diff)
parenta833b682db38b5c9bfcd5f528faabd7aa8862b48 (diff)
Merge "(security) Optionally only allow MAAS api access"
-rw-r--r--charts/maas/templates/ingress-region.yaml4
-rw-r--r--charts/maas/values.yaml1
2 files changed, 5 insertions, 0 deletions
diff --git a/charts/maas/templates/ingress-region.yaml b/charts/maas/templates/ingress-region.yaml
index 9801fae..089f97f 100644
--- a/charts/maas/templates/ingress-region.yaml
+++ b/charts/maas/templates/ingress-region.yaml
@@ -27,7 +27,11 @@ spec:
27 - host: {{ tuple "maas_region" "public" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }} 27 - host: {{ tuple "maas_region" "public" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}
28 http: 28 http:
29 paths: 29 paths:
30{{- if .Values.conf.maas.ingress_disable_gui }}
31 - path: /MAAS/api
32{{- else }}
30 - path: / 33 - path: /
34{{- end }}
31 backend: 35 backend:
32 serviceName: {{ tuple "maas_region" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} 36 serviceName: {{ tuple "maas_region" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
33 servicePort: region-api 37 servicePort: region-api
diff --git a/charts/maas/values.yaml b/charts/maas/values.yaml
index 7be752f..f475f43 100644
--- a/charts/maas/values.yaml
+++ b/charts/maas/values.yaml
@@ -154,6 +154,7 @@ conf:
154 override: 154 override:
155 append: 155 append:
156 http_boot: true 156 http_boot: true
157 ingress_disable_gui: false
157 ntp: 158 ntp:
158 # These options allow you to mock out the ntpd binary within the container 159 # These options allow you to mock out the ntpd binary within the container
159 # by overwriting it with a script that simply sleeps - this is useful in 160 # by overwriting it with a script that simply sleeps - this is useful in