openstack
/
openstack-helm-infra
Code Issues Proposed changes

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
This commit is contained in:
Steve Wilkerson 2019-03-04 15:25:39 -06:00
parent 43ae215ca9
commit 3413dba8c0
5 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ingress/templates/bin/_ingress-controller.sh.tpl
View File

@ -25,7 +25,6 @@ function start () {
{{- if eq .Values.deployment.mode "namespace" }} {{- if eq .Values.deployment.mode "namespace" }}
--watch-namespace ${POD_NAMESPACE} \ --watch-namespace ${POD_NAMESPACE} \
{{- end }} {{- end }}
--enable-dynamic-configuration \
--http-port=${PORT_HTTP} \ --http-port=${PORT_HTTP} \
--https-port=${PORT_HTTPS} \ --https-port=${PORT_HTTPS} \
--healthz-port=${PORT_HEALTHZ} \ --healthz-port=${PORT_HEALTHZ} \

2
ingress/values.yaml
View File

@ -26,7 +26,7 @@ deployment:
images: images:
tags: tags:
entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 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_module_init: docker.io/openstackhelm/neutron:ocata
ingress_routed_vip: docker.io/openstackhelm/neutron:ocata ingress_routed_vip: docker.io/openstackhelm/neutron:ocata
error_pages: gcr.io/google_containers/defaultbackend:1.0 error_pages: gcr.io/google_containers/defaultbackend:1.0

2
kibana/values.yaml
View File

@ -331,6 +331,8 @@ network:
nginx.ingress.kubernetes.io/affinity: cookie nginx.ingress.kubernetes.io/affinity: cookie
nginx.ingress.kubernetes.io/session-cookie-name: kube-ingress-session-kibana 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-hash: sha1
nginx.ingress.kubernetes.io/session-cookie-expires: "600"
nginx.ingress.kubernetes.io/session-cookie-max-age: "600"
node_port: node_port:
enabled: false enabled: false
port: 30905 port: 30905

2
nagios/values.yaml
View File

@ -181,6 +181,8 @@ network:
nginx.ingress.kubernetes.io/affinity: cookie nginx.ingress.kubernetes.io/affinity: cookie
nginx.ingress.kubernetes.io/session-cookie-name: kube-ingress-session-nagios 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-hash: sha1
nginx.ingress.kubernetes.io/session-cookie-expires: "600"
nginx.ingress.kubernetes.io/session-cookie-max-age: "600"
node_port: node_port:
enabled: false enabled: false
port: 30925 port: 30925

2
prometheus/values.yaml
View File

@ -207,6 +207,8 @@ network:
nginx.ingress.kubernetes.io/affinity: cookie nginx.ingress.kubernetes.io/affinity: cookie
nginx.ingress.kubernetes.io/session-cookie-name: kube-ingress-session-prometheus 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-hash: sha1
nginx.ingress.kubernetes.io/session-cookie-expires: "600"
nginx.ingress.kubernetes.io/session-cookie-max-age: "600"
node_port: node_port:
enabled: false enabled: false
port: 30900 port: 30900