From f34d7291a0d3c234e53ae88dbb20e1be2177e0cc Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Tue, 1 Mar 2022 14:42:56 -0800 Subject: [PATCH] Release 0.5.1 (#206) --- .github/release-drafter.yml | 2 +- CHANGELOG.md | 4 ++++ Makefile | 2 +- README.md | 4 ++-- ...ginx-ingress-operator.clusterserviceversion.yaml | 13 +++++++------ config/manager/kustomization.yaml | 2 +- ...ginx-ingress-operator.clusterserviceversion.yaml | 5 +++-- .../k8s_v1alpha1_nginxingresscontroller.yaml | 2 +- docs/manual-installation.md | 6 +++--- .../nginx-ingress-controller.yaml | 2 +- .../nginx-ingress-controller.yaml | 2 +- 11 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 3e9a111f..28268d00 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -69,4 +69,4 @@ template: | ## Compatibility - NGINX Ingress Controller NIC_VERSION_REPLACE_ME! - - Openshift 4.5 or newer. + - Openshift 4.6 or newer. diff --git a/CHANGELOG.md b/CHANGELOG.md index bd582444..80303688 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +### 0.5.1 + +An automatically generated list of changes can be found on Github at: [0.5.1 Release](https://github.com/nginxinc/nginx-ingress-operator/releases/tag/v0.5.1) + ### 0.5.0 An automatically generated list of changes can be found on Github at: [0.5.0 Release](https://github.com/nginxinc/nginx-ingress-operator/releases/tag/v0.5.0) diff --git a/Makefile b/Makefile index 52dd3ba1..ee50e129 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 ?= 0.5.0 +VERSION ?= 0.5.1 # 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 4f4a2267..6ccd1d63 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The following table shows the relation between the versions of the two projects: | NGINX Ingress Controller | NGINX Ingress Operator | | --- | --- | -| 2.1.x | 0.5.0 | +| 2.1.x | 0.5.1 | | 2.0.x | 0.4.0 | | 1.12.x | 0.3.0 | | 1.11.x | 0.2.0 | @@ -39,7 +39,7 @@ See [upgrade docs](./docs/upgrades) ## NGINX Ingress Operator Releases We publish NGINX Ingress Operator releases on GitHub. See our [releases page](https://github.com/nginxinc/nginx-ingress-operator/releases). -The latest stable release is [0.5.0](https://github.com/nginxinc/nginx-ingress-operator/releases/tag/v0.5.0). For production use, we recommend that you choose the latest stable release. +The latest stable release is [0.5.1](https://github.com/nginxinc/nginx-ingress-operator/releases/tag/v0.5.1). 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 344a2144..61878c27 100644 --- a/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml +++ b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml @@ -14,7 +14,7 @@ metadata: "image": { "pullPolicy": "Always", "repository": "docker.io/nginx/nginx-ingress", - "tag": "2.1.0-ubi" + "tag": "2.1.1-ubi" }, "ingressClass": "nginx", "nginxPlus": false, @@ -26,10 +26,11 @@ metadata: capabilities: Basic Install categories: Monitoring, Networking certified: "true" - containerImage: nginx/nginx-ingress-operator:0.5.0 + containerImage: nginx/nginx-ingress-operator:0.5.1 createdAt: placeholder 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 operators.operatorframework.io/builder: operator-sdk-v1.18.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/nginxinc/nginx-ingress-operator @@ -38,7 +39,7 @@ metadata: operatorframework.io/arch.amd64: supported operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported - name: nginx-ingress-operator.v0.5.0 + name: nginx-ingress-operator.v0.5.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -389,7 +390,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: nginx/nginx-ingress-operator:0.5.0 + image: nginx/nginx-ingress-operator:0.5.1 livenessProbe: httpGet: path: /healthz @@ -477,5 +478,5 @@ spec: minKubeVersion: 1.19.0 provider: name: NGINX Inc - replaces: nginx-ingress-operator.v0.4.0 - version: 0.5.0 + replaces: nginx-ingress-operator.v0.5.0 + version: 0.5.1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 7a70bdcf..7b0e5f0c 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: nginx/nginx-ingress-operator - newTag: 0.5.0 + newTag: 0.5.1 diff --git a/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml b/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml index b9b9923a..08f60b35 100644 --- a/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml @@ -6,10 +6,11 @@ metadata: capabilities: Basic Install categories: Monitoring, Networking certified: "true" - containerImage: nginx/nginx-ingress-operator:0.5.0 + containerImage: nginx/nginx-ingress-operator:0.5.1 createdAt: placeholder 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 repository: https://github.com/nginxinc/nginx-ingress-operator support: NGINX Inc. labels: @@ -203,5 +204,5 @@ spec: minKubeVersion: 1.19.0 provider: name: NGINX Inc - replaces: nginx-ingress-operator.v0.4.0 + replaces: nginx-ingress-operator.v0.5.0 version: 0.0.0 diff --git a/config/samples/k8s_v1alpha1_nginxingresscontroller.yaml b/config/samples/k8s_v1alpha1_nginxingresscontroller.yaml index ad21099c..56ee7add 100644 --- a/config/samples/k8s_v1alpha1_nginxingresscontroller.yaml +++ b/config/samples/k8s_v1alpha1_nginxingresscontroller.yaml @@ -7,7 +7,7 @@ spec: nginxPlus: false image: repository: docker.io/nginx/nginx-ingress - tag: 2.1.0-ubi + tag: 2.1.1-ubi pullPolicy: Always serviceType: NodePort ingressClass: nginx diff --git a/docs/manual-installation.md b/docs/manual-installation.md index 8eb19a8d..b68e7fe0 100644 --- a/docs/manual-installation.md +++ b/docs/manual-installation.md @@ -8,17 +8,17 @@ This will deploy the operator in the `nginx-ingress-operator-system` namespace. ``` git clone https://github.com/nginxinc/nginx-ingress-operator/ cd nginx-ingress-operator/ - git checkout v0.5.0 + git checkout v0.5.1 ``` 2. `Openshift` To deploy the Operator and associated resources to an OpenShift environment, run: ``` - make deploy IMG=registry.connect.redhat.com/nginx/nginx-ingress-operator:0.5.0 + make deploy IMG=registry.connect.redhat.com/nginx/nginx-ingress-operator:0.5.1 ``` 3. Alternatively, to deploy the Operator and associated resources to all other environments: ``` - make deploy IMG=nginx/nginx-ingress-operator:0.5.0 + make deploy IMG=nginx/nginx-ingress-operator:0.5.1 ``` 2. Check that the Operator is running: diff --git a/examples/deployment-oss-min/nginx-ingress-controller.yaml b/examples/deployment-oss-min/nginx-ingress-controller.yaml index cef2e433..086cec99 100644 --- a/examples/deployment-oss-min/nginx-ingress-controller.yaml +++ b/examples/deployment-oss-min/nginx-ingress-controller.yaml @@ -8,7 +8,7 @@ spec: nginxPlus: false image: repository: nginx/nginx-ingress - tag: 2.1.0-ubi + tag: 2.1.1-ubi pullPolicy: Always replicas: 1 serviceType: NodePort diff --git a/examples/deployment-plus-min/nginx-ingress-controller.yaml b/examples/deployment-plus-min/nginx-ingress-controller.yaml index e5e78df9..eede5885 100644 --- a/examples/deployment-plus-min/nginx-ingress-controller.yaml +++ b/examples/deployment-plus-min/nginx-ingress-controller.yaml @@ -8,7 +8,7 @@ spec: nginxPlus: true image: repository: nginx-plus-ingress - tag: 2.1.0-ubi + tag: 2.1.1-ubi pullPolicy: IfNotPresent replicas: 1 serviceType: NodePort