Skip to content

Commit

Permalink
Release 1.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
pleshakov committed Nov 7, 2018
1 parent f18eae1 commit aae5f14
Show file tree
Hide file tree
Showing 16 changed files with 27 additions and 16 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

### 1.3.2

CHANGES:
* Update NGINX version to 1.15.6.

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

### 1.3.1

CHANGES:
Expand Down
2 changes: 1 addition & 1 deletion examples/openshift/nginx-ingress-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx/nginx-ingress:1.3.1
- image: nginx/nginx-ingress:1.3.2
imagePullPolicy: Always
name: nginx-ingress
ports:
Expand Down
2 changes: 1 addition & 1 deletion examples/openshift/nginx-plus-ingress-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx-plus-ingress:1.3.1
- image: nginx-plus-ingress:1.3.2
# imagePullPolicy: Always
name: nginx-plus-ingress
ports:
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: nginx-ingress
version: 0.1.1
appVersion: 1.3.1
appVersion: 1.3.2
description: NGINX Ingress Controller
sources:
- https://github.com/nginxinc/kubernetes-ingress/tree/master/helm-chart
Expand Down
3 changes: 2 additions & 1 deletion helm-chart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ This chart deploys the NGINX Ingress controller in your Kubernetes cluster.
1. Clone the Ingress controller repo:
```
$ git clone [email protected]:nginxinc/kubernetes-ingress.git
$ git checkout v1.3.2
```
2. Change your working directory to /helm-chart:
```
Expand Down Expand Up @@ -62,7 +63,7 @@ Parameter | Description | Default
`controller.nginxplus` | Deploys the Ingress controller for NGINX Plus. | false
`controller.hostNetwork` | Enables the Ingress controller pods to use the host's network namespace. | 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.3.1
`controller.image.tag` | The tag of the Ingress controller image. | 1.3.2
`controller.image.pullPolicy` | The pull policy for the Ingress controller image. | IfNotPresent
`controller.config.entries` | The entries of the ConfigMap for customizing NGINX configuration. | { }
`controller.defaultTLS.cert` | The base64-encoded TLS certificate for the default HTTPS server. If not specified, a pre-generated self-signed certificate is used. **Note:** It is recommended that you specify your own certificate. | A pre-generated self-signed certificate.
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/values-icp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ controller:
hostNetwork: false
image:
repository: mycluster.icp:8500/kube-system/nginx-plus-ingress
tag: "1.3.1"
tag: "1.3.2"
pullPolicy: IfNotPresent
# It is recommended to use your own TLS certificate and key
defaultTLS:
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/values-plus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ controller:
hostNetwork: false
image:
repository: nginx-plus-ingress
tag: "1.3.1"
tag: "1.3.2"
pullPolicy: IfNotPresent
# It is recommended to use your own TLS certificate and key
defaultTLS:
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ controller:
hostNetwork: false
image:
repository: nginx/nginx-ingress
tag: "1.3.1"
tag: "1.3.2"
pullPolicy: IfNotPresent
config:
entries: {}
Expand Down
2 changes: 1 addition & 1 deletion install/daemon-set/nginx-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx/nginx-ingress:1.3.1
- image: nginx/nginx-ingress:1.3.2
name: nginx-ingress
ports:
- name: http
Expand Down
2 changes: 1 addition & 1 deletion install/daemon-set/nginx-plus-ingress-with-prometheus.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.3.1
- image: nginx-plus-ingress:1.3.2
name: nginx-plus-ingress
ports:
- name: http
Expand Down
2 changes: 1 addition & 1 deletion install/daemon-set/nginx-plus-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx-plus-ingress:1.3.1
- image: nginx-plus-ingress:1.3.2
name: nginx-plus-ingress
ports:
- name: http
Expand Down
2 changes: 1 addition & 1 deletion install/deployment/nginx-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx/nginx-ingress:1.3.1
- image: nginx/nginx-ingress:1.3.2
name: nginx-ingress
ports:
- name: http
Expand Down
2 changes: 1 addition & 1 deletion install/deployment/nginx-plus-ingress-with-prometheus.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.3.1
- image: nginx-plus-ingress:1.3.2
name: nginx-plus-ingress
ports:
- name: http
Expand Down
2 changes: 1 addition & 1 deletion install/deployment/nginx-plus-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
serviceAccountName: nginx-ingress
containers:
- image: nginx-plus-ingress:1.3.1
- image: nginx-plus-ingress:1.3.2
name: nginx-plus-ingress
ports:
- name: http
Expand Down
2 changes: 1 addition & 1 deletion nginx-controller/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
all: push

VERSION = 1.3.1
VERSION = 1.3.2
TAG = $(VERSION)
PREFIX = nginx/nginx-ingress

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

Expand All @@ -41,7 +42,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.3.1** is built and pushed to the registry. Note that the tag `1.3.1` comes from the `VERSION` variable, defined in the Makefile.
As the result, the image **myregistry.example.com/nginx-ingress:1.3.2** is built and pushed to the registry. Note that the tag `1.3.2` 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 `nginx-controller` folder:
```
Expand All @@ -55,7 +56,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.3.1** is built and pushed to the registry. Note that the tag `1.3.1` comes from the `VERSION` variable, defined in the Makefile.
As the result, the image **myregistry.example.com/nginx-plus-ingress:1.3.2** is built and pushed to the registry. Note that the tag `1.3.2` comes from the `VERSION` variable, defined in the Makefile.

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

Expand Down

0 comments on commit aae5f14

Please sign in to comment.