openstack
/
openstack-helm-infra
Code Issues Proposed changes

Merge "Update ingress controller image, ingress cookie annotations"

This commit is contained in:
Zuul 2019-03-08 20:32:07 +00:00 committed by Gerrit Code Review
parent 244f177ecb 3413dba8c0
commit ff84ab86dc
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" }}
--watch-namespace ${POD_NAMESPACE} \
{{- end }}
--enable-dynamic-configuration \
--http-port=${PORT_HTTP} \
--https-port=${PORT_HTTPS} \
--healthz-port=${PORT_HEALTHZ} \

2
ingress/values.yaml
View File

@ -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

2
kibana/values.yaml
View File

@ -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

2
nagios/values.yaml
View File

@ -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

2
prometheus/values.yaml
View File

@ -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