Merge "(security) Optionally only allow MAAS api access"

This commit is contained in:
Zuul 2019-02-28 18:58:40 +00:00 committed by Gerrit Code Review
commit 5e4ab93da8
2 changed files with 5 additions and 0 deletions

View File

@ -27,7 +27,11 @@ spec:
- host: {{ tuple "maas_region" "public" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }} - host: {{ tuple "maas_region" "public" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}
http: http:
paths: paths:
{{- if .Values.conf.maas.ingress_disable_gui }}
- path: /MAAS/api
{{- else }}
- path: / - path: /
{{- end }}
backend: backend:
serviceName: {{ tuple "maas_region" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} serviceName: {{ tuple "maas_region" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
servicePort: region-api servicePort: region-api

View File

@ -154,6 +154,7 @@ conf:
override: override:
append: append:
http_boot: true http_boot: true
ingress_disable_gui: false
ntp: ntp:
# These options allow you to mock out the ntpd binary within the container # These options allow you to mock out the ntpd binary within the container
# by overwriting it with a script that simply sleeps - this is useful in # by overwriting it with a script that simply sleeps - this is useful in