From 8fc772d94700addb15974876b83ff3d1e8dc7d5f Mon Sep 17 00:00:00 2001
From: Michael Pleshakov <michael@nginx.com>
Date: Fri, 12 Jan 2018 19:04:08 +0000
Subject: [PATCH] Release 1.1.1

---
 CHANGELOG.md                                         | 6 ++++++
 examples/complete-example/nginx-ingress-rc.yaml      | 2 +-
 examples/complete-example/nginx-plus-ingress-rc.yaml | 2 +-
 examples/daemon-set/nginx-ingress.yaml               | 2 +-
 examples/daemon-set/nginx-plus-ingress.yaml          | 2 +-
 examples/rbac/nginx-ingress-rc.yaml                  | 2 +-
 examples/rbac/nginx-plus-ingress-rc.yaml             | 2 +-
 nginx-controller/Makefile                            | 2 +-
 8 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e7b44ee1e..d7d47cd069 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+### 1.1.1
+
+* [228](https://github.com/nginxinc/kubernetes-ingress/pull/228): Add worker-rlimit-nofile configmap key. Thanks to [Aleksandr Lysenko](https://github.com/Sarga).
+* [223](https://github.com/nginxinc/kubernetes-ingress/pull/223): Add worker-connections configmap key. Thanks to [Aleksandr Lysenko](https://github.com/Sarga).
+* Update NGINX version to 1.13.8.
+
 ### 1.1.0
 
 * [221](https://github.com/nginxinc/kubernetes-ingress/pull/221): Add git commit info to the IC log.
diff --git a/examples/complete-example/nginx-ingress-rc.yaml b/examples/complete-example/nginx-ingress-rc.yaml
index 979c28195c..7c3a4896a7 100644
--- a/examples/complete-example/nginx-ingress-rc.yaml
+++ b/examples/complete-example/nginx-ingress-rc.yaml
@@ -14,7 +14,7 @@ spec:
         app: nginx-ingress
     spec:
       containers:
-      - image: nginxdemos/nginx-ingress:1.1.0
+      - image: nginxdemos/nginx-ingress:1.1.1
         imagePullPolicy: Always
         name: nginx-ingress
         ports:
diff --git a/examples/complete-example/nginx-plus-ingress-rc.yaml b/examples/complete-example/nginx-plus-ingress-rc.yaml
index 4e7142d34c..e0ad798670 100644
--- a/examples/complete-example/nginx-plus-ingress-rc.yaml
+++ b/examples/complete-example/nginx-plus-ingress-rc.yaml
@@ -14,7 +14,7 @@ spec:
         app: nginx-plus-ingress
     spec:
       containers:
-      - image: nginx-plus-ingress:1.1.0
+      - image: nginx-plus-ingress:1.1.1
         imagePullPolicy: Always
         name: nginx-plus-ingress
         ports:
diff --git a/examples/daemon-set/nginx-ingress.yaml b/examples/daemon-set/nginx-ingress.yaml
index 8504cfe0e3..084d06a24e 100644
--- a/examples/daemon-set/nginx-ingress.yaml
+++ b/examples/daemon-set/nginx-ingress.yaml
@@ -11,7 +11,7 @@ spec:
       # nodeSelector:
       #   role: nginx-ingress
       containers:
-      - image: nginxdemos/nginx-ingress:1.1.0
+      - image: nginxdemos/nginx-ingress:1.1.1
         imagePullPolicy: Always
         name: nginx-ingress
         ports:
diff --git a/examples/daemon-set/nginx-plus-ingress.yaml b/examples/daemon-set/nginx-plus-ingress.yaml
index b7d372ca61..51401e2e6c 100644
--- a/examples/daemon-set/nginx-plus-ingress.yaml
+++ b/examples/daemon-set/nginx-plus-ingress.yaml
@@ -11,7 +11,7 @@ spec:
       # nodeSelector:
       #   role: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:1.1.0
+      - image: nginx-plus-ingress:1.1.1
         imagePullPolicy: Always
         name: nginx-plus-ingress
         ports:
diff --git a/examples/rbac/nginx-ingress-rc.yaml b/examples/rbac/nginx-ingress-rc.yaml
index 7b982e17a6..ca9b4d8230 100644
--- a/examples/rbac/nginx-ingress-rc.yaml
+++ b/examples/rbac/nginx-ingress-rc.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginxdemos/nginx-ingress:1.1.0
+      - image: nginxdemos/nginx-ingress:1.1.1
         imagePullPolicy: Always
         name: nginx-ingress
         ports:
diff --git a/examples/rbac/nginx-plus-ingress-rc.yaml b/examples/rbac/nginx-plus-ingress-rc.yaml
index 2f2bc1424e..7a051edf7d 100644
--- a/examples/rbac/nginx-plus-ingress-rc.yaml
+++ b/examples/rbac/nginx-plus-ingress-rc.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:1.1.0
+      - image: nginx-plus-ingress:1.1.1
         imagePullPolicy: Always
         name: nginx-plus-ingress
         ports:
diff --git a/nginx-controller/Makefile b/nginx-controller/Makefile
index 4dcbe94836..53b4c423fc 100644
--- a/nginx-controller/Makefile
+++ b/nginx-controller/Makefile
@@ -1,6 +1,6 @@
 all: push
 
-VERSION = 1.1.0
+VERSION = 1.1.1
 TAG = $(VERSION)
 PREFIX = nginxdemos/nginx-ingress