Chart uplift: ingress-nginx-controller 0.26.1

Uplifts the ingress-nginx-controller image to 0.26.1, including the
required chart modifications for RBAC, new options for stream and
profiler ports, and a change in the default status port from 18080
to 10246.

Change-Id: Ia0b33a739ea180de45b7e3920968d12ea651a573
This commit is contained in:
Phil Sphicas 2020-01-01 14:30:10 -08:00
parent 03ebbaaca3
commit 0a8b01bb72
3 changed files with 21 additions and 9 deletions

View File

@ -26,6 +26,8 @@ function start () {
--watch-namespace="${POD_NAMESPACE}" \ --watch-namespace="${POD_NAMESPACE}" \
--https-port="${HTTPS_PORT}" \ --https-port="${HTTPS_PORT}" \
--status-port="${STATUS_PORT}" \ --status-port="${STATUS_PORT}" \
--stream-port="${STREAM_PORT}" \
--profiler-port="${PROFILER_PORT}" \
--healthz-port="${HEALTHZ_PORT}" \ --healthz-port="${HEALTHZ_PORT}" \
--election-id=${RELEASE_NAME} \ --election-id=${RELEASE_NAME} \
--default-server-port=${DEFAULT_ERROR_PORT} \ --default-server-port=${DEFAULT_ERROR_PORT} \

View File

@ -54,23 +54,25 @@ rules:
- get - get
- list - list
- watch - watch
- apiGroups:
- ""
resources:
- events
verbs:
- create
- patch
- apiGroups: - apiGroups:
- "extensions" - "extensions"
- "networking.k8s.io"
resources: resources:
- ingresses - ingresses
verbs: verbs:
- get - get
- list - list
- watch - watch
- apiGroups:
- ""
resources:
- events
verbs:
- create
- patch
- apiGroups: - apiGroups:
- "extensions" - "extensions"
- "networking.k8s.io"
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
@ -253,6 +255,10 @@ spec:
value: {{ tuple "maas_ingress" "podport" "healthz" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} value: {{ tuple "maas_ingress" "podport" "healthz" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
- name: STATUS_PORT - name: STATUS_PORT
value: {{ tuple "maas_ingress" "podport" "status" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} value: {{ tuple "maas_ingress" "podport" "status" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
- name: STREAM_PORT
value: {{ tuple "maas_ingress" "podport" "stream" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
- name: PROFILER_PORT
value: {{ tuple "maas_ingress" "podport" "profiler" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
- name: ERROR_PAGE_SERVICE - name: ERROR_PAGE_SERVICE
value: {{ tuple "maas_ingress" "error_pages" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" | quote }} value: {{ tuple "maas_ingress" "error_pages" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" | quote }}
- name: DEFAULT_ERROR_PORT - name: DEFAULT_ERROR_PORT

View File

@ -104,7 +104,7 @@ images:
export_api_key: quay.io/airshipit/maas-region-controller:latest export_api_key: quay.io/airshipit/maas-region-controller:latest
maas_cache: quay.io/airshipit/sstream-cache:latest maas_cache: quay.io/airshipit/sstream-cache:latest
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.20.0 ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1
ingress_vip: docker.io/busybox:latest ingress_vip: docker.io/busybox:latest
error_pages: gcr.io/google_containers/ingress-gce-404-server-with-metrics-amd64:v1.6.0 error_pages: gcr.io/google_containers/ingress-gce-404-server-with-metrics-amd64:v1.6.0
maas_syslog: quay.io/airshipit/maas-region-controller:latest maas_syslog: quay.io/airshipit/maas-region-controller:latest
@ -444,7 +444,11 @@ endpoints:
healthz: healthz:
podport: 10254 podport: 10254
status: status:
podport: 18080 podport: 10246
stream:
podport: 10247
profiler:
podport: 10245
maas_syslog: maas_syslog:
hosts: hosts:
default: maas-syslog default: maas-syslog