Skip to content

Commit dd85ef4

Browse files
authored
Release 1.4.2 (#115)
1 parent 168c899 commit dd85ef4

File tree

8 files changed

+69
-59
lines changed

8 files changed

+69
-59
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.4.2
4+
5+
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)
6+
37
### 1.4.1
48

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

Makefile

Lines changed: 1 addition & 1 deletion
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.1
6+
VERSION ?= 1.4.2
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")

README.md

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Up until version 0.5.1, this Operator was Go based. Version 1.0.0 marks an incom
1313
The following table shows the relation between the versions of the two projects:
1414

1515
| NGINX Ingress Controller | NGINX Ingress Operator |
16-
|--------------------------|------------------------|
17-
| 3.1.x | 1.4.1 |
16+
| ------------------------ | ---------------------- |
17+
| 3.1.x | 1.4.2 |
1818
| 3.0.x | 1.3.1 |
1919
| 2.4.x | 1.2.1 |
2020
| 2.3.x | 1.1.0 |
@@ -34,37 +34,40 @@ Note: The NGINX Ingress Operator works only for NGINX Ingress Controller version
3434
## Getting Started
3535

3636
1. Install the NGINX Ingress Operator. See [docs](./docs/installation.md).
37-
<br> NOTE: To use TransportServers as part of your NGINX Ingress Controller configuration, a GlobalConfiguration resource must be created *before* starting the Operator - [see the notes](./examples/deployment-oss-min/README.md#TransportServers)
37+
<br> NOTE: To use TransportServers as part of your NGINX Ingress Controller configuration, a GlobalConfiguration resource must be created _before_ starting the Operator - [see the notes](./examples/deployment-oss-min/README.md#TransportServers)
3838
2. Creating the default-server-secret.yaml is optional and it is recommended that users provide their own certificate. An example yaml for this can be found in the [examples folder](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/main/examples/default-server-secret.yaml)
3939
3. (If using OpenShift) Create the scc resource on the cluster by applying the scc.yaml file found in the `resources` folder of this repo:
40-
```shell
41-
kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/main/resources/scc.yaml
42-
```
43-
4. Deploy a new NGINX Ingress Controller using the [NginxIngress](./config/samples/charts_v1alpha1_nginxingress.yaml) Custom Resource:
44-
* Use the name of the default server secret created above for `controller.defaultTLS.secret` field (needs to be in the form `namespace/name`)
45-
* If using NGINX Plus:
46-
* Set the `controller.nginxPlus` to true
47-
* Set the `controller.image.repository` and `controller.image.tag` to the appropriate values
48-
* Set the `controller.serviceAccount.imagePullSecretName` if applicable
49-
* For full configuration details see the Helm documentation [here](https://docs.nginx.com/nginx-ingress-controller/installation/installation-with-helm/#configuration).
5040

41+
```shell
42+
kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/main/resources/scc.yaml
43+
```
44+
45+
4. Deploy a new NGINX Ingress Controller using the [NginxIngress](./config/samples/charts_v1alpha1_nginxingress.yaml) Custom Resource:
46+
- Use the name of the default server secret created above for `controller.defaultTLS.secret` field (needs to be in the form `namespace/name`)
47+
- If using NGINX Plus:
48+
- Set the `controller.nginxPlus` to true
49+
- Set the `controller.image.repository` and `controller.image.tag` to the appropriate values
50+
- Set the `controller.serviceAccount.imagePullSecretName` if applicable
51+
- For full configuration details see the Helm documentation [here](https://docs.nginx.com/nginx-ingress-controller/installation/installation-with-helm/#configuration).
5152

5253
## Notes: Multiple NIC Deployments
53-
* Please see [the NGINX Ingress Controller documentation](https://docs.nginx.com/nginx-ingress-controller/installation/running-multiple-ingress-controllers/) for general information on running multiple NGINX Ingress Controllers in your cluster.
54-
* To run multiple NIC instances deployed by the NGINX Ingress Operator in your cluster in the same namespace, `rbac.create` should be set to `false`, and the ServiceAccount and ClusterRoleBinding need to be created independently of the deployments. Please note that `controller.serviceAccount.imagePullSecretName` will also be ignored in this configuration, and will need to be configured as part of the independent ServiceAccount creation.
55-
* The ClusterRoleBinding needs to configured to bind to the `nginx-ingress-operator-nginx-ingress-admin` ClusterRole.
56-
* See [RBAC example spec](../resources/rbac-example.yaml) for an example ServiceAccount and ClusterRoleBinding manifest.
57-
* To run multiple NIC instances deployed by the NGINX Ingress Operator in your cluster in any namespace but sharing an IngressClass, `controller.ingressClass` should be set to an empty string and the IngressClass resource needs to be created independently of the deployments.Please note that `controller.setAsDefaultIngress` will also be ignored in this configuration, and will need to be configured as part of the independent IngressClass creation.
58-
* See [IngressClass example spec](../resources/ingress-class.yaml) for an example IngressClass manifest.
54+
55+
- Please see [the NGINX Ingress Controller documentation](https://docs.nginx.com/nginx-ingress-controller/installation/running-multiple-ingress-controllers/) for general information on running multiple NGINX Ingress Controllers in your cluster.
56+
- To run multiple NIC instances deployed by the NGINX Ingress Operator in your cluster in the same namespace, `rbac.create` should be set to `false`, and the ServiceAccount and ClusterRoleBinding need to be created independently of the deployments. Please note that `controller.serviceAccount.imagePullSecretName` will also be ignored in this configuration, and will need to be configured as part of the independent ServiceAccount creation.
57+
- The ClusterRoleBinding needs to configured to bind to the `nginx-ingress-operator-nginx-ingress-admin` ClusterRole.
58+
- See [RBAC example spec](../resources/rbac-example.yaml) for an example ServiceAccount and ClusterRoleBinding manifest.
59+
- To run multiple NIC instances deployed by the NGINX Ingress Operator in your cluster in any namespace but sharing an IngressClass, `controller.ingressClass` should be set to an empty string and the IngressClass resource needs to be created independently of the deployments.Please note that `controller.setAsDefaultIngress` will also be ignored in this configuration, and will need to be configured as part of the independent IngressClass creation.
60+
- See [IngressClass example spec](../resources/ingress-class.yaml) for an example IngressClass manifest.
5961

6062
## Upgrades
6163

6264
See [upgrade docs](./docs/upgrades.md)
6365

6466
## NGINX Ingress Operator Releases
67+
6568
We publish NGINX Ingress Operator releases on GitHub. See our [releases page](https://github.com/nginxinc/nginx-ingress-helm-operator/releases).
6669

67-
The latest stable release is [1.4.1](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v1.4.1). For production use, we recommend that you choose the latest stable release.
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.
6871

6972
## Development
7073

@@ -73,11 +76,11 @@ It is possible to run the operator in your local machine. This is useful for tes
7376
### Run Operator locally
7477

7578
1. Have access to a Kubernetes/OpenShift cluster.
76-
1. Apply the IC CRD:
79+
2. Apply the IC CRD:
7780
```
7881
make install
79-
```
80-
2. Run `make run`.
82+
```
83+
3. Run `make run`.
8184

8285
The operator will run in your local machine but will be communicating with the cluster.
8386

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

Lines changed: 5 additions & 5 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.1
180-
createdAt: "2023-05-18T04:36:32Z"
179+
containerImage: quay.io/nginx/nginx-ingress-operator:1.4.2
180+
createdAt: "2023-05-25T21:05:22Z"
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.1
193+
name: nginx-ingress-operator.v1.4.2
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.1
397+
image: nginx/nginx-ingress-operator:1.4.2
398398
livenessProbe:
399399
httpGet:
400400
path: /healthz
@@ -485,4 +485,4 @@ spec:
485485
minKubeVersion: 1.21.0
486486
provider:
487487
name: NGINX Inc
488-
version: 1.4.1
488+
version: 1.4.2

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.1
8+
newTag: 1.4.2

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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.1
179+
containerImage: quay.io/nginx/nginx-ingress-operator:1.4.2
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.1
348+
image: quay.io/nginx/nginx-ingress-operator:1.4.2
349349
livenessProbe:
350350
httpGet:
351351
path: /healthz
@@ -451,4 +451,4 @@ spec:
451451
minKubeVersion: 1.21.0
452452
provider:
453453
name: NGINX Inc
454-
version: 1.4.1
454+
version: 1.4.2

docs/manual-installation.md

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,44 @@
22

33
This will deploy the operator in the `nginx-ingress-operator-system` namespace.
44

5-
65
1. Deploy the Operator and associated resources:
7-
1. Clone the `nginx-ingress-operator` repo and checkout the latest stable tag:
8-
```
9-
git clone https://github.com/nginxinc/nginx-ingress-helm-operator/
10-
cd nginx-ingress-helm-operator/
11-
git checkout v1.4.1
12-
```
6+
7+
1. Clone the `nginx-ingress-operator` repo:
8+
9+
```
10+
git clone https://github.com/nginxinc/nginx-ingress-helm-operator/ --branch v1.4.2
11+
cd nginx-ingress-helm-operator/
12+
```
1313

1414
2. `OpenShift` To deploy the Operator and associated resources to an OpenShift environment, run:
15-
```
16-
make deploy IMG=nginx/nginx-ingress-operator:1.4.1
17-
```
15+
16+
```
17+
make deploy IMG=nginx/nginx-ingress-operator:1.4.2
18+
```
1819

1920
3. Alternatively, to deploy the Operator and associated resources to all other environments:
20-
```
21-
make deploy IMG=nginx/nginx-ingress-operator:1.4.1
22-
```
21+
22+
```
23+
make deploy IMG=nginx/nginx-ingress-operator:1.4.2
24+
```
2325

2426
2. Check that the Operator is running:
25-
```
26-
kubectl get deployments -n nginx-ingress-operator-system
2727

28-
NAME READY UP-TO-DATE AVAILABLE AGE
29-
nginx-ingress-operator-controller-manager 1/1 1 1 15s
30-
```
28+
```
29+
kubectl get deployments -n nginx-ingress-operator-system
30+
31+
NAME READY UP-TO-DATE AVAILABLE AGE
32+
nginx-ingress-operator-controller-manager 1/1 1 1 15s
33+
```
3134

3235
3. `OpenShift` Additional steps:
3336

3437
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):
3538

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

3841
Alternatively, to create an SCC for NIC daemonsets, please run this command:
3942

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

42-
You can now deploy the NGINX Ingress Controller instances.
45+
You can now deploy the NGINX Ingress Controller instances.

docs/openshift-installation.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ This installation method is the recommended way for OpenShift users. **Note**: O
77
The NGINX Ingress Operator is a [RedHat certified Operator](https://connect.redhat.com/en/partner-with-us/red-hat-openshift-operator-certification).
88

99
1. In the OpenShift dashboard, click `Operators` > `Operator Hub` in the left menu and use the search box to type `nginx ingress`:
10-
![alt text](./images/openshift1.png "Operators")
10+
![alt text](./images/openshift1.png "Operators")
1111
1. Click the `NGINX Ingress Operator` and click `Install`:
12-
![alt text](./images/openshift2.png "NGINX Ingress Operator")
12+
![alt text](./images/openshift2.png "NGINX Ingress Operator")
1313
1. Click `Subscribe`:
14-
![alt text](./images/openshift3.png "NGINX Ingress Operator Install")
14+
![alt text](./images/openshift3.png "NGINX Ingress Operator Install")
1515

1616
OpenShift will install the NGINX Ingress Operator:
1717

@@ -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.1/resources/scc.yaml`
24+
`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.4.2/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.3.1/resources/scc-daemonset.yaml`
28+
`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.4.2/resources/scc-daemonset.yaml`
2929

3030
You can now deploy the NGINX Ingress Controller instances.

0 commit comments

Comments
 (0)