openstack
/
magnum
Code Issues Proposed changes

Update nginx-ingress to v1.36.3 and 0.32.0 tag 

* remove user since it is controlled in the chart
  and changed from 33 to 101
* use the latest chart v1.36.3 from stable
* use latest 0.32.0 controller image

story: 2006945
task: 39747

Change-Id: I6df49929cb8890f534afde185d56b7b6d70c691e
Signed-off-by: Spyros Trigazis <strigazi@gmail.com>
This commit is contained in:
Spyros Trigazis 2020-05-12 11:36:49 +00:00 committed by Feilong Wang
parent c32c7e03bf
commit 063a65e441
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
doc/source/user/index.rst
View File

@ -392,6 +392,8 @@ the table are linked to more details elsewhere in the user guide.
+---------------------------------------+--------------------+---------------+
| `nginx_ingress_controller_tag`_ | see below | see below |
+---------------------------------------+--------------------+---------------+
| `nginx_ingress_controller_chart_tag`_ | see below | see below |
+---------------------------------------+--------------------+---------------+
| `kubelet_options`_ | extra kubelet args | "" |
+---------------------------------------+--------------------+---------------+
| `kubeapi_options`_ | extra kubeapi args | "" |
@ -1665,10 +1667,21 @@ _`octavia_ingress_controller_tag`
The image tag for octavia-ingress-controller. Train-default: v1.15.0
_`nginx_ingress_controller_tag`
The image tag for nginx-ingress-controller. Stein-default: 0.23.0
The image tag for nginx-ingress-controller.
Stein-default: 0.23.0
Train-default: 0.26.1
Ussuru-default: 0.26.1
Victoria-default: 0.32.0
_`nginx_ingress_controller_chart_tag`
The chart version for nginx-ingress-controller.
Train-default: v1.24.7
Ussuru-default: v1.24.7
Victoria-default: v1.36.3
_`traefik_ingress_controller_tag`
The image tag for traefik_ingress_controller_tag. Stein-default: v1.7.10
The image tag for traefik_ingress_controller_tag.
Stein-default: v1.7.10
DNS
---

2
magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh
View File

@ -1,5 +1,6 @@
#!/bin/bash
set +x
. /etc/sysconfig/heat-params
set -ex
@ -55,7 +56,6 @@ data:
repository: ${CONTAINER_INFRA_PREFIX:-quay.io/kubernetes-ingress-controller/}nginx-ingress-controller
tag: ${NGINX_INGRESS_CONTROLLER_TAG}
pullPolicy: IfNotPresent
runAsUser: 33
config: {}
headers: {}
hostNetwork: true

4
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
View File

@ -809,12 +809,12 @@ parameters:
nginx_ingress_controller_tag:
type: string
description: nginx ingress controller docker image tag
default: 0.26.1
default: 0.32.0
nginx_ingress_controller_chart_tag:
type: string
description: nginx ingress controller helm chart tag
default: v1.24.7
default: v1.36.3
draino_tag:
type: string

4
magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
View File

@ -823,12 +823,12 @@ parameters:
nginx_ingress_controller_tag:
type: string
description: nginx ingress controller docker image tag
default: 0.26.1
default: 0.32.0
nginx_ingress_controller_chart_tag:
type: string
description: nginx ingress controller helm chart tag
default: v1.24.7
default: v1.36.3
draino_tag:
type: string