Support NGINX Ingress Controller 2.4.1 (#43)

Author: lucacome

bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml

@@ -50,7 +50,7 @@ metadata:
               "image": {
                 "pullPolicy": "IfNotPresent",
                 "repository": "nginx/nginx-ingress",
-                "tag": "2.4.0-ubi"
+                "tag": "2.4.1-ubi"
               },
               "includeYear": false,
               "ingressClass": "nginx",

config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml

@@ -50,7 +50,7 @@ metadata:
               "image": {
                 "pullPolicy": "IfNotPresent",
                 "repository": "nginx/nginx-ingress",
-                "tag": "2.4.0-ubi"
+                "tag": "2.4.1-ubi"
               },
               "lifecycle": {},
               "customConfigMap": "",

config/samples/charts_v1alpha1_nginxingress.yaml

@@ -38,7 +38,7 @@ spec:
     image:
       pullPolicy: IfNotPresent
       repository: nginx/nginx-ingress
-      tag: 2.4.0-ubi
+      tag: 2.4.1-ubi
     lifecycle: {}
     customConfigMap: ""
     ingressClass: nginx

docs/nginx-ingress-controller.md

@@ -47,7 +47,7 @@ spec:
     image:
       pullPolicy: IfNotPresent
       repository: nginx/nginx-ingress
-      tag: 2.2.0-ubi
+      tag: 2.4.1-ubi
     ingressClass: nginx
     initContainers: []
     kind: deployment
@@ -126,7 +126,7 @@ Parameter | Description | Default
 `controller.nginxDebug` | Enables debugging for NGINX. Uses the `nginx-debug` binary. Requires `error-log-level: debug` in the ConfigMap via `controller.config.entries`. | false
 `controller.logLevel` | The log level of the Ingress Controller. | 1
 `controller.image.repository` | The image repository of the Ingress Controller. | nginx/nginx-ingress
-`controller.image.tag` | The tag of the Ingress Controller image. | 2.2.0
+`controller.image.tag` | The tag of the Ingress Controller image. | 2.4.1
 `controller.image.pullPolicy` | The pull policy for the Ingress Controller image. | IfNotPresent
 `controller.config.name` | The name of the ConfigMap used by the Ingress Controller. | Autogenerated
 `controller.config.annotations` | The annotations of the Ingress Controller configmap. | {}

examples/deployment-oss-min/nginx-ingress-controller.yaml

@@ -11,10 +11,10 @@ spec:
     image:
       pullPolicy: IfNotPresent
       repository: nginx/nginx-ingress
-      tag: 2.2.0-ubi
+      tag: 2.4.1-ubi
     ingressClass: nginx
     kind: deployment
-    nginxplus: true
+    nginxplus: false
     service:
       type: NodePort
   rbac:

examples/deployment-plus-min/nginx-ingress-controller.yaml

@@ -11,7 +11,7 @@ spec:
     image:
       pullPolicy: IfNotPresent
       repository: nginx/nginx-ingress
-      tag: 2.2.0-ubi
+      tag: 2.4.1-ubi
     ingressClass: nginx
     kind: deployment
     nginxplus: true

helm-charts/nginx-ingress/Chart.yaml

@@ -1,14 +1,14 @@
 apiVersion: v2
 name: nginx-ingress
-version: 0.15.0
-appVersion: 2.4.0
+version: 0.15.1
+appVersion: 2.4.1
 kubeVersion: ">= 1.19.0-0"
 type: application
 description: NGINX Ingress Controller
-icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v2.4.0/deployments/helm-chart/chart-icon.png
+icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v2.4.1/deployments/helm-chart/chart-icon.png
 home: https://github.com/nginxinc/kubernetes-ingress
 sources:
-  - https://github.com/nginxinc/kubernetes-ingress/tree/v2.4.0/deployments/helm-chart
+  - https://github.com/nginxinc/kubernetes-ingress/tree/v2.4.1/deployments/helm-chart
 keywords:
   - ingress
   - nginx

helm-charts/nginx-ingress/README.md

@@ -23,7 +23,7 @@ This step is required if you're installing the chart using its sources. Addition
 
 1. Clone the Ingress Controller repo:
     ```console
-    $ git clone https://github.com/nginxinc/kubernetes-ingress --branch v2.4.0
+    $ git clone https://github.com/nginxinc/kubernetes-ingress --branch v2.4.1
     ```
     **Note**: If you want to use the experimental repository (`edge`), remove the `--branch` flag and value.
 
@@ -157,7 +157,7 @@ Parameter | Description | Default
 `controller.logLevel` | The log level of the Ingress Controller. | 1
 `controller.image.digest ` | The image digest of the Ingress Controller. | None
 `controller.image.repository` | The image repository of the Ingress Controller. | nginx/nginx-ingress
-`controller.image.tag` | The tag of the Ingress Controller image. | 2.4.0
+`controller.image.tag` | The tag of the Ingress Controller image. | 2.4.1
 `controller.image.pullPolicy` | The pull policy for the Ingress Controller image. | IfNotPresent
 `controller.lifecycle` | The lifecycle of the Ingress Controller pods. | {}
 `controller.customConfigMap` | The name of the custom ConfigMap used by the Ingress Controller. If set, then the default config is ignored. | ""
@@ -184,7 +184,7 @@ Parameter | Description | Default
 `controller.replicaCount` | The number of replicas of the Ingress Controller deployment. | 1
 `controller.ingressClass` | A class of the Ingress Controller. An IngressClass resource with the name equal to the class must be deployed. Otherwise, the Ingress Controller will fail to start. The Ingress Controller only processes resources that belong to its class - i.e. have the "ingressClassName" field resource equal to the class. The Ingress Controller processes all the VirtualServer/VirtualServerRoute/TransportServer resources that do not have the "ingressClassName" field for all versions of kubernetes. | nginx
 `controller.setAsDefaultIngress` | New Ingresses without an `"ingressClassName"` field specified will be assigned the class specified in `controller.ingressClass`. | false
-`controller.watchNamespace` | Comma separated list of namespaces the Ingress Controller should watch for resources. By default the Ingress Controller watches all namespaces. | ""
+`controller.watchNamespace` | Comma separated list of namespaces the Ingress Controller should watch for resources. By default the Ingress Controller watches all namespaces. Please note that if configuring multiple namespaces using the Helm cli `--set` option, the string needs to wrapped in double quotes and the commas escaped using a backslash - e.g. `--set controller.watchNamespace="default\,nginx-ingress"`. | ""
 `controller.enableCustomResources` | Enable the custom resources. | true
 `controller.enablePreviewPolicies` | Enable preview policies. This parameter is deprecated. To enable OIDC Policies please use `controller.enableOIDC` instead. | false
 `controller.enableOIDC` | Enable OIDC policies. | false

helm-charts/nginx-ingress/templates/controller-ingress-class.yaml

@@ -1,4 +1,3 @@
-{{- if .Values.controller.ingressClass }}
 apiVersion: networking.k8s.io/v1
 kind: IngressClass
 metadata:
@@ -9,4 +8,3 @@ metadata:
 {{- end }}
 spec:
   controller: nginx.org/ingress-controller
-{{- end }}

helm-charts/nginx-ingress/values-icp.yaml

@@ -3,7 +3,7 @@ controller:
   nginxplus: true
   image:
     repository: mycluster.icp:8500/kube-system/nginx-plus-ingress
-    tag: "2.4.0"
+    tag: "2.4.1"
   nodeSelector:
     beta.kubernetes.io/arch: "amd64"
     proxy: true