Skip to content

Commit

Permalink
Release 1.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
LorcanMcVeigh committed Aug 18, 2020
1 parent ce3ab89 commit 2c9e223
Show file tree
Hide file tree
Showing 44 changed files with 165 additions and 90 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,18 @@
# Changelog

### 1.8.1

CHANGES:
* Update NGINX version to 1.19.2.

HELM CHART:
* The version of the Helm chart is now 0.6.1.

UPGRADE:
* For NGINX, use the 1.8.1 image from our DockerHub: `nginx/nginx-ingress:1.8.1`, `nginx/nginx-ingress:1.8.1-alpine` or `nginx/nginx-ingress:1.8.1-ubi`
* For NGINX Plus, please build your own image using the 1.8.1 source code.
* For Helm, use version 0.6.1 of the chart.

### 1.8.0

OVERVIEW:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
@@ -1,6 +1,6 @@
all: push

VERSION = 1.8.0
VERSION = 1.8.1
TAG = $(VERSION)
PREFIX = nginx/nginx-ingress

Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -51,7 +51,7 @@ Read [this doc](docs/nginx-plus.md) to learn more about NGINX Ingress controller

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

The latest stable release is [1.8.0](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.8.0). For production use, we recommend that you choose the latest stable release. As an alternative, you can choose the *edge* version built from the [latest commit](https://github.com/nginxinc/kubernetes-ingress/commits/master) from the master branch. The edge version is useful for experimenting with new features that are not yet published in a stable release.
The latest stable release is [1.8.1](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.8.1). For production use, we recommend that you choose the latest stable release. As an alternative, you can choose the *edge* version built from the [latest commit](https://github.com/nginxinc/kubernetes-ingress/commits/master) from the master branch. The edge version is useful for experimenting with new features that are not yet published in a stable release.

To use the Ingress controller, you need to have access to:
* An Ingress controller image.
Expand All @@ -64,7 +64,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 | `nginx/nginx-ingress:1.8.0`, `nginx/nginx-ingress:1.8.0-alpine` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v1.8.0/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v1.8.0/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 | `nginx/nginx-ingress:1.8.1`, `nginx/nginx-ingress:1.8.1-alpine` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v1.8.1/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v1.8.1/deployments/helm-chart). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). |
| Edge | For testing and experimenting | `nginx/nginx-ingress:edge`, `nginx/nginx-ingress:edge-alpine` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/) or [build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/master/docs-web/installation/building-ingress-controller-image.md). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/master/docs-web/installation/building-ingress-controller-image.md). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/master/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/master/deployments/helm-chart). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/master/docs-web). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples). |

## Contacts
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
@@ -1,6 +1,6 @@
ARG GOLANG_CONTAINER=golang:latest

FROM nginx:1.19.1 AS base
FROM nginx:1.19.2 AS base

# forward nginx access and error logs to stdout and stderr of the ingress
# controller process
Expand Down
2 changes: 1 addition & 1 deletion build/DockerfileForAlpine
@@ -1,6 +1,6 @@
ARG GOLANG_CONTAINER=golang:latest

FROM nginx:1.19.1-alpine AS base
FROM nginx:1.19.2-alpine AS base

# forward nginx access and error logs to stdout and stderr of the ingress
# controller process
Expand Down
2 changes: 1 addition & 1 deletion build/DockerfileWithOpentracing
@@ -1,4 +1,4 @@
ARG NGINX_VERSION=1.19.1
ARG NGINX_VERSION=1.19.2
ARG OPENTRACING_CPP_VERSION=1.5.1
ARG GOLANG_CONTAINER=golang:latest

Expand Down
2 changes: 1 addition & 1 deletion build/openshift/Dockerfile
Expand Up @@ -9,7 +9,7 @@ LABEL name="NGINX Ingress Controller" \
maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>" \
vendor="NGINX Inc <kubernetes@nginx.com>"

ENV NGINX_VERSION=1.19.1
ENV NGINX_VERSION=1.19.2

RUN set -x \
&& groupadd --system --gid 101 nginx \
Expand Down
2 changes: 1 addition & 1 deletion deployments/daemon-set/nginx-ingress.yaml
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx/nginx-ingress:1.8.0
- image: nginx/nginx-ingress:1.8.1
imagePullPolicy: IfNotPresent
name: nginx-ingress
ports:
Expand Down
2 changes: 1 addition & 1 deletion deployments/daemon-set/nginx-plus-ingress.yaml
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx-plus-ingress:1.8.0
- image: nginx-plus-ingress:1.8.1
imagePullPolicy: IfNotPresent
name: nginx-plus-ingress
ports:
Expand Down
2 changes: 1 addition & 1 deletion deployments/deployment/nginx-ingress.yaml
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx/nginx-ingress:1.8.0
- image: nginx/nginx-ingress:1.8.1
imagePullPolicy: IfNotPresent
name: nginx-ingress
ports:
Expand Down
2 changes: 1 addition & 1 deletion deployments/deployment/nginx-plus-ingress.yaml
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx-plus-ingress:1.8.0
- image: nginx-plus-ingress:1.8.1
imagePullPolicy: IfNotPresent
name: nginx-plus-ingress
ports:
Expand Down
8 changes: 4 additions & 4 deletions deployments/helm-chart/Chart.yaml
@@ -1,11 +1,11 @@
name: nginx-ingress
version: 0.6.0
appVersion: 1.8.0
version: 0.6.1
appVersion: 1.8.1
apiVersion: v1
description: NGINX Ingress Controller
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v1.8.0/deployments/helm-chart/chart-icon.png
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v1.8.1/deployments/helm-chart/chart-icon.png
sources:
- https://github.com/nginxinc/kubernetes-ingress/tree/v1.8.0/deployments/helm-chart
- https://github.com/nginxinc/kubernetes-ingress/tree/v1.8.1/deployments/helm-chart
keywords:
- ingress
- nginx
Expand Down
4 changes: 2 additions & 2 deletions deployments/helm-chart/README.md
Expand Up @@ -20,7 +20,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 checkout v1.8.0
$ git checkout v1.8.1
```
2. Change your working directory to /deployments/helm-chart:
```console
Expand Down Expand Up @@ -195,7 +195,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. | 1.8.0
`controller.image.tag` | The tag of the Ingress controller image. | 1.8.1
`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: "1.8.0"
tag: "1.8.1"
nodeSelector:
beta.kubernetes.io/arch: "amd64"
proxy: 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: "1.8.0"
tag: "1.8.1"
2 changes: 1 addition & 1 deletion deployments/helm-chart/values.yaml
Expand Up @@ -36,7 +36,7 @@ controller:
repository: nginx/nginx-ingress

## The tag of the Ingress controller image.
tag: "1.8.0"
tag: "1.8.1"

## The pull policy for the Ingress controller image.
pullPolicy: IfNotPresent
Expand Down
6 changes: 3 additions & 3 deletions docs-web/app-protect/configuration.md
@@ -1,12 +1,12 @@
# Configuration
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/v1.8.0/examples/appprotect).
> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v1.8.1/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/v1.8.0/examples/appprotect).
> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v1.8.1/examples/appprotect).
## Enable App Protect for an Ingress Resource

Expand Down Expand Up @@ -118,7 +118,7 @@ metadata:
name: logconf
spec:
filter:
request_types: all
request_type: all
content:
format: default
max_request_size: any
Expand Down
2 changes: 1 addition & 1 deletion docs-web/app-protect/index.rst
Expand Up @@ -9,4 +9,4 @@ Ingress Controller with App Protect

installation
configuration
troubleshooting
troubleshooting
2 changes: 1 addition & 1 deletion docs-web/app-protect/installation.md
Expand Up @@ -33,5 +33,5 @@ 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/#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/v1.8.0/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/v1.8.1/examples/appprotect).

2 changes: 1 addition & 1 deletion docs-web/app-protect/troubleshooting.md
Expand Up @@ -102,4 +102,4 @@ This timeout should be more than enough to verify configurations. However, when
- You need to apply a large amount of Ingress Resources at once.
- You are running the Ingress Controller for the first time in a cluster where the Ingress Resources with App Protect enabled are already present.

You can increase this timeout by setting the `nginx-reload-timeout` [cli-argument](/nginx-ingress-controller/configuration/global-configuration/command-line-arguments/#cmdoption-nginx-reload-timeout).
You can increase this timeout by setting the `nginx-reload-timeout` [cli-argument](/nginx-ingress-controller/configuration/global-configuration/command-line-arguments/#cmdoption-nginx-reload-timeout).
4 changes: 2 additions & 2 deletions docs-web/configuration/configuration-examples.md
@@ -1,5 +1,5 @@
# Configuration Examples

Our [GitHub repo](https://github.com/nginxinc/kubernetes-ingress) includes a number of configuration examples:
* [*Examples*](https://github.com/nginxinc/kubernetes-ingress/tree/v1.8.0/examples) show how to use advanced NGINX features in Ingress resources with annotations.
* [*Examples of Custom Resources*](https://github.com/nginxinc/kubernetes-ingress/tree/v1.8.0/examples-of-custom-resources) show how to use VirtualServer and VirtualServerResources for a few use cases.
* [*Examples*](https://github.com/nginxinc/kubernetes-ingress/tree/v1.8.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/v1.8.1/examples-of-custom-resources) show how to use VirtualServer and VirtualServerResources for a few use cases.
Expand Up @@ -64,6 +64,9 @@ Below we describe the available command-line arguments:
Adds a location "/nginx-health" to the default server. The location responds with the 200 status code for any request.
Useful for external health-checking of the Ingress controller.
.. option:: -health-status-uri <string>
Sets the URI of health status location in the default server. Requires :option:`-health-status`
.. option:: -ingress-class <string>
A class of the Ingress controller. The Ingress controller only processes Ingress resources that belong to its class (i.e. have the annotation "kubernetes.io/ingress.class" or the "ingressClassName" field in VirtualServer/VirtualServerRoute").
Expand Down

0 comments on commit 2c9e223

Please sign in to comment.