From 3413dba8c0a40c341947457a87f04e09d22e37a0 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Mon, 4 Mar 2019 15:25:39 -0600
Subject: [PATCH] Update ingress controller image, ingress cookie annotations

This updates the ingress controller image to v0.23.0, which was
required to add support for configuring cookie max age and expires
for ingresses via annotations on the ingress.

This also removes the --enable-dynamic-configuration flag, as the
flag is no longer valid in 0.23.0 due to the functionality being
a default behavior of the nginx ingress controller in recent
releases

Change-Id: I4917797c43ec973ed0bb311fc305b01f10abd4e5
---
 ingress/templates/bin/_ingress-controller.sh.tpl | 1 -
 ingress/values.yaml                              | 2 +-
 kibana/values.yaml                               | 2 ++
 nagios/values.yaml                               | 2 ++
 prometheus/values.yaml                           | 2 ++
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ingress/templates/bin/_ingress-controller.sh.tpl b/ingress/templates/bin/_ingress-controller.sh.tpl
index 7631727b2..c8ac04986 100644
--- a/ingress/templates/bin/_ingress-controller.sh.tpl
+++ b/ingress/templates/bin/_ingress-controller.sh.tpl
@@ -25,7 +25,6 @@ function start () {
       {{- if eq .Values.deployment.mode "namespace" }}
       --watch-namespace ${POD_NAMESPACE} \
       {{- end }}
-      --enable-dynamic-configuration \
       --http-port=${PORT_HTTP} \
       --https-port=${PORT_HTTPS} \
       --healthz-port=${PORT_HEALTHZ} \
diff --git a/ingress/values.yaml b/ingress/values.yaml
index 0f8690f4a..a2bbbf130 100644
--- a/ingress/values.yaml
+++ b/ingress/values.yaml
@@ -26,7 +26,7 @@ deployment:
 images:
   tags:
     entrypoint: 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.23.0
     ingress_module_init: docker.io/openstackhelm/neutron:ocata
     ingress_routed_vip: docker.io/openstackhelm/neutron:ocata
     error_pages: gcr.io/google_containers/defaultbackend:1.0
diff --git a/kibana/values.yaml b/kibana/values.yaml
index 530dd6f12..2a6094076 100644
--- a/kibana/values.yaml
+++ b/kibana/values.yaml
@@ -331,6 +331,8 @@ network:
         nginx.ingress.kubernetes.io/affinity: cookie
         nginx.ingress.kubernetes.io/session-cookie-name: kube-ingress-session-kibana
         nginx.ingress.kubernetes.io/session-cookie-hash: sha1
+        nginx.ingress.kubernetes.io/session-cookie-expires: "600"
+        nginx.ingress.kubernetes.io/session-cookie-max-age: "600"
     node_port:
       enabled: false
       port: 30905
diff --git a/nagios/values.yaml b/nagios/values.yaml
index 988c55a69..65cd7a800 100644
--- a/nagios/values.yaml
+++ b/nagios/values.yaml
@@ -181,6 +181,8 @@ network:
         nginx.ingress.kubernetes.io/affinity: cookie
         nginx.ingress.kubernetes.io/session-cookie-name: kube-ingress-session-nagios
         nginx.ingress.kubernetes.io/session-cookie-hash: sha1
+        nginx.ingress.kubernetes.io/session-cookie-expires: "600"
+        nginx.ingress.kubernetes.io/session-cookie-max-age: "600"
     node_port:
       enabled: false
       port: 30925
diff --git a/prometheus/values.yaml b/prometheus/values.yaml
index c13727044..34ad605a6 100644
--- a/prometheus/values.yaml
+++ b/prometheus/values.yaml
@@ -207,6 +207,8 @@ network:
         nginx.ingress.kubernetes.io/affinity: cookie
         nginx.ingress.kubernetes.io/session-cookie-name: kube-ingress-session-prometheus
         nginx.ingress.kubernetes.io/session-cookie-hash: sha1
+        nginx.ingress.kubernetes.io/session-cookie-expires: "600"
+        nginx.ingress.kubernetes.io/session-cookie-max-age: "600"
     node_port:
       enabled: false
       port: 30900