From 9d07120eb17cd4268641b361a369b8578d7f5245 Mon Sep 17 00:00:00 2001
From: Manuel de Brito Fontes <aledbf@gmail.com>
Date: Fri, 19 Aug 2016 11:44:22 -0300
Subject: [PATCH] Release 0.8.3

---
 controllers/nginx/Changelog.md | 7 +++++++
 controllers/nginx/Dockerfile   | 2 +-
 controllers/nginx/Makefile     | 2 +-
 controllers/nginx/main.go      | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/controllers/nginx/Changelog.md b/controllers/nginx/Changelog.md
index 2f654d223..0bb7aeec3 100644
--- a/controllers/nginx/Changelog.md
+++ b/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/controllers/nginx/Dockerfile b/controllers/nginx/Dockerfile
index ad4363945..3a295fb07 100644
--- a/controllers/nginx/Dockerfile
+++ b/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/controllers/nginx/Makefile b/controllers/nginx/Makefile
index 5463cfafe..c5eca4838 100644
--- a/controllers/nginx/Makefile
+++ b/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/controllers/nginx/main.go b/controllers/nginx/main.go
index fa08e1fac..f561e3b30 100644
--- a/controllers/nginx/main.go
+++ b/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)