Skip to content

Commit 044921f

Browse files
authored
Release 1.5.0 (#141)
1 parent d2d176a commit 044921f

11 files changed

+37
-32
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
### 1.5.0
4+
5+
An automatically generated list of changes can be found on Github at: [1.5.0 Release](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v1.5.0)
6+
37
### 1.4.2
48

59
An automatically generated list of changes can be found on Github at: [1.4.2 Release](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v1.4.2)

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION ?= 1.4.2
6+
VERSION ?= 1.5.0
77

88
# CHANNELS define the bundle channels used in the bundle.
99
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -180,8 +180,8 @@ bundle: kustomize operator-sdk ## Generate bundle manifests and metadata, then v
180180
$(OPERATOR_SDK) generate kustomize manifests --interactive=false -q
181181
cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
182182
$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
183-
@printf "%s\n" '' 'LABEL com.redhat.openshift.versions="v4.9"' 'LABEL com.redhat.delivery.operator.bundle=true' 'LABEL com.redhat.delivery.backport=true' >> bundle.Dockerfile
184-
@printf "%s\n" '' ' # OpenShift annotations.' ' com.redhat.openshift.versions: v4.9' >> bundle/metadata/annotations.yaml
183+
@printf "%s\n" '' 'LABEL com.redhat.openshift.versions="v4.10"' 'LABEL com.redhat.delivery.operator.bundle=true' 'LABEL com.redhat.delivery.backport=true' >> bundle.Dockerfile
184+
@printf "%s\n" '' ' # OpenShift annotations.' ' com.redhat.openshift.versions: v4.10' >> bundle/metadata/annotations.yaml
185185
$(OPERATOR_SDK) bundle validate ./bundle
186186

187187
.PHONY: bundle-build

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ The following table shows the relation between the versions of the two projects:
1414

1515
| NGINX Ingress Controller | NGINX Ingress Operator |
1616
| ------------------------ | ---------------------- |
17+
| 3.2.x | 1.5.0 |
1718
| 3.1.x | 1.4.2 |
1819
| 3.0.x | 1.3.1 |
1920
| 2.4.x | 1.2.1 |
@@ -67,7 +68,7 @@ See [upgrade docs](./docs/upgrades.md)
6768

6869
We publish NGINX Ingress Operator releases on GitHub. See our [releases page](https://github.com/nginxinc/nginx-ingress-helm-operator/releases).
6970

70-
The latest stable release is [1.4.2](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v1.4.2). For production use, we recommend that you choose the latest stable release.
71+
The latest stable release is [1.5.0](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v1.5.0). For production use, we recommend that you choose the latest stable release.
7172

7273
## Development
7374

bundle.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=nginx-ingress-operator
88
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
99
LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
10-
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.1
10+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.30.0
1111
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1212
LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1
1313

@@ -20,6 +20,6 @@ COPY bundle/manifests /manifests/
2020
COPY bundle/metadata /metadata/
2121
COPY bundle/tests/scorecard /tests/scorecard/
2222

23-
LABEL com.redhat.openshift.versions="v4.9"
23+
LABEL com.redhat.openshift.versions="v4.10"
2424
LABEL com.redhat.delivery.operator.bundle=true
2525
LABEL com.redhat.delivery.backport=true

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ metadata:
176176
capabilities: Basic Install
177177
categories: Monitoring, Networking
178178
certified: "true"
179-
containerImage: quay.io/nginx/nginx-ingress-operator:1.4.2
180-
createdAt: "2023-06-28T09:38:55Z"
179+
containerImage: quay.io/nginx/nginx-ingress-operator:1.5.0
180+
createdAt: "2023-06-30T10:10:35Z"
181181
description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which
182182
deploys and manages one or more NGINX/NGINX Plus Ingress Controllers
183183
operatorframework.io/suggested-namespace: nginx-ingress
@@ -190,7 +190,7 @@ metadata:
190190
operatorframework.io/arch.arm64: supported
191191
operatorframework.io/arch.ppc64le: supported
192192
operatorframework.io/arch.s390x: supported
193-
name: nginx-ingress-operator.v1.4.2
193+
name: nginx-ingress-operator.v1.5.0
194194
namespace: placeholder
195195
spec:
196196
apiservicedefinitions: {}
@@ -394,7 +394,7 @@ spec:
394394
- --metrics-bind-address=127.0.0.1:8080
395395
- --leader-elect
396396
- --leader-election-id=nginx-ingress-operator
397-
image: nginx/nginx-ingress-operator:1.4.2
397+
image: nginx/nginx-ingress-operator:1.5.0
398398
livenessProbe:
399399
httpGet:
400400
path: /healthz
@@ -482,7 +482,7 @@ spec:
482482
483483
name: NGINX Inc
484484
maturity: alpha
485-
minKubeVersion: 1.21.0
485+
minKubeVersion: 1.22.0
486486
provider:
487487
name: NGINX Inc
488-
version: 1.4.2
488+
version: 1.5.0

bundle/metadata/annotations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ annotations:
1515
operators.operatorframework.io.test.config.v1: tests/scorecard/
1616

1717
# OpenShift annotations.
18-
com.redhat.openshift.versions: v4.9
18+
com.redhat.openshift.versions: v4.10

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kind: Kustomization
55
images:
66
- name: controller
77
newName: nginx/nginx-ingress-operator
8-
newTag: 1.4.2
8+
newTag: 1.5.0

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ metadata:
3333
"customPorts": [],
3434
"image": {
3535
"repository": "nginx/nginx-ingress",
36-
"tag": "3.1.0-ubi",
36+
"tag": "3.2.0-ubi",
3737
"pullPolicy": "IfNotPresent"
3838
},
3939
"lifecycle": {},
@@ -176,7 +176,7 @@ metadata:
176176
capabilities: Basic Install
177177
categories: Monitoring, Networking
178178
certified: "true"
179-
containerImage: quay.io/nginx/nginx-ingress-operator:1.4.2
179+
containerImage: quay.io/nginx/nginx-ingress-operator:1.5.0
180180
createdAt: placeholder
181181
description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which
182182
deploys and manages one or more NGINX/NGINX Plus Ingress Controllers
@@ -345,7 +345,7 @@ spec:
345345
- --metrics-bind-address=127.0.0.1:8080
346346
- --leader-elect
347347
- --leader-election-id=nginx-ingress-operator
348-
image: quay.io/nginx/nginx-ingress-operator:1.4.2
348+
image: quay.io/nginx/nginx-ingress-operator:1.5.0
349349
livenessProbe:
350350
httpGet:
351351
path: /healthz
@@ -372,8 +372,8 @@ spec:
372372
- --secure-listen-address=0.0.0.0:8443
373373
- --upstream=http://127.0.0.1:8080/
374374
- --logtostderr=true
375-
- --v=10
376-
image: registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.9
375+
- --v=0
376+
image: registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.13
377377
name: kube-rbac-proxy
378378
ports:
379379
- containerPort: 8443
@@ -448,7 +448,7 @@ spec:
448448
449449
name: NGINX Inc
450450
maturity: alpha
451-
minKubeVersion: 1.21.0
451+
minKubeVersion: 1.22.0
452452
provider:
453453
name: NGINX Inc
454-
version: 1.4.2
454+
version: 1.5.0

docs/manual-installation.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ This will deploy the operator in the `nginx-ingress-operator-system` namespace.
77
1. Clone the `nginx-ingress-operator` repo:
88

99
```
10-
git clone https://github.com/nginxinc/nginx-ingress-helm-operator/ --branch v1.4.2
10+
git clone https://github.com/nginxinc/nginx-ingress-helm-operator/ --branch v1.5.0
1111
cd nginx-ingress-helm-operator/
1212
```
1313

1414
2. `OpenShift` To deploy the Operator and associated resources to an OpenShift environment, run:
1515

1616
```
17-
make deploy IMG=nginx/nginx-ingress-operator:1.4.2
17+
make deploy IMG=nginx/nginx-ingress-operator:1.5.0
1818
```
1919

2020
3. Alternatively, to deploy the Operator and associated resources to all other environments:
2121

2222
```
23-
make deploy IMG=nginx/nginx-ingress-operator:1.4.2
23+
make deploy IMG=nginx/nginx-ingress-operator:1.5.0
2424
```
2525

2626
2. Check that the Operator is running:
@@ -36,10 +36,10 @@ This will deploy the operator in the `nginx-ingress-operator-system` namespace.
3636

3737
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):
3838

39-
`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.4.2/resources/scc.yaml`
39+
`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.5.0/resources/scc.yaml`
4040

4141
Alternatively, to create an SCC for NIC daemonsets, please run this command:
4242

43-
`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.4.2/resources/scc-daemonset.yaml`
43+
`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.5.0/resources/scc-daemonset.yaml`
4444

4545
You can now deploy the NGINX Ingress Controller instances.

docs/openshift-installation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ Additional steps:
2121

2222
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):
2323

24-
`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.4.2/resources/scc.yaml`
24+
`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.5.0/resources/scc.yaml`
2525

2626
Alternatively, to create an SCC for NIC daemonsets, please run this command:
2727

28-
`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.4.2/resources/scc-daemonset.yaml`
28+
`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.5.0/resources/scc-daemonset.yaml`
2929

3030
You can now deploy the NGINX Ingress Controller instances.

0 commit comments

Comments
 (0)