Ingress Class: Align to upstream. (#377)

* Ingress Class: Align to upstream. * Ingress Class: Add `controller.ingressClass`.
giantswarm · Nov 10, 2022 · 2b976c7 · 2b976c7
1 parent 1d8fe0e
commit 2b976c7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,8 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
   - Webhook: Add `controller.admissionWebhooks.service.externalIPs`.
   - Webhook: Add `controller.admissionWebhooks.service.loadBalancerIP`.
   - Webhook: Add `controller.admissionWebhooks.service.loadBalancerSourceRanges`.
+- Ingress Class: Align to upstream. ([#377](https://github.com/giantswarm/nginx-ingress-controller-app/pull/377))
+  - Ingress Class: Add `controller.ingressClass`.
 
 ### Changed
 
@@ -32,7 +34,7 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
   - HPA: Swap CPU & memory block.
   - HPA: Disable when KEDA is enabled.
 - Admission Webhooks: Align from upstream. ([#370](https://github.com/giantswarm/nginx-ingress-controller-app/pull/370))
-- Ingress Class: Align from upstream. ([#371](https://github.com/giantswarm/nginx-ingress-controller-app/pull/371))
+- Ingress Class: Align from upstream. ([#371](https://github.com/giantswarm/nginx-ingress-controller-app/pull/371), [#374](https://github.com/giantswarm/nginx-ingress-controller-app/pull/374), [#377](https://github.com/giantswarm/nginx-ingress-controller-app/pull/377))
 - Helpers: Rename `labels.selector` to `ingress-nginx.selectorLabels`. ([#372](https://github.com/giantswarm/nginx-ingress-controller-app/pull/372))
 - PDB: Align from upstream. ([#373](https://github.com/giantswarm/nginx-ingress-controller-app/pull/373))
 - Webhook: Align to upstream. ([#374](https://github.com/giantswarm/nginx-ingress-controller-app/pull/374))

diff --git a/helm/nginx-ingress-controller-app/values.schema.json b/helm/nginx-ingress-controller-app/values.schema.json
@@ -281,6 +281,9 @@
                         }
                     }
                 },
+                "ingressClass": {
+                    "type": "string"
+                },
                 "ingressClassByName": {
                     "type": "boolean"
                 },
@@ -298,6 +301,9 @@
                         },
                         "name": {
                             "type": "string"
+                        },
+                        "parameters": {
+                            "type": "object"
                         }
                     }
                 },

diff --git a/helm/nginx-ingress-controller-app/values.yaml b/helm/nginx-ingress-controller-app/values.yaml
@@ -303,8 +303,12 @@ controller:
   # Example value: "default/foo-tls".
   defaultSSLCertificate: ""
 
-  # controller.ingressClassByName
-  # Process IngressClass per name (additionally as per spec.controller).
+  # -- Process Ingress objects without ingressClass annotation/ingressClassName field
+  # Overrides value for --watch-ingress-without-class flag of the controller binary
+  # Defaults to false
+  watchIngressWithoutClass: false
+
+  # -- Process IngressClass per name (additionally as per spec.controller).
   ingressClassByName: false
 
   ## This section refers to the creation of the IngressClass resource
@@ -319,6 +323,15 @@ controller:
     # -- Controller-value of the controller that is processing this ingressClass
     controllerValue: "k8s.io/ingress-nginx"
 
+    # -- Parameters is a link to a custom resource containing additional
+    # configuration for the controller. This is optional if the controller
+    # does not require extra parameters.
+    parameters: {}
+
+  # -- For backwards compatibility with ingress.class annotation, use ingressClass.
+  # Algorithm is as follows, first ingressClassName is considered, if not present, controller looks for ingress.class annotation
+  ingressClass: nginx
+
   # controller.userID
   # The userID that the container will run as. 101 is the www-data user.
   userID: 101
@@ -560,11 +573,6 @@ controller:
   # --disable-svc-external-name flag
   disableExternalNameForwarding: true
 
-  # Process Ingress objects without ingressClass annotation/ingressClassName field
-  # Overrides value for --watch-ingress-without-class flag of the controller binary
-  # Defaults to false
-  watchIngressWithoutClass: false
-
   # This configuration defines if Ingress Controller should allow users to set
   # their own *-snippet annotations, otherwise this is forbidden / dropped
   # when users add those annotations.