From 2de5a893aa15f14102d714e918b0045b960ad1a5 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Sun, 29 Sep 2019 18:26:23 -0300
Subject: [PATCH] Release 0.26.1 (#4618)

---
 Changelog.md                            | 15 ++++++++++++---
 Makefile                                |  2 +-
 deploy/cloud-generic/deployment.yaml    |  2 +-
 deploy/cloud-generic/kustomization.yaml |  2 +-
 deploy/static/mandatory.yaml            |  2 +-
 deploy/static/with-rbac.yaml            |  2 +-
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a8e211786..87fb21452 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,14 @@
 # Changelog
 
+### 0.26.1
+
+**Image:** `quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1`
+
+_Changes:_
+
+- [X] [#4617](https://github.com/kubernetes/ingress-nginx/pull/4617) Fix ports collision when hostNetwork=true
+- [X] [#4619](https://github.com/kubernetes/ingress-nginx/pull/4619) Fix issue #4244
+
 ### 0.26.0
 
 **Image:** `quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.0`
@@ -60,16 +69,16 @@ _Non-functional improvements:_
 
 - [Removal of internal NGINX unix sockets](https://github.com/kubernetes/ingress-nginx/pull/4531)
 - Automation of NGINX image using [terraform scripts](https://github.com/kubernetes/ingress-nginx/pull/4484)
-- Removal of Go profiling on port `:10254` to use `localhost:10255`
+- Removal of Go profiling on port `:10254` to use `localhost:10245`
 
   To profile the ingress controller Go binary, use:
 
   ```console
   INGRESS_PODS=($(kubectl get pods -n ingress-nginx -l app.kubernetes.io/name=ingress-nginx -o 'jsonpath={..metadata.name}'))
-  kubectl port-forward -n ingress-nginx pod/${INGRESS_PODS[0]} 10255
+  kubectl port-forward -n ingress-nginx pod/${INGRESS_PODS[0]} 10245
   ```
 
-Using the URL http://localhost:10255/debug/pprof/ to reach the profiler.
+Using the URL http://localhost:10245/debug/pprof/ to reach the profiler.
 
 _Changes:_
 
diff --git a/Makefile b/Makefile
index bdcaeb370..f8f3c5e57 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 all: all-container
 
 # Use the 0.0 tag for testing, it shouldn't clobber any release builds
-TAG ?= 0.26.0
+TAG ?= 0.26.1
 REGISTRY ?= quay.io/kubernetes-ingress-controller
 DOCKER ?= docker
 SED_I ?= sed -i
diff --git a/deploy/cloud-generic/deployment.yaml b/deploy/cloud-generic/deployment.yaml
index 24b69eded..ec16ea316 100644
--- a/deploy/cloud-generic/deployment.yaml
+++ b/deploy/cloud-generic/deployment.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: nginx-ingress-serviceaccount
       containers:
         - name: nginx-ingress-controller
-          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.0
+          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1
           args:
             - /nginx-ingress-controller
             - --configmap=$(POD_NAMESPACE)/$(NGINX_CONFIGMAP_NAME)
diff --git a/deploy/cloud-generic/kustomization.yaml b/deploy/cloud-generic/kustomization.yaml
index 12e77299c..157e4bcf0 100644
--- a/deploy/cloud-generic/kustomization.yaml
+++ b/deploy/cloud-generic/kustomization.yaml
@@ -12,7 +12,7 @@ resources:
 - service.yaml
 images:
 - name: quay.io/kubernetes-ingress-controller/nginx-ingress-controller
-  newTag: 0.26.0
+  newTag: 0.26.1
 vars:
 - fieldref:
     fieldPath: metadata.name
diff --git a/deploy/static/mandatory.yaml b/deploy/static/mandatory.yaml
index 8c08edad7..0fe8a36ff 100644
--- a/deploy/static/mandatory.yaml
+++ b/deploy/static/mandatory.yaml
@@ -215,7 +215,7 @@ spec:
       serviceAccountName: nginx-ingress-serviceaccount
       containers:
         - name: nginx-ingress-controller
-          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.0
+          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1
           args:
             - /nginx-ingress-controller
             - --configmap=$(POD_NAMESPACE)/nginx-configuration
diff --git a/deploy/static/with-rbac.yaml b/deploy/static/with-rbac.yaml
index eace0fc3e..779f8c245 100644
--- a/deploy/static/with-rbac.yaml
+++ b/deploy/static/with-rbac.yaml
@@ -26,7 +26,7 @@ spec:
       serviceAccountName: nginx-ingress-serviceaccount
       containers:
         - name: nginx-ingress-controller
-          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.0
+          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1
           args:
             - /nginx-ingress-controller
             - --configmap=$(POD_NAMESPACE)/nginx-configuration