Skip to content

Commit

Permalink
Release 1.2.1 (#49)
Browse files Browse the repository at this point in the history
  • Loading branch information
lucacome authored Nov 7, 2022
1 parent b9fe578 commit 9d79744
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 18 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

### 1.2.1

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

### 1.2.0

An automatically generated list of changes can be found on Github at: [1.2.0 Release](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v1.2.0)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0
VERSION ?= 1.2.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")
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The following table shows the relation between the versions of the two projects:

| NGINX Ingress Controller | NGINX Ingress Operator |
| --- | --- |
| 2.4.x | 1.2.0 |
| 2.4.x | 1.2.1 |
| 2.3.x | 1.1.0 |
| 2.2.x | 1.0.0 |
| 2.1.x | 0.5.1 |
Expand All @@ -33,10 +33,10 @@ Note: The NGINX Ingress Operator works only for NGINX Ingress Controller version

1. Install the NGINX Ingress Operator. See [docs](./docs/installation.md).
<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)
2. Create a default server secret on the cluster - an example yaml for this can be found in the [examples folder](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/v1.2.0/examples/default-server-secret.yaml)
2. Create a default server secret on the cluster - an example yaml for this can be found in the [examples folder](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/v1.2.1/examples/default-server-secret.yaml)
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:
```shell
kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.2.0/resources/scc.yaml
kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.2.1/resources/scc.yaml
```
4. Deploy a new NGINX Ingress Controller using the [NginxIngress](./config/samples/charts_v1alpha1_nginxingress.yaml) Custom Resource:
* Use the name of the default server secret created above for `controller.defaultTLS.secret` field (needs to be in the form `namespace/name`)
Expand All @@ -62,7 +62,7 @@ See [upgrade docs](./docs/upgrades.md)
## NGINX Ingress Operator Releases
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.2.0](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v1.2.0). For production use, we recommend that you choose the latest stable release.
The latest stable release is [1.2.1](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v1.2.1). For production use, we recommend that you choose the latest stable release.

## Development

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ metadata:
capabilities: Basic Install
categories: Monitoring, Networking
certified: "true"
containerImage: nginx/nginx-ingress-operator:1.2.0
containerImage: nginx/nginx-ingress-operator:1.2.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
Expand All @@ -159,7 +159,7 @@ metadata:
operatorframework.io/arch.arm64: supported
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
name: nginx-ingress-operator.v1.2.0
name: nginx-ingress-operator.v1.2.1
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -363,7 +363,7 @@ spec:
- --metrics-bind-address=127.0.0.1:8080
- --leader-elect
- --leader-election-id=nginx-ingress-operator
image: nginx/nginx-ingress-operator:1.2.0
image: nginx/nginx-ingress-operator:1.2.1
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -454,4 +454,4 @@ spec:
minKubeVersion: 1.19.0
provider:
name: NGINX Inc
version: 1.2.0
version: 1.2.1
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ kind: Kustomization
images:
- name: controller
newName: nginx/nginx-ingress-operator
newTag: 1.2.0
newTag: 1.2.1
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ metadata:
capabilities: Basic Install
categories: Monitoring, Networking
certified: "true"
containerImage: nginx/nginx-ingress-operator:1.2.0
containerImage: nginx/nginx-ingress-operator:1.2.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
Expand Down Expand Up @@ -305,7 +305,7 @@ spec:
- --metrics-bind-address=127.0.0.1:8080
- --leader-elect
- --leader-election-id=nginx-ingress-operator
image: nginx/nginx-ingress-operator:1.2.0
image: nginx/nginx-ingress-operator:1.2.1
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -411,4 +411,4 @@ spec:
minKubeVersion: 1.19.0
provider:
name: NGINX Inc
version: 1.2.0
version: 1.2.1
8 changes: 4 additions & 4 deletions docs/manual-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ This will deploy the operator in the `nginx-ingress-operator-system` namespace.
```
git clone https://github.com/nginxinc/nginx-ingress-helm-operator/
cd nginx-ingress-helm-operator/
git checkout v1.2.0
git checkout v1.2.1
```

2. `OpenShift` To deploy the Operator and associated resources to an OpenShift environment, run:
```
make deploy IMG=nginx/nginx-ingress-operator:1.2.0
make deploy IMG=nginx/nginx-ingress-operator:1.2.1
```

3. Alternatively, to deploy the Operator and associated resources to all other environments:
```
make deploy IMG=nginx/nginx-ingress-operator:1.2.0
make deploy IMG=nginx/nginx-ingress-operator:1.2.1
```

2. Check that the Operator is running:
Expand All @@ -33,4 +33,4 @@ 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, please run the following command (assuming you are logged in with administrator access to the cluster):

`kubectl -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.2.0/resources/scc.yaml`
`kubectl -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.2.1/resources/scc.yaml`
2 changes: 1 addition & 1 deletion docs/openshift-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ 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, please run the following command (assuming you are logged in with administrator access to the cluster):

`kubectl -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.2.0/resources/scc.yaml`
`kubectl -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.2.1/resources/scc.yaml`

You can now deploy the NGINX Ingress Controller instances.

0 comments on commit 9d79744

Please sign in to comment.