Update NGINX Ingress Controller to 4.0.0 (#435)

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 2.4.2
+VERSION ?= 3.0.0
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

README.md

@@ -17,6 +17,7 @@ The following table shows the relation between the versions of the two projects:
 
 | NGINX Ingress Controller | NGINX Ingress Operator |
 | ------------------------ | ---------------------- |
+| 4.0.x                    | 3.0.0                  |
 | 3.7.x                    | 2.4.2                  |
 | 3.6.x                    | 2.3.2                  |
 | 3.5.x                    | 2.2.2                  |
@@ -76,7 +77,7 @@ See [upgrade docs](./docs/upgrades.md)
 
 We publish NGINX Ingress Operator releases on GitHub. See our [releases page](https://github.com/nginxinc/nginx-ingress-helm-operator/releases).
 
-The latest stable release is [2.4.2](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v2.4.2). For production use, we recommend that you choose the latest stable release.
+The latest stable release is [3.0.0](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v3.0.0). For production use, we recommend that you choose the latest stable release.
 
 ## Development
 

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

@@ -77,9 +77,8 @@ metadata:
               "image": {
                 "pullPolicy": "IfNotPresent",
                 "repository": "nginx/nginx-ingress",
-                "tag": "3.7.2-ubi"
+                "tag": "4.0.0-ubi"
               },
-              "includeYear": false,
               "ingressClass": {
                 "create": true,
                 "name": "nginx",
@@ -94,7 +93,11 @@ metadata:
               "initContainers": [],
               "kind": "deployment",
               "lifecycle": {},
-              "logLevel": 1,
+              "logFormat": "glog",
+              "logLevel": "info",
+              "mgmt": {
+                "licenseTokenSecretName": "license-token"
+              },
               "minReadySeconds": 0,
               "name": "controller",
               "nginxDebug": false,
@@ -220,8 +223,8 @@ metadata:
     capabilities: Basic Install
     categories: Monitoring, Networking
     certified: "true"
-    containerImage: quay.io/nginx/nginx-ingress-operator:2.4.2
-    createdAt: "2024-11-25T17:47:09Z"
+    containerImage: quay.io/nginx/nginx-ingress-operator:3.0.0
+    createdAt: "2024-12-17T10:28:34Z"
     description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which
       deploys and manages one or more NGINX/NGINX Plus Ingress Controllers
     features.operators.openshift.io/cnf: "false"
@@ -244,7 +247,7 @@ metadata:
     operatorframework.io/arch.arm64: supported
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
-  name: nginx-ingress-operator.v2.4.2
+  name: nginx-ingress-operator.v3.0.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -448,7 +451,7 @@ spec:
                 - --metrics-bind-address=127.0.0.1:8080
                 - --leader-elect
                 - --leader-election-id=nginx-ingress-operator
-                image: quay.io/nginx/nginx-ingress-operator:2.4.2
+                image: quay.io/nginx/nginx-ingress-operator:3.0.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -539,4 +542,4 @@ spec:
   minKubeVersion: 1.26.0
   provider:
     name: NGINX Inc
-  version: 2.4.2
+  version: 3.0.0

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/nginx/nginx-ingress-operator
-  newTag: 2.4.2
+  newTag: 3.0.0

config/manifests/bases/kustomization.yaml

@@ -3,4 +3,4 @@ resources:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 commonAnnotations:
-  containerImage: quay.io/nginx/nginx-ingress-operator:2.4.2
+  containerImage: quay.io/nginx/nginx-ingress-operator:3.0.0

config/samples/charts_v1alpha1_nginxingress.yaml

@@ -10,6 +10,8 @@ spec:
     selectorLabels: {}
     annotations: {}
     nginxplus: false
+    mgmt:
+      licenseTokenSecretName: license-token
     nginxReloadTimeout: 60000
     appprotect:
       enable: false
@@ -31,11 +33,12 @@ spec:
     dnsPolicy: ClusterFirst
     nginxDebug: false
     shareProcessNamespace: false
-    logLevel: 1
+    logLevel: info
+    logFormat: glog
     customPorts: []
     image:
       repository: nginx/nginx-ingress
-      tag: "3.7.2-ubi"
+      tag: "4.0.0-ubi"
       # digest: "sha256:CHANGEME"
       pullPolicy: IfNotPresent
     lifecycle: {}
@@ -115,7 +118,6 @@ spec:
     watchSecretNamespace: ""
     enableCustomResources: true
     enableOIDC: false
-    includeYear: false
     enableTLSPassthrough: false
     tlsPassthroughPort: 443
     enableCertManager: false

docs/manual-installation.md

@@ -7,14 +7,14 @@ This will deploy the operator in the `nginx-ingress-operator-system` namespace.
    1. Clone the `nginx-ingress-operator` repo:
 
    ```shell
-   git clone https://github.com/nginxinc/nginx-ingress-helm-operator/ --branch v2.4.2
+   git clone https://github.com/nginxinc/nginx-ingress-helm-operator/ --branch v3.0.0
    cd nginx-ingress-helm-operator/
    ```
 
    2. To deploy the Operator and associated resources to all environments, run:
 
    ```shell
-   make deploy IMG=nginx/nginx-ingress-operator:2.4.2
+   make deploy IMG=nginx/nginx-ingress-operator:3.0.0
    ```
 
 2. Check that the Operator is running:
@@ -30,11 +30,11 @@ This will deploy the operator in the `nginx-ingress-operator-system` namespace.
 
 In order to deploy NGINX Ingress Controller instances into OpenShift environments, a new SCC is required to be created on the cluster which will be used to bind the specific required capabilities to the NGINX Ingress service account(s). To do so for NIC deployments, please run the following command (assuming you are logged in with administrator access to the cluster):
 
-`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.4.2/resources/scc.yaml`
+`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v3.0.0/resources/scc.yaml`
 
 Alternatively, to create an SCC for NIC daemonsets, please run this command:
 
-`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.4.2/resources/scc-daemonset.yaml`
+`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v3.0.0/resources/scc-daemonset.yaml`
 
 You can now deploy the NGINX Ingress Controller instances.
 
@@ -44,19 +44,19 @@ You can now deploy the NGINX Ingress Controller instances.
 You can use the operator (including the kube-rbac-proxy) images from your own private registry.
 1. Tag the images for your private registry
    ```shell
-   docker tag quay.io/nginx/nginx-ingress-operator:2.4.2 <my-private-registry>/nginx-ingress-operator:2.4.2
+   docker tag quay.io/nginx/nginx-ingress-operator:3.0.0 <my-private-registry>/nginx-ingress-operator:3.0.0
    docker tag quay.io/brancz/kube-rbac-proxy:v0.18.0 <my-private-registry>/kube-rbac-proxy:v0.18.0
    ```
 
 2. Push the image to your private registry
    ```shell
-   docker push <my-private-registry>/nginx-ingress-operator:2.4.2
+   docker push <my-private-registry>/nginx-ingress-operator:3.0.0
    docker push <my-private-registry>/kube-rbac-proxy:v0.18.0
    ```
 
 3. Follow step 1 above but in step 1.2 you can run
    ```shell
-   make deploy IMG=<my-private-registry>/nginx-ingress-operator:2.4.2 KRP_IMAGE_BASE=<my-private-registry>/kube-rbac-proxy
+   make deploy IMG=<my-private-registry>/nginx-ingress-operator:3.0.0 KRP_IMAGE_BASE=<my-private-registry>/kube-rbac-proxy
    ```
    **Note: If you need to use a different `kube-rbac-proxy` version than the default, use the `KRP_IMAGE_TAG` variable**  
 

docs/nginx-ingress-controller.md

@@ -22,6 +22,8 @@ spec:
     selectorLabels: {}
     annotations: {}
     nginxplus: false
+    mgmt:
+      licenseTokenSecretName: "license-token"
     nginxReloadTimeout: 60000
     appprotect:
       enable: false
@@ -43,11 +45,12 @@ spec:
     dnsPolicy: ClusterFirst
     nginxDebug: false
     shareProcessNamespace: false
-    logLevel: 1
+    logFormat: glog
+    logLevel: info
     customPorts: []
     image:
       repository: nginx/nginx-ingress
-      tag: "3.7.2-ubi"
+      tag: "4.0.0-ubi"
       # digest: "sha256:CHANGEME"
       pullPolicy: IfNotPresent
     lifecycle: {}
@@ -127,7 +130,6 @@ spec:
     watchSecretNamespace: ""
     enableCustomResources: true
     enableOIDC: false
-    includeYear: false
     enableTLSPassthrough: false
     tlsPassthroughPort: 443
     enableCertManager: false

docs/openshift-installation.md

@@ -23,10 +23,10 @@ Additional steps:
 
 In order to deploy NGINX Ingress Controller instances into OpenShift environments, a new SCC is required to be created on the cluster which will be used to bind the specific required capabilities to the NGINX Ingress service account(s). To do so for NIC deployments, please run the following command (assuming you are logged in with administrator access to the cluster):
 
-`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.4.2/resources/scc.yaml`
+`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v3.0.0/resources/scc.yaml`
 
 Alternatively, to create an SCC for NIC daemonsets, please run this command:
 
-`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.4.2/resources/scc-daemonset.yaml`
+`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v3.0.0/resources/scc-daemonset.yaml`
 
 You can now deploy the NGINX Ingress Controller instances.

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

@@ -11,7 +11,7 @@ spec:
     image:
       pullPolicy: IfNotPresent
       repository: nginx/nginx-ingress
-      tag: 3.7.2-ubi
+      tag: 4.0.0-ubi
     ingressClass:
       name: nginx
     kind: deployment

examples/deployment-plus-min/README.md

@@ -8,6 +8,7 @@ In this example we deploy the NGINX Ingress Controller (edge) as a [Deployment](
 2. Build the NGINX Ingress Controller for Plus image and push it to a private repository following
 [these instructions](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/#building-the-image-and-pushing-it-to-the-private-registry)
 (**Note**: For the build process, if using OpenShift, use the `ubi-image-plus`, `ubi-image-nap-plus`, `ubi-image-dos-plus` or `ubi-image-nap-dos-plus` targets).
+3. Setup your NGINX Plus [license](https://docs.nginx.com/nginx-ingress-controller/installation/create-license-secret/) `Secret` 
 
 If you would like to use TransportServers, refer to [this section](README.md#TransportServers) for additional pre-requisites.
 

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

@@ -11,11 +11,13 @@ spec:
     image:
       pullPolicy: IfNotPresent
       repository: nginx/nginx-ingress
-      tag: 3.7.2-ubi
+      tag: 4.0.0-ubi
     ingressClass:
       name: nginx
     kind: deployment
     nginxplus: true
+    mgmt:
+      licenseTokenSecretName: "license-token"
     service:
       type: NodePort
   rbac:

helm-charts/nginx-ingress/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 3.7.2
+appVersion: 4.0.0
 description: NGINX Ingress Controller
 home: https://github.com/nginxinc/kubernetes-ingress
-icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.7.2/charts/nginx-ingress/chart-icon.png
+icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v4.0.0/charts/nginx-ingress/chart-icon.png
 keywords:
 - ingress
 - nginx
@@ -12,6 +12,6 @@ maintainers:
   name: nginxinc
 name: nginx-ingress
 sources:
-- https://github.com/nginxinc/kubernetes-ingress/tree/v3.7.2/charts/nginx-ingress
+- https://github.com/nginxinc/kubernetes-ingress/tree/v4.0.0/charts/nginx-ingress
 type: application
-version: 1.4.2
+version: 2.0.0

helm-charts/nginx-ingress/crds/k8s.nginx.org_globalconfigurations.yaml

@@ -64,47 +64,3 @@ spec:
         type: object
     served: true
     storage: true
-  - name: v1alpha1
-    schema:
-      openAPIV3Schema:
-        description: GlobalConfiguration defines the GlobalConfiguration resource.
-        properties:
-          apiVersion:
-            description: |-
-              APIVersion defines the versioned schema of this representation of an object.
-              Servers should convert recognized schemas to the latest internal value, and
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
-            type: string
-          kind:
-            description: |-
-              Kind is a string value representing the REST resource this object represents.
-              Servers may infer this from the endpoint the client submits requests to.
-              Cannot be updated.
-              In CamelCase.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: GlobalConfigurationSpec is the spec of the GlobalConfiguration
-              resource.
-            properties:
-              listeners:
-                items:
-                  description: Listener defines a listener.
-                  properties:
-                    name:
-                      type: string
-                    port:
-                      type: integer
-                    protocol:
-                      type: string
-                    ssl:
-                      type: boolean
-                  type: object
-                type: array
-            type: object
-        type: object
-    served: true
-    storage: false