Skip to content

Commit

Permalink
Release 1.5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
pleshakov committed Aug 21, 2019
1 parent f745d7d commit 279c726
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 20 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

### 1.5.4

CHANGES:
* Update NGINX version to 1.17.3.

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

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

### 1.5.3

CHANGES:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
all: push

VERSION = 1.5.3
VERSION = 1.5.4
TAG = $(VERSION)
PREFIX = nginx/nginx-ingress

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,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.5.3](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.5.3). 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.5.4](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.5.4). 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 @@ -62,7 +62,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.5.3`, `nginx/nginx-ingress:1.5.3-alpine` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/) or [build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.3/build). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.3/build). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.3/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.3/deployments/helm-chart). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.3/docs). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.3/examples). |
| Latest stable release | For production use | `nginx/nginx-ingress:1.5.4`, `nginx/nginx-ingress:1.5.4-alpine` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/) or [build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.4/build). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.4/build). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.4/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.4/deployments/helm-chart). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.4/docs). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.4/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/build). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/master/build). | [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). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples). |

## Contacts
Expand Down
6 changes: 3 additions & 3 deletions build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ We build the image using the make utility and the provided `Makefile`. Let’s c
1. Clone the Ingress controller repo:
```
$ git clone https://github.com/nginxinc/kubernetes-ingress/
$ git checkout v1.5.3
$ git checkout v1.5.4
```

1. Build the image:
Expand All @@ -41,7 +41,7 @@ We build the image using the make utility and the provided `Makefile`. Let’s c
```
`myregistry.example.com/nginx-ingress` defines the repo in your private registry where the image will be pushed. Substitute that value with the repo in your private registry.

As the result, the image **myregistry.example.com/nginx-ingress:1.5.3** is built and pushed to the registry. Note that the tag `1.5.3` comes from the `VERSION` variable, defined in the Makefile.
As the result, the image **myregistry.example.com/nginx-ingress:1.5.4** is built and pushed to the registry. Note that the tag `1.5.4` comes from the `VERSION` variable, defined in the Makefile.

* For NGINX Plus, first, make sure that the certificate (`nginx-repo.crt`) and the key (`nginx-repo.key`) of your license are located in the root of the project:
```
Expand All @@ -55,7 +55,7 @@ We build the image using the make utility and the provided `Makefile`. Let’s c
```
`myregistry.example.com/nginx-plus-ingress` defines the repo in your private registry where the image will be pushed. Substitute that value with the repo in your private registry.

As the result, the image **myregistry.example.com/nginx-plus-ingress:1.5.3** is built and pushed to the registry. Note that the tag `1.5.3` comes from the `VERSION` variable, defined in the Makefile.
As the result, the image **myregistry.example.com/nginx-plus-ingress:1.5.4** is built and pushed to the registry. Note that the tag `1.5.4` comes from the `VERSION` variable, defined in the Makefile.

Next you will find the details about available Makefile targets and variables.

Expand Down
2 changes: 1 addition & 1 deletion deployments/daemon-set/nginx-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx/nginx-ingress:1.5.3
- image: nginx/nginx-ingress:1.5.4
name: nginx-ingress
ports:
- name: http
Expand Down
2 changes: 1 addition & 1 deletion deployments/daemon-set/nginx-plus-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx-plus-ingress:1.5.3
- image: nginx-plus-ingress:1.5.4
name: nginx-plus-ingress
ports:
- name: http
Expand Down
2 changes: 1 addition & 1 deletion deployments/deployment/nginx-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx/nginx-ingress:1.5.3
- image: nginx/nginx-ingress:1.5.4
name: nginx-ingress
ports:
- name: http
Expand Down
2 changes: 1 addition & 1 deletion deployments/deployment/nginx-plus-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx-plus-ingress:1.5.3
- image: nginx-plus-ingress:1.5.4
name: nginx-plus-ingress
ports:
- name: http
Expand Down
8 changes: 4 additions & 4 deletions deployments/helm-chart/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: nginx-ingress
version: 0.3.3
appVersion: 1.5.3
version: 0.3.4
appVersion: 1.5.4
description: NGINX Ingress Controller
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v1.5.3/deployments/helm-chart/chart-icon.png
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v1.5.4/deployments/helm-chart/chart-icon.png
sources:
- https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.3/deployments/helm-chart
- https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.4/deployments/helm-chart
keywords:
- ingress
- nginx
Expand Down
6 changes: 3 additions & 3 deletions deployments/helm-chart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This chart deploys the NGINX Ingress controller in your Kubernetes cluster.
- Helm 2.8.x+.
- Git (for installation using the chart source files).
- If you’d like to use NGINX Plus:
- Build an Ingress controller image with NGINX Plus and push it to your private registry by following the instructions from [here](https://github.com/nginxinc/kubernetes-ingress/blob/v1.5.3/build/README.md).
- Build an Ingress controller image with NGINX Plus and push it to your private registry by following the instructions from [here](https://github.com/nginxinc/kubernetes-ingress/blob/v1.5.4/build/README.md).
- Configure `controller.nginxplus` and `controller.image.repository` parameters accordingly using a values file or the `--set` flag of the `helm install` command.

## Installing the Chart
Expand Down Expand Up @@ -39,7 +39,7 @@ This chart deploys the NGINX Ingress controller in your Kubernetes cluster.
1. Clone the Ingress controller repo and check out the latest stable version:
```
$ git clone https://github.com/nginxinc/kubernetes-ingress/
$ git checkout v1.5.3
$ git checkout v1.5.4
```
2. Change your working directory to /deployments/helm-chart:
```
Expand Down Expand Up @@ -86,7 +86,7 @@ Parameter | Description | Default
`controller.hostNetwork` | Enables the Ingress controller pods to use the host's network namespace. | false
`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.image.repository` | The image repository of the Ingress controller. | nginx/nginx-ingress
`controller.image.tag` | The tag of the Ingress controller image. | 1.5.3
`controller.image.tag` | The tag of the Ingress controller image. | 1.5.4
`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.entries` | The entries of the ConfigMap for customizing NGINX configuration. | {}
Expand Down
2 changes: 1 addition & 1 deletion deployments/helm-chart/values-icp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ controller:
nginxplus: true
image:
repository: mycluster.icp:8500/kube-system/nginx-plus-ingress
tag: "1.5.3"
tag: "1.5.4"
nodeSelector:
beta.kubernetes.io/arch: "amd64"
proxy: true
Expand Down
2 changes: 1 addition & 1 deletion deployments/helm-chart/values-plus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ controller:
nginxplus: true
image:
repository: nginx-plus-ingress
tag: "1.5.3"
tag: "1.5.4"
2 changes: 1 addition & 1 deletion deployments/helm-chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ controller:
repository: nginx/nginx-ingress

## The tag of the Ingress controller image.
tag: "1.5.3"
tag: "1.5.4"

## The pull policy for the Ingress controller image.
pullPolicy: IfNotPresent
Expand Down

0 comments on commit 279c726

Please sign in to comment.