Skip to content

Commit

Permalink
Release 2.2.2 (#2711)
Browse files Browse the repository at this point in the history
  • Loading branch information
lucacome committed May 23, 2022
1 parent 4f42854 commit a88b7fe
Show file tree
Hide file tree
Showing 40 changed files with 137 additions and 115 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog

### 2.2.2

An automatically generated list of changes can be found on Github at: [2.2.2 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.2.2)

A curated list of changes can be found on the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on the NGINX Documentation website.

### 2.2.1

An automatically generated list of changes can be found on Github at: [2.2.1 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.2.1)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -53,7 +53,7 @@ Read [this doc](https://docs.nginx.com/nginx-ingress-controller/intro/nginx-plus

We publish Ingress Controller releases on GitHub. See our [releases page](https://github.com/nginxinc/kubernetes-ingress/releases).

The latest stable release is [2.2.1](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.2.1). For production use, we recommend that you choose the latest stable release.
The latest stable release is [2.2.2](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.2.2). For production use, we recommend that you choose the latest stable release.

The edge version is useful for experimenting with new features that are not yet published in a stable release. To use, choose the *edge* version built from the [latest commit](https://github.com/nginxinc/kubernetes-ingress/commits/main) from the main branch.

Expand All @@ -68,7 +68,7 @@ The table below summarizes the options regarding the images, manifests, helm cha

| Version | Description | Image for NGINX | Image for NGINX Plus | Installation Manifests and Helm Chart | Documentation and Examples |
| ------- | ----------- | --------------- | -------------------- | ---------------------------------------| -------------------------- |
| Latest stable release | For production use | Use the 2.2.1 images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress) or [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | Use the 2.2.1 images from the [F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/) or the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE) or [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.1/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.1/deployments/helm-chart). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). |
| Latest stable release | For production use | Use the 2.2.2 images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress) or [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | Use the 2.2.2 images from the [F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/) or the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE) or [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.2/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.2/deployments/helm-chart). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). |
| Edge/Nightly | For testing and experimenting | Use the edge or nightly images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress) or [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/main/docs/content/installation/building-ingress-controller-image.md). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/main/docs/content/installation/building-ingress-controller-image.md). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/main/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/main/deployments/helm-chart). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/main/docs/content). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples). |

## Contacts
Expand Down
2 changes: 1 addition & 1 deletion deployments/daemon-set/nginx-ingress.yaml
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx/nginx-ingress:2.2.1
- image: nginx/nginx-ingress:2.2.2
imagePullPolicy: IfNotPresent
name: nginx-ingress
ports:
Expand Down
2 changes: 1 addition & 1 deletion deployments/daemon-set/nginx-plus-ingress.yaml
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx-plus-ingress:2.2.1
- image: nginx-plus-ingress:2.2.2
imagePullPolicy: IfNotPresent
name: nginx-plus-ingress
ports:
Expand Down
2 changes: 1 addition & 1 deletion deployments/deployment/nginx-ingress.yaml
Expand Up @@ -19,7 +19,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx/nginx-ingress:2.2.1
- image: nginx/nginx-ingress:2.2.2
imagePullPolicy: IfNotPresent
name: nginx-ingress
ports:
Expand Down
2 changes: 1 addition & 1 deletion deployments/deployment/nginx-plus-ingress.yaml
Expand Up @@ -19,7 +19,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx-plus-ingress:2.2.1
- image: nginx-plus-ingress:2.2.2
imagePullPolicy: IfNotPresent
name: nginx-plus-ingress
ports:
Expand Down
2 changes: 1 addition & 1 deletion deployments/helm-chart-dos-arbitrator/README.md
Expand Up @@ -16,7 +16,7 @@ This step is required if you're installing the chart using its sources. Addition

1. Clone the Ingress Controller repo:
```console
$ git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v2.2.1
$ git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v2.2.2
```
2. Change your working directory to /deployments/helm-chart-dos-arbitrator:
```console
Expand Down
8 changes: 4 additions & 4 deletions deployments/helm-chart/Chart.yaml
@@ -1,13 +1,13 @@
name: nginx-ingress
version: 0.13.1
appVersion: 2.2.1
version: 0.13.2
appVersion: 2.2.2
apiVersion: v1
kubeVersion: ">= 1.19.0-0"
description: NGINX Ingress Controller
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v2.2.1/deployments/helm-chart/chart-icon.png
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v2.2.2/deployments/helm-chart/chart-icon.png
home: https://github.com/nginxinc/kubernetes-ingress
sources:
- https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.1/deployments/helm-chart
- https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.2/deployments/helm-chart
keywords:
- ingress
- nginx
Expand Down
4 changes: 2 additions & 2 deletions deployments/helm-chart/README.md
Expand Up @@ -23,7 +23,7 @@ This step is required if you're installing the chart using its sources. Addition

1. Clone the Ingress Controller repo:
```console
$ git clone https://github.com/nginxinc/kubernetes-ingress --branch v2.2.1
$ git clone https://github.com/nginxinc/kubernetes-ingress --branch v2.2.2
```
**Note**: If you want to use the experimental repository (`edge`), remove the `--branch` flag and value.

Expand Down Expand Up @@ -156,7 +156,7 @@ Parameter | Description | Default
`controller.nginxDebug` | Enables debugging for NGINX. Uses the `nginx-debug` binary. Requires `error-log-level: debug` in the ConfigMap via `controller.config.entries`. | false
`controller.logLevel` | The log level of the Ingress Controller. | 1
`controller.image.repository` | The image repository of the Ingress Controller. | nginx/nginx-ingress
`controller.image.tag` | The tag of the Ingress Controller image. | 2.2.1
`controller.image.tag` | The tag of the Ingress Controller image. | 2.2.2
`controller.image.pullPolicy` | The pull policy for the Ingress Controller image. | IfNotPresent
`controller.config.name` | The name of the ConfigMap used by the Ingress Controller. | Autogenerated
`controller.config.annotations` | The annotations of the Ingress Controller configmap. | {}
Expand Down
2 changes: 1 addition & 1 deletion deployments/helm-chart/values-icp.yaml
Expand Up @@ -3,7 +3,7 @@ controller:
nginxplus: true
image:
repository: mycluster.icp:8500/kube-system/nginx-plus-ingress
tag: "2.2.1"
tag: "2.2.2"
nodeSelector:
beta.kubernetes.io/arch: "amd64"
proxy: true
Expand Down
2 changes: 1 addition & 1 deletion deployments/helm-chart/values-nsm.yaml
Expand Up @@ -2,7 +2,7 @@ controller:
nginxplus: true
image:
repository: nginx-plus-ingress
tag: "2.2.1"
tag: "2.2.2"
enableLatencyMetrics: true
nginxServiceMesh:
enable: true
Expand Down
2 changes: 1 addition & 1 deletion deployments/helm-chart/values-plus.yaml
Expand Up @@ -2,4 +2,4 @@ controller:
nginxplus: true
image:
repository: nginx-plus-ingress
tag: "2.2.1"
tag: "2.2.2"
2 changes: 1 addition & 1 deletion deployments/helm-chart/values.yaml
Expand Up @@ -49,7 +49,7 @@ controller:
repository: nginx/nginx-ingress

## The tag of the Ingress Controller image.
tag: "2.2.1"
tag: "2.2.2"

## The pull policy for the Ingress Controller image.
pullPolicy: IfNotPresent
Expand Down
2 changes: 1 addition & 1 deletion docs/content/app-protect-dos/configuration.md
Expand Up @@ -9,7 +9,7 @@ docs: "DOCS-580"
---

This document describes how to configure the NGINX App Protect DoS module
> Check out the complete [NGINX Ingress Controller with App Protect DoS example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.1/examples/appprotect-dos).
> Check out the complete [NGINX Ingress Controller with App Protect DoS example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.2/examples/appprotect-dos).
## App Protect DoS Configuration

Expand Down
Expand Up @@ -19,7 +19,7 @@ This step is required if you're installing the chart using its sources. Addition

1. Clone the Ingress Controller repo:
```console
$ git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v2.2.1
$ git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v2.2.2
```
2. Change your working directory to /deployments/helm-chart-dos-arbitrator:
```console
Expand Down
4 changes: 2 additions & 2 deletions docs/content/app-protect-dos/installation.md
Expand Up @@ -19,7 +19,7 @@ This document provides an overview of the steps required to use NGINX App Protec
* It is also possible to build your own image and push it to your private Docker registry by following the instructions from [here](/nginx-ingress-controller/installation/building-ingress-controller-image).
2. Clone the Ingress Controller repo:
```
$ git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v2.2.1
$ git clone https://github.com/nginxinc/kubernetes-ingress.git --branch v2.2.2
$ cd kubernetes-ingress
```

Expand Down Expand Up @@ -63,4 +63,4 @@ Take the steps below to set up and deploy the NGINX Ingress Controller and App P
3. Enable the App Protect Dos module by adding the `enable-app-protect-dos` [cli argument](/nginx-ingress-controller/configuration/global-configuration/command-line-arguments/#cmdoption-enable-app-protect-dos) to your Deployment or DaemonSet file.
4. [Deploy the Ingress Controller](/nginx-ingress-controller/installation/installation-with-manifests/#3-deploy-the-ingress-controller).

For more information, see the [Configuration guide](/nginx-ingress-controller/app-protect-dos/configuration),the [NGINX Ingress Controller with App Protect DoS example for Ingress](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.1/examples/appprotect-dos) and the [NGINX Ingress Controller with App Protect DoS example for VirtualServer](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.1/examples/custom-resources/dos).
For more information, see the [Configuration guide](/nginx-ingress-controller/app-protect-dos/configuration),the [NGINX Ingress Controller with App Protect DoS example for Ingress](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.2/examples/appprotect-dos) and the [NGINX Ingress Controller with App Protect DoS example for VirtualServer](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.2/examples/custom-resources/dos).
4 changes: 2 additions & 2 deletions docs/content/app-protect/configuration.md
Expand Up @@ -9,13 +9,13 @@ docs: "DOCS-578"
---

This document describes how to configure the NGINX App Protect module
> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.1/examples/appprotect).
> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.2/examples/appprotect).
## Global Configuration

The NGINX Ingress Controller has a set of global configuration parameters that align with those available in the NGINX App Protect module. See [ConfigMap keys](/nginx-ingress-controller/configuration/global-configuration/configmap-resource/#modules) for the complete list. The App Protect parameters use the `app-protect*` prefix.

> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.1/examples/appprotect).
> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.2/examples/appprotect).
## Enable App Protect for an Ingress Resource

Expand Down
10 changes: 5 additions & 5 deletions docs/content/app-protect/installation.md
Expand Up @@ -23,9 +23,9 @@ Take the steps below to either configure a Docker Registry secret in your Kubern

For NGINX Plus Ingress Controller with App Protect, pull from `private-registry.nginx.com/nginx-ic-nap/nginx-plus-ingress`:
```
$ docker pull private-registry.nginx.com/nginx-ic-nap/nginx-plus-ingress:2.2.1
$ docker pull private-registry.nginx.com/nginx-ic-nap/nginx-plus-ingress:2.2.2
```
`2.2.1` will pull down the Debian based image. The other available image tag is `2.2.1-ubi` for the UBI based image.
`2.2.2` will pull down the Debian based image. The other available image tag is `2.2.2-ubi` for the UBI based image.

- Use the docker registry API to list the available image tags for the repository.

Expand All @@ -35,8 +35,8 @@ Take the steps below to either configure a Docker Registry secret in your Kubern
{
"name": "nginx-ic-nap/nginx-plus-ingress",
"tags": [
"2.2.1-ubi",
"2.2.1"
"2.2.2-ubi",
"2.2.2"
]
}
```
Expand Down Expand Up @@ -74,4 +74,4 @@ Take the steps below to set up and deploy the NGINX Ingress Controller and App P
3. Enable the App Protect module by adding the `enable-app-protect` [cli argument](/nginx-ingress-controller/configuration/global-configuration/command-line-arguments/#cmdoption-enable-app-protect) to your Deployment or DaemonSet file.
4. [Deploy the Ingress Controller](/nginx-ingress-controller/installation/installation-with-manifests/#3-deploy-the-ingress-controller).

For more information, see the [Configuration guide](/nginx-ingress-controller/app-protect/configuration) and the [NGINX Ingress Controller with App Protect examples on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.1/examples/appprotect).
For more information, see the [Configuration guide](/nginx-ingress-controller/app-protect/configuration) and the [NGINX Ingress Controller with App Protect examples on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.2/examples/appprotect).
4 changes: 2 additions & 2 deletions docs/content/configuration/configuration-examples.md
Expand Up @@ -10,5 +10,5 @@ docs: "DOCS-584"


Our [GitHub repo](https://github.com/nginxinc/kubernetes-ingress) includes a number of configuration examples:
* [*Examples*](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.1/examples) show how to use advanced NGINX features in Ingress resources with annotations.
* [*Examples of Custom Resources*](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.1/examples/custom-resources) show how to use VirtualServer and VirtualServerResources for a few use cases.
* [*Examples*](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.2/examples) show how to use advanced NGINX features in Ingress resources with annotations.
* [*Examples of Custom Resources*](https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.2/examples/custom-resources) show how to use VirtualServer and VirtualServerResources for a few use cases.

0 comments on commit a88b7fe

Please sign in to comment.