diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst index aff515e805..a19a5fc216 100644 --- a/doc/source/user/index.rst +++ b/doc/source/user/index.rst @@ -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 --- diff --git a/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh b/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh index 69ad7adbe8..2dacf07356 100755 --- a/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh +++ b/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh @@ -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 diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index 2fac63f6fb..d6f1dfd08e 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml @@ -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 diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml index bd97a2a8c2..2bef54d65e 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml @@ -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