From 4f44ddcf73c4a6162e3dff7058479dedc78abf44 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Sat, 23 Jun 2018 09:22:46 -0400
Subject: [PATCH] Release 0.16.1 (#2695)

---
 Changelog.md                                  | 37 ++++++++++++++++++-
 Makefile                                      |  2 +-
 deploy/mandatory.yaml                         |  2 +-
 deploy/with-rbac.yaml                         |  2 +-
 docs/deploy/upgrade.md                        |  2 +-
 .../static-ip/nginx-ingress-controller.yaml   |  2 +-
 6 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5f5be9f3a..710adb4f9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,8 +1,43 @@
 # Changelog
 
+### 0.16.1
+
+**Image:**  `quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.1`
+
+*Breaking changes:*
+
+Running as user requires an update in the deployment manifest.
+
+```yaml
+  securityContext:
+    capabilities:
+        drop:
+        - ALL
+        add:
+        - NET_BIND_SERVICE
+    # www-data -> 33
+    runAsUser: 33
+```
+
+Note: the deploy [guide](https://kubernetes.github.io/ingress-nginx/deploy/#mandatory-command) contains this change
+
+*New Features:*
+
+- Run as user dropping root privileges
+- New prometheus metric implementation (VTS module was removed)
+- [InfluxDB integration](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#influxdb)
+- [Module GeoIP2](https://github.com/leev/ngx_http_geoip2_module)
+
+*Changes:*
+
+- [X] [#2692](https://github.com/kubernetes/ingress-nginx/pull/2692) Fix initial read of configuration configmap
+- [X] [#2693](https://github.com/kubernetes/ingress-nginx/pull/2693) Revert #2669
+- [X] [#2694](https://github.com/kubernetes/ingress-nginx/pull/2694) Add note about status update
+
+
 ### 0.16.0
 
-**Image:**  `quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.0`
+**Image:**  `quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.1`
 
 *Breaking changes:*
 
diff --git a/Makefile b/Makefile
index 6fbccd638..52f2bf0b3 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ all: all-container
 BUILDTAGS=
 
 # Use the 0.0 tag for testing, it shouldn't clobber any release builds
-TAG?=0.16.0
+TAG?=0.16.1
 REGISTRY?=quay.io/kubernetes-ingress-controller
 GOOS?=linux
 DOCKER?=docker
diff --git a/deploy/mandatory.yaml b/deploy/mandatory.yaml
index 9546d0251..11eaabac8 100644
--- a/deploy/mandatory.yaml
+++ b/deploy/mandatory.yaml
@@ -242,7 +242,7 @@ spec:
       serviceAccountName: nginx-ingress-serviceaccount
       containers:
         - name: nginx-ingress-controller
-          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.0
+          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.1
           args:
             - /nginx-ingress-controller
             - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
diff --git a/deploy/with-rbac.yaml b/deploy/with-rbac.yaml
index e9d27fa2b..0a89559f7 100644
--- a/deploy/with-rbac.yaml
+++ b/deploy/with-rbac.yaml
@@ -21,7 +21,7 @@ spec:
       serviceAccountName: nginx-ingress-serviceaccount
       containers:
         - name: nginx-ingress-controller
-          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.0
+          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.1
           args:
             - /nginx-ingress-controller
             - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
diff --git a/docs/deploy/upgrade.md b/docs/deploy/upgrade.md
index 842d1fa8a..d31b0832e 100644
--- a/docs/deploy/upgrade.md
+++ b/docs/deploy/upgrade.md
@@ -33,7 +33,7 @@ The easiest way to do this is e.g. (do note you may need to change the name para
 
 ```
 kubectl set image deployment/nginx-ingress-controller \
-  nginx-ingress-controller=nginx:quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.0
+  nginx-ingress-controller=nginx:quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.1
 ```
 
 For interactive editing, use `kubectl edit deployment nginx-ingress-controller`.
diff --git a/docs/examples/static-ip/nginx-ingress-controller.yaml b/docs/examples/static-ip/nginx-ingress-controller.yaml
index 2c2e16cc5..add5e3b2a 100644
--- a/docs/examples/static-ip/nginx-ingress-controller.yaml
+++ b/docs/examples/static-ip/nginx-ingress-controller.yaml
@@ -21,7 +21,7 @@ spec:
       # hostNetwork: true
       terminationGracePeriodSeconds: 60
       containers:
-      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.0
+      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.1
         name: nginx-ingress-controller
         readinessProbe:
           httpGet: