Merge pull request #1577 from aledbf/update-nginx-controller

Automatic merge from submit-queue WIP: [nginx-ingress-controller] Release 0.8.3 fixes #1572
kubernetes-retired · Aug 22, 2016 · 8a93116 · 8a93116
2 parents 952e3fb + add0235
commit 8a93116
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/ingress/controllers/nginx/Changelog.md b/ingress/controllers/nginx/Changelog.md
@@ -1,5 +1,12 @@
 Changelog
 
+### 0.8.3
+
+- [X] [#1450](https://github.com/kubernetes/contrib/pull/1450) Check for errors in nginx template
+- [ ] [#1498](https://github.com/kubernetes/contrib/pull/1498) Refactoring of template handling
+- [X] [#1467](https://github.com/kubernetes/contrib/pull/1467) Use ClientConfig to configure connection
+- [X] [#1575](https://github.com/kubernetes/contrib/pull/1575) Update nginx to 1.11.3
+
 ### 0.8.2
 
 - [X] [#1336](https://github.com/kubernetes/contrib/pull/1336) Add annotation to skip ingress rule

diff --git a/ingress/controllers/nginx/Dockerfile b/ingress/controllers/nginx/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/google_containers/nginx-slim:0.8
+FROM gcr.io/google_containers/nginx-slim:0.9
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
   diffutils \

diff --git a/ingress/controllers/nginx/Makefile b/ingress/controllers/nginx/Makefile
@@ -1,7 +1,7 @@
 all: push
 
 # 0.0 shouldn't clobber any release builds
-TAG = 0.8.2
+TAG = 0.8.3
 PREFIX = gcr.io/google_containers/nginx-ingress-controller
 
 REPO_INFO=$(shell git config --get remote.origin.url)

diff --git a/ingress/controllers/nginx/main.go b/ingress/controllers/nginx/main.go
@@ -43,7 +43,7 @@ const (
 
 var (
 	// value overwritten during build. This can be used to resolve issues.
-	version = "0.8.2"
+	version = "0.8.3"
 	gitRepo = "https://github.com/kubernetes/contrib"
 
 	flags = pflag.NewFlagSet("", pflag.ExitOnError)