diff --git a/Makefile b/Makefile index 81cda22a..0d4f20a2 100644 --- a/Makefile +++ b/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 ?= 1.5.1 +VERSION ?= 1.5.2 # 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") diff --git a/README.md b/README.md index 641ca67c..e6e4303e 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The following table shows the relation between the versions of the two projects: | NGINX Ingress Controller | NGINX Ingress Operator | | ------------------------ | ---------------------- | -| 3.2.x | 1.5.1 | +| 3.2.x | 1.5.2 | | 3.1.x | 1.4.2 | | 3.0.x | 1.3.1 | | 2.4.x | 1.2.1 | @@ -68,7 +68,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 [1.5.1](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v1.5.1). For production use, we recommend that you choose the latest stable release. +The latest stable release is [1.5.2](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v1.5.2). For production use, we recommend that you choose the latest stable release. ## Development diff --git a/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml index 3c0fbfdc..fabcc03c 100644 --- a/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml +++ b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml @@ -176,8 +176,8 @@ metadata: capabilities: Basic Install categories: Monitoring, Networking certified: "true" - containerImage: quay.io/nginx/nginx-ingress-operator:1.5.1 - createdAt: "2023-08-21T21:04:10Z" + containerImage: quay.io/nginx/nginx-ingress-operator:1.5.2 + createdAt: "2023-08-29T17:13:49Z" description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers operatorframework.io/suggested-namespace: nginx-ingress @@ -190,7 +190,7 @@ metadata: operatorframework.io/arch.arm64: supported operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported - name: nginx-ingress-operator.v1.5.1 + name: nginx-ingress-operator.v1.5.2 namespace: placeholder spec: apiservicedefinitions: {} @@ -394,7 +394,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:1.5.1 + image: quay.io/nginx/nginx-ingress-operator:1.5.2 livenessProbe: httpGet: path: /healthz @@ -485,4 +485,4 @@ spec: minKubeVersion: 1.22.0 provider: name: NGINX Inc - version: 1.5.1 + version: 1.5.2 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 0be3cb47..dacbb28b 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: quay.io/nginx/nginx-ingress-operator - newTag: 1.5.1 + newTag: 1.5.2 diff --git a/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml b/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml index 9c95856e..137cbaa4 100644 --- a/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml @@ -176,7 +176,7 @@ metadata: capabilities: Basic Install categories: Monitoring, Networking certified: "true" - containerImage: quay.io/nginx/nginx-ingress-operator:1.5.1 + containerImage: quay.io/nginx/nginx-ingress-operator:1.5.2 createdAt: placeholder description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers @@ -345,7 +345,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:1.5.1 + image: quay.io/nginx/nginx-ingress-operator:1.5.2 livenessProbe: httpGet: path: /healthz @@ -451,4 +451,4 @@ spec: minKubeVersion: 1.22.0 provider: name: NGINX Inc - version: 1.5.1 + version: 1.5.2 diff --git a/docs/manual-installation.md b/docs/manual-installation.md index ac1e19d9..e753bd27 100644 --- a/docs/manual-installation.md +++ b/docs/manual-installation.md @@ -7,20 +7,20 @@ 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 v1.5.1 + git clone https://github.com/nginxinc/nginx-ingress-helm-operator/ --branch v1.5.2 cd nginx-ingress-helm-operator/ ``` 2. `OpenShift` To deploy the Operator and associated resources to an OpenShift environment, run: ```shell - make deploy IMG=nginx/nginx-ingress-operator:1.5.1 + make deploy IMG=nginx/nginx-ingress-operator:1.5.2 ``` 3. Alternatively, to deploy the Operator and associated resources to all other environments: ```shell - make deploy IMG=nginx/nginx-ingress-operator:1.5.1 + make deploy IMG=nginx/nginx-ingress-operator:1.5.2 ``` 2. Check that the Operator is running: @@ -36,10 +36,10 @@ 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/v1.5.1/resources/scc.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.5.2/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/v1.5.1/resources/scc-daemonset.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.5.2/resources/scc-daemonset.yaml` You can now deploy the NGINX Ingress Controller instances. diff --git a/docs/openshift-installation.md b/docs/openshift-installation.md index 7425ec56..e24503ec 100644 --- a/docs/openshift-installation.md +++ b/docs/openshift-installation.md @@ -21,10 +21,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/v1.5.1/resources/scc.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.5.2/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/v1.5.1/resources/scc-daemonset.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.5.2/resources/scc-daemonset.yaml` You can now deploy the NGINX Ingress Controller instances.