Skip to content

Commit

Permalink
Update repo files for release 1.5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Dean-Coakley committed Sep 25, 2019
1 parent 0a56aee commit 983f387
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 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.6

CHANGES:
* Update NGINX version to 1.17.4.

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

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

### 1.5.5

CHANGES:
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.5](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.5.5). 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.6](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.5.6). 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.5`, `nginx/nginx-ingress:1.5.5-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.5/build). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.5/build). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.5/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.5/deployments/helm-chart). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.5/docs). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.5/examples). |
| Latest stable release | For production use | `nginx/nginx-ingress:1.5.6`, `nginx/nginx-ingress:1.5.6-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.6/build). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.6/build). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.6/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.6/deployments/helm-chart). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.6/docs). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/v1.5.6/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

0 comments on commit 983f387

Please sign in to comment.