Skip to content

Commit

Permalink
Update NGINX Ingress Controller to 3.6.2 (#370)
Browse files Browse the repository at this point in the history
  • Loading branch information
nginx-bot authored Aug 19, 2024
1 parent 3f4fdfa commit bab4f56
Show file tree
Hide file tree
Showing 1,273 changed files with 5,993 additions and 5,564 deletions.
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 ?= 2.3.1
VERSION ?= 2.3.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")
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The following table shows the relation between the versions of the two projects:

| NGINX Ingress Controller | NGINX Ingress Operator |
| ------------------------ | ---------------------- |
| 3.6.x | 2.3.1 |
| 3.6.x | 2.3.2 |
| 3.5.x | 2.2.2 |
| 3.4.x | 2.1.2 |
| 3.3.x | 2.0.2 |
Expand Down Expand Up @@ -75,7 +75,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.3.1](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v2.3.1). For production use, we recommend that you choose the latest stable release.
The latest stable release is [2.3.2](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v2.3.2). 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 @@ -77,7 +77,7 @@ metadata:
"image": {
"pullPolicy": "IfNotPresent",
"repository": "nginx/nginx-ingress",
"tag": "3.6.1-ubi"
"tag": "3.6.2-ubi"
},
"includeYear": false,
"ingressClass": {
Expand Down Expand Up @@ -220,7 +220,7 @@ metadata:
capabilities: Basic Install
categories: Monitoring, Networking
certified: "true"
containerImage: quay.io/nginx/nginx-ingress-operator:2.3.1
containerImage: quay.io/nginx/nginx-ingress-operator:2.3.2
createdAt: "2024-08-06T10:53:11Z"
description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which
deploys and manages one or more NGINX/NGINX Plus Ingress Controllers
Expand All @@ -244,7 +244,7 @@ metadata:
operatorframework.io/arch.arm64: supported
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
name: nginx-ingress-operator.v2.3.1
name: nginx-ingress-operator.v2.3.2
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -448,7 +448,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.3.1
image: quay.io/nginx/nginx-ingress-operator:2.3.2
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -539,4 +539,4 @@ spec:
minKubeVersion: 1.23.0
provider:
name: NGINX Inc
version: 2.3.1
version: 2.3.2
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: quay.io/nginx/nginx-ingress-operator
newTag: 2.3.1
newTag: 2.3.2
2 changes: 1 addition & 1 deletion config/manifests/bases/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ resources:
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
commonAnnotations:
containerImage: quay.io/nginx/nginx-ingress-operator:2.3.1
containerImage: quay.io/nginx/nginx-ingress-operator:2.3.2
2 changes: 1 addition & 1 deletion config/samples/charts_v1alpha1_nginxingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
customPorts: []
image:
repository: nginx/nginx-ingress
tag: "3.6.1-ubi"
tag: "3.6.2-ubi"
# digest: "sha256:CHANGEME"
pullPolicy: IfNotPresent
lifecycle: {}
Expand Down
14 changes: 7 additions & 7 deletions docs/manual-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ 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.3.1
git clone https://github.com/nginxinc/nginx-ingress-helm-operator/ --branch v2.3.2
cd nginx-ingress-helm-operator/
```

2. To deploy the Operator and associated resources to all environments, run:

```shell
make deploy IMG=nginx/nginx-ingress-operator:2.3.1
make deploy IMG=nginx/nginx-ingress-operator:2.3.2
```

2. Check that the Operator is running:
Expand All @@ -30,11 +30,11 @@ 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.3.1/resources/scc.yaml`
`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.3.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.3.1/resources/scc-daemonset.yaml`
`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.3.2/resources/scc-daemonset.yaml`

You can now deploy the NGINX Ingress Controller instances.

Expand All @@ -44,19 +44,19 @@ You can now deploy the NGINX Ingress Controller instances.
You can use the operator (including the kube-rbac-proxy) images from your own private registry.
1. Tag the images for your private registry
```shell
docker tag quay.io/nginx/nginx-ingress-operator:2.3.1 <my-private-registry>/nginx-ingress-operator:2.3.1
docker tag quay.io/nginx/nginx-ingress-operator:2.3.2 <my-private-registry>/nginx-ingress-operator:2.3.2
docker tag quay.io/brancz/kube-rbac-proxy:v0.18.0 <my-private-registry>/kube-rbac-proxy:v0.18.0
```
2. Push the image to your private registry
```shell
docker push <my-private-registry>/nginx-ingress-operator:2.3.1
docker push <my-private-registry>/nginx-ingress-operator:2.3.2
docker push <my-private-registry>/kube-rbac-proxy:v0.18.0
```
3. Follow step 1 above but in step 1.2 you can run
```shell
make deploy IMG=<my-private-registry>/nginx-ingress-operator:2.3.1 KRP_IMAGE_BASE=<my-private-registry>/kube-rbac-proxy
make deploy IMG=<my-private-registry>/nginx-ingress-operator:2.3.2 KRP_IMAGE_BASE=<my-private-registry>/kube-rbac-proxy
```
**Note: If you need to use a different `kube-rbac-proxy` version than the default, use the `KRP_IMAGE_TAG` variable**
Expand Down
2 changes: 1 addition & 1 deletion docs/nginx-ingress-controller.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
customPorts: []
image:
repository: nginx/nginx-ingress
tag: "3.6.1-ubi"
tag: "3.6.2-ubi"
# digest: "sha256:CHANGEME"
pullPolicy: IfNotPresent
lifecycle: {}
Expand Down
4 changes: 2 additions & 2 deletions docs/openshift-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,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.3.1/resources/scc.yaml`
`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.3.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.3.1/resources/scc-daemonset.yaml`
`kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v2.3.2/resources/scc-daemonset.yaml`

You can now deploy the NGINX Ingress Controller instances.
2 changes: 1 addition & 1 deletion examples/deployment-oss-min/nginx-ingress-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
image:
pullPolicy: IfNotPresent
repository: nginx/nginx-ingress
tag: 3.6.1-ubi
tag: 3.6.2-ubi
ingressClass:
name: nginx
kind: deployment
Expand Down
2 changes: 1 addition & 1 deletion examples/deployment-plus-min/nginx-ingress-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
image:
pullPolicy: IfNotPresent
repository: nginx/nginx-ingress
tag: 3.6.1-ubi
tag: 3.6.2-ubi
ingressClass:
name: nginx
kind: deployment
Expand Down
8 changes: 4 additions & 4 deletions helm-charts/nginx-ingress/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
appVersion: 3.6.1
appVersion: 3.6.2
description: NGINX Ingress Controller
home: https://github.com/nginxinc/kubernetes-ingress
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.6.1/charts/nginx-ingress/chart-icon.png
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.6.2/charts/nginx-ingress/chart-icon.png
keywords:
- ingress
- nginx
Expand All @@ -12,6 +12,6 @@ maintainers:
name: nginxinc
name: nginx-ingress
sources:
- https://github.com/nginxinc/kubernetes-ingress/tree/v3.6.1/charts/nginx-ingress
- https://github.com/nginxinc/kubernetes-ingress/tree/v3.6.2/charts/nginx-ingress
type: application
version: 1.3.1
version: 1.3.2
Loading

0 comments on commit bab4f56

Please sign in to comment.