Merge "Upgrade chart source and version"

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

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

magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml

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

releasenotes/notes/ingress-ngnix-de3c70ca48552833.yaml

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