openstack/magnum
Code Issues Proposed changes

Upgrade chart source and version

Browse Source 
Change-Id: I7e50b4b5cc2e293b7ba20004d624cd47c3fa41fe
This commit is contained in:
Grzegorz Bialas 2022-03-03 10:52:56 +01:00
parent 7790669913
commit 526ecb865a
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ set +x
. /etc/sysconfig/heat-params . /etc/sysconfig/heat-params
set -ex set -ex
CHART_NAME="nginx-ingress" CHART_NAME="ingress-nginx"
if [ "$(echo ${INGRESS_CONTROLLER} | tr '[:upper:]' '[:lower:]')" = "nginx" ]; then if [ "$(echo ${INGRESS_CONTROLLER} | tr '[:upper:]' '[:lower:]')" = "nginx" ]; then
echo "Writing ${CHART_NAME} config" echo "Writing ${CHART_NAME} config"
@ -13,7 +13,7 @@ if [ "$(echo ${INGRESS_CONTROLLER} | tr '[:upper:]' '[:lower:]')" = "nginx" ]; t
cat << EOF >> ${HELM_CHART_DIR}/requirements.yaml cat << EOF >> ${HELM_CHART_DIR}/requirements.yaml
- name: ${CHART_NAME} - name: ${CHART_NAME}
version: ${NGINX_INGRESS_CONTROLLER_CHART_TAG} version: ${NGINX_INGRESS_CONTROLLER_CHART_TAG}
repository: https://charts.helm.sh/stable repository: https://kubernetes.github.io/ingress-nginx
EOF EOF
cat << EOF >> ${HELM_CHART_DIR}/values.yaml cat << EOF >> ${HELM_CHART_DIR}/values.yaml

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

@ -888,7 +888,7 @@ parameters:
nginx_ingress_controller_chart_tag: nginx_ingress_controller_chart_tag:
type: string type: string
description: nginx ingress controller helm chart tag description: nginx ingress controller helm chart tag
default: v1.36.3 default: 4.0.17
draino_tag: draino_tag:
type: string type: string

7
releasenotes/notes/ingress-ngnix-de3c70ca48552833.yaml Normal file
View File

@ -0,0 +1,7 @@
---
upgrade:
- |
Upgrade of ingress controler. Chart name nginx-ingress has been changed to
ingress-nginx. Chart repository also has been changed. More details about
why this change take place can be found in github repository
https://github.com/kubernetes/ingress-nginx/tree/main/charts/ingress-nginx