From fa84ea82a4f041877aa07bef78a46f6ea4d17524 Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Wed, 1 Nov 2023 13:54:59 -0700 Subject: [PATCH] Release 2.0.2 --- Makefile | 2 +- README.md | 9 ++++++--- .../nginx-ingress-operator.clusterserviceversion.yaml | 10 +++++----- config/manager/kustomization.yaml | 2 +- .../nginx-ingress-operator.clusterserviceversion.yaml | 6 +++--- docs/manual-installation.md | 10 +++++----- docs/openshift-installation.md | 4 ++-- 7 files changed, 23 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index f7467aef..299aed52 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 ?= 2.0.1 +VERSION ?= 2.0.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 0d0cb0f8..212c9eaf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ -[![Continuous Integration](https://github.com/nginxinc/nginx-ingress-helm-operator/workflows/Continuous%20Integration/badge.svg)](https://github.com/nginxinc/nginx-ingress-helm-operator/actions) [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/nginxinc/nginx-ingress-helm-operator/badge)](https://api.securityscorecards.dev/projects/github.com/nginxinc/nginx-ingress-helm-operator) +[![Continuous Integration](https://github.com/nginxinc/nginx-ingress-helm-operator/workflows/Continuous%20Integration/badge.svg)](https://github.com/nginxinc/nginx-ingress-helm-operator/actions) +[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/nginxinc/nginx-ingress-helm-operator/badge)](https://api.securityscorecards.dev/projects/github.com/nginxinc/nginx-ingress-helm-operator) +[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) +![Commercial Support](https://badgen.net/badge/support/commercial/green?icon=awesome) # NGINX Ingress Operator @@ -14,7 +17,7 @@ The following table shows the relation between the versions of the two projects: | NGINX Ingress Controller | NGINX Ingress Operator | | ------------------------ | ---------------------- | -| 3.3.x | 2.0.1 | +| 3.3.x | 2.0.2 | | 3.2.x | 1.5.2 | | 3.1.x | 1.4.2 | | 3.0.x | 1.3.1 | @@ -69,7 +72,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.0.1](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v2.0.1). For production use, we recommend that you choose the latest stable release. +The latest stable release is [2.0.2](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v2.0.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 2f9ee395..0da8c081 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:2.0.1 - createdAt: "2023-10-16T14:28:48Z" + containerImage: quay.io/nginx/nginx-ingress-operator:2.0.2 + createdAt: "2023-11-01T20:51:35Z" 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.v2.0.1 + name: nginx-ingress-operator.v2.0.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:2.0.1 + image: quay.io/nginx/nginx-ingress-operator:2.0.2 livenessProbe: httpGet: path: /healthz @@ -485,4 +485,4 @@ spec: minKubeVersion: 1.22.0 provider: name: NGINX Inc - version: 2.0.1 + version: 2.0.2 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index ccedb548..a27b0647 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: 2.0.1 + newTag: 2.0.2 diff --git a/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml b/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml index 7125ee13..ae0577fd 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:2.0.1 + containerImage: quay.io/nginx/nginx-ingress-operator:2.0.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:2.0.1 + image: quay.io/nginx/nginx-ingress-operator:2.0.2 livenessProbe: httpGet: path: /healthz @@ -451,4 +451,4 @@ spec: minKubeVersion: 1.22.0 provider: name: NGINX Inc - version: 2.0.1 + version: 2.0.2 diff --git a/docs/manual-installation.md b/docs/manual-installation.md index 0eaf4727..21320767 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 v2.0.1 + git clone https://github.com/nginxinc/nginx-ingress-helm-operator/ --branch v2.0.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:2.0.1 + make deploy IMG=nginx/nginx-ingress-operator:2.0.2 ``` 3. Alternatively, to deploy the Operator and associated resources to all other environments: ```shell - make deploy IMG=nginx/nginx-ingress-operator:2.0.1 + make deploy IMG=nginx/nginx-ingress-operator:2.0.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/v2.0.1/resources/scc.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.0.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/v2.0.1/resources/scc-daemonset.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.0.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 45059163..8c48b858 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/v2.0.1/resources/scc.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.0.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/v2.0.1/resources/scc-daemonset.yaml` +`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.0.2/resources/scc-daemonset.yaml` You can now deploy the NGINX Ingress Controller instances.