From 56dd4fdb848adbe44f8e76c70b7593b92e933e29 Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Wed, 27 Sep 2023 23:57:19 +0000
Subject: [PATCH] [ingress-controller] Fixed controller parameters

This PS fixes some ingress controller parameters.

Change-Id: Ifb96703a8322bbe75834f4b117a4230e236ee6d0
---
 ingress/Chart.yaml                                   |  4 ++--
 ingress/templates/bin/_ingress-controller.sh.tpl     |  1 +
 ingress/values.yaml                                  | 12 ++++++++++--
 .../values_overrides/ingress-class-namespaced.yaml   |  9 +++++++++
 releasenotes/notes/ingress.yaml                      |  1 +
 5 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 ingress/values_overrides/ingress-class-namespaced.yaml

diff --git a/ingress/Chart.yaml b/ingress/Chart.yaml
index 92278e3f8..fac53330b 100644
--- a/ingress/Chart.yaml
+++ b/ingress/Chart.yaml
@@ -12,10 +12,10 @@
 
 ---
 apiVersion: v1
-appVersion: v0.42.0
+appVersion: v1.5.1
 description: OpenStack-Helm Ingress Controller
 name: ingress
-version: 0.2.16
+version: 0.2.17
 home: https://github.com/kubernetes/ingress
 sources:
   - https://github.com/kubernetes/ingress
diff --git a/ingress/templates/bin/_ingress-controller.sh.tpl b/ingress/templates/bin/_ingress-controller.sh.tpl
index 19fb4fcf3..23b189508 100644
--- a/ingress/templates/bin/_ingress-controller.sh.tpl
+++ b/ingress/templates/bin/_ingress-controller.sh.tpl
@@ -46,6 +46,7 @@ function start () {
       --election-id=${RELEASE_NAME} \
       --controller-class=${CONTROLLER_CLASS} \
       --ingress-class=${INGRESS_CLASS} \
+      --ingress-class-by-name=${INGRESS_CLASS_BY_NAME} \
       --default-backend-service=${POD_NAMESPACE}/${ERROR_PAGE_SERVICE} \
       {{- if .Values.conf.default_ssl_certificate.enabled }}
       {{- $ns := .Values.conf.default_ssl_certificate.namespace | default .Release.Namespace }}
diff --git a/ingress/values.yaml b/ingress/values.yaml
index 09d0e5f55..46f2b5ad4 100644
--- a/ingress/values.yaml
+++ b/ingress/values.yaml
@@ -309,13 +309,21 @@ secrets:
     secret_dhparam: |
 conf:
   controller:
-    # NOTE(portdirect): if left blank this is populated from
+    # NOTE: if left blank this is populated from
     # .deployment.cluster.class in cluster mode, or set to
     # "nginx" in namespace mode
+    # [IN DEPRECATION] Name of the ingress class this controller satisfies.
+    # The class of an Ingress object is set using the annotation "kubernetes.io/ingress.class" (deprecated).
+    # The parameter --controller-class has precedence over this. (default "nginx")
     INGRESS_CLASS: null
-    # NOTE(portdirect): if left blank this is populated from
+    # Define if Ingress Controller should watch for Ingress Class by Name together with Controller Class
+    INGRESS_CLASS_BY_NAME: true
+    # NOTE: if left blank this is populated from
     # .deployment.cluster.controllerClass in cluster mode, or set to
     # "k8s.io/nginx-ingress" in namespace mode
+    # Ingress Class Controller value this Ingress satisfies.
+    # The class of an Ingress object is set using the field IngressClassName in Kubernetes clusters version v1.19.0 or higher. The .spec.controller value of the IngressClass
+    # referenced in an Ingress Object should be the same value specified here to make this object be watched. (default "k8s.io/ingress-nginx")
     CONTROLLER_CLASS: null
   ingress:
     enable-underscores-in-headers: "true"
diff --git a/ingress/values_overrides/ingress-class-namespaced.yaml b/ingress/values_overrides/ingress-class-namespaced.yaml
new file mode 100644
index 000000000..0831a62d4
--- /dev/null
+++ b/ingress/values_overrides/ingress-class-namespaced.yaml
@@ -0,0 +1,9 @@
+---
+conf:
+  ingress:
+    proxy-body-size: 20m
+  controller:
+    INGRESS_CLASS: ucp-ingress
+    INGRESS_CLASS_BY_NAME: true
+    CONTROLLER_CLASS: k8s.io/ucp-ingress
+...
diff --git a/releasenotes/notes/ingress.yaml b/releasenotes/notes/ingress.yaml
index 69b01ab4e..4af952044 100644
--- a/releasenotes/notes/ingress.yaml
+++ b/releasenotes/notes/ingress.yaml
@@ -20,4 +20,5 @@ ingress:
   - 0.2.14 Replace node-role.kubernetes.io/master with control-plane
   - 0.2.15 Update kubernetes registry to registry.k8s.io
   - 0.2.16 Updated deprecated IngressClass annotation
+  - 0.2.17 Fixed controller parameters
 ...