From 0a8b01bb721c87ce2d5f37814c31346bedfed83a Mon Sep 17 00:00:00 2001
From: Phil Sphicas <phil.sphicas@att.com>
Date: Wed, 1 Jan 2020 14:30:10 -0800
Subject: [PATCH] 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
---
 .../maas/templates/bin/_maas-ingress.sh.tpl   |  2 ++
 .../templates/deployment-maas-ingress.yaml    | 20 ++++++++++++-------
 charts/maas/values.yaml                       |  8 ++++++--
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/charts/maas/templates/bin/_maas-ingress.sh.tpl b/charts/maas/templates/bin/_maas-ingress.sh.tpl
index b9d3a2d..942231a 100644
--- a/charts/maas/templates/bin/_maas-ingress.sh.tpl
+++ b/charts/maas/templates/bin/_maas-ingress.sh.tpl
@@ -26,6 +26,8 @@ function start () {
       --watch-namespace="${POD_NAMESPACE}" \
       --https-port="${HTTPS_PORT}" \
       --status-port="${STATUS_PORT}" \
+      --stream-port="${STREAM_PORT}" \
+      --profiler-port="${PROFILER_PORT}" \
       --healthz-port="${HEALTHZ_PORT}" \
       --election-id=${RELEASE_NAME} \
       --default-server-port=${DEFAULT_ERROR_PORT} \
diff --git a/charts/maas/templates/deployment-maas-ingress.yaml b/charts/maas/templates/deployment-maas-ingress.yaml
index 22eba1e..2f9b8f6 100644
--- a/charts/maas/templates/deployment-maas-ingress.yaml
+++ b/charts/maas/templates/deployment-maas-ingress.yaml
@@ -54,23 +54,25 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - ""
+    resources:
+      - events
+    verbs:
+      - create
+      - patch
   - apiGroups:
       - "extensions"
+      - "networking.k8s.io"
     resources:
       - ingresses
     verbs:
       - get
       - list
       - watch
-  - apiGroups:
-      - ""
-    resources:
-        - events
-    verbs:
-        - create
-        - patch
   - apiGroups:
       - "extensions"
+      - "networking.k8s.io"
     resources:
       - ingresses/status
     verbs:
@@ -253,6 +255,10 @@ spec:
               value: {{ tuple "maas_ingress" "podport" "healthz" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
             - name: STATUS_PORT
               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
               value: {{ tuple "maas_ingress" "error_pages" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" | quote }}
             - name: DEFAULT_ERROR_PORT
diff --git a/charts/maas/values.yaml b/charts/maas/values.yaml
index 26f8abc..995875d 100644
--- a/charts/maas/values.yaml
+++ b/charts/maas/values.yaml
@@ -104,7 +104,7 @@ images:
     export_api_key: quay.io/airshipit/maas-region-controller:latest
     maas_cache: quay.io/airshipit/sstream-cache:latest
     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
     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
@@ -444,7 +444,11 @@ endpoints:
       healthz:
         podport: 10254
       status:
-        podport: 18080
+        podport: 10246
+      stream:
+        podport: 10247
+      profiler:
+        podport: 10245
   maas_syslog:
     hosts:
       default: maas-syslog