Improve shutdown logic: Wait until no requests are made

build/build.sh

@@ -57,13 +57,3 @@ ${GO_BUILD_CMD} \
   -X ${PKG}/version.REPO=${REPO_INFO}" \
   -buildvcs=false \
   -o "${TARGETS_DIR}/dbg" "${PKG}/cmd/dbg"
-
-echo "Building ${PKG}/cmd/waitshutdown"
-
-${GO_BUILD_CMD} \
-  -trimpath -ldflags="-buildid= -w -s \
-  -X ${PKG}/version.RELEASE=${TAG} \
-  -X ${PKG}/version.COMMIT=${COMMIT_SHA} \
-  -X ${PKG}/version.REPO=${REPO_INFO}" \
-  -buildvcs=false \
-  -o "${TARGETS_DIR}/wait-shutdown" "${PKG}/cmd/waitshutdown"

charts/ingress-nginx/README.md

@@ -372,7 +372,7 @@ metadata:
 | controller.keda.triggers | list | `[]` |  |
 | controller.kind | string | `"Deployment"` | Use a `DaemonSet` or `Deployment` |
 | controller.labels | object | `{}` | Labels to be added to the controller Deployment or DaemonSet and other resources that do not have option to specify labels # |
-| controller.lifecycle | object | `{"preStop":{"exec":{"command":["/wait-shutdown"]}}}` | Improve connection draining when ingress controller pod is deleted using a lifecycle hook: With this new hook, we increased the default terminationGracePeriodSeconds from 30 seconds to 300, allowing the draining of connections up to five minutes. If the active connections end before that, the pod will terminate gracefully at that time. To effectively take advantage of this feature, the Configmap feature worker-shutdown-timeout new value is 240s instead of 10s. # |
+| controller.lifecycle | object | `{}` |  |
 | controller.livenessProbe.failureThreshold | int | `5` |  |
 | controller.livenessProbe.httpGet.path | string | `"/healthz"` |  |
 | controller.livenessProbe.httpGet.port | int | `10254` |  |

charts/ingress-nginx/values.yaml

@@ -945,18 +945,7 @@ controller:
       #   annotations:
       #     description: Too many 4XXs
       #     summary: More than 5% of all requests returned 4XX, this requires your attention
-  # -- Improve connection draining when ingress controller pod is deleted using a lifecycle hook:
-  # With this new hook, we increased the default terminationGracePeriodSeconds from 30 seconds
-  # to 300, allowing the draining of connections up to five minutes.
-  # If the active connections end before that, the pod will terminate gracefully at that time.
-  # To effectively take advantage of this feature, the Configmap feature
-  # worker-shutdown-timeout new value is 240s instead of 10s.
-  ##
-  lifecycle:
-    preStop:
-      exec:
-        command:
-          - /wait-shutdown
+  lifecycle: {}
   priorityClassName: ""
 # -- Rollback limit
 ##

deploy/static/provider/aws/deploy.yaml

@@ -424,6 +424,7 @@ spec:
         app.kubernetes.io/part-of: ingress-nginx
         app.kubernetes.io/version: 1.12.0-beta.0
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - /nginx-ingress-controller
@@ -448,11 +449,6 @@ spec:
           value: /usr/local/lib/libmimalloc.so
         image: registry.k8s.io/ingress-nginx/controller:v1.12.0-beta.0@sha256:9724476b928967173d501040631b23ba07f47073999e80e34b120e8db5f234d5
         imagePullPolicy: IfNotPresent
-        lifecycle:
-          preStop:
-            exec:
-              command:
-              - /wait-shutdown
         livenessProbe:
           failureThreshold: 5
           httpGet:
@@ -537,6 +533,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-create
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - create
@@ -589,6 +586,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-patch
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - patch

deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml

@@ -433,6 +433,7 @@ spec:
         app.kubernetes.io/part-of: ingress-nginx
         app.kubernetes.io/version: 1.12.0-beta.0
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - /nginx-ingress-controller
@@ -457,11 +458,6 @@ spec:
           value: /usr/local/lib/libmimalloc.so
         image: registry.k8s.io/ingress-nginx/controller:v1.12.0-beta.0@sha256:9724476b928967173d501040631b23ba07f47073999e80e34b120e8db5f234d5
         imagePullPolicy: IfNotPresent
-        lifecycle:
-          preStop:
-            exec:
-              command:
-              - /wait-shutdown
         livenessProbe:
           failureThreshold: 5
           httpGet:
@@ -549,6 +545,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-create
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - create
@@ -601,6 +598,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-patch
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - patch

deploy/static/provider/baremetal/deploy.yaml

@@ -419,6 +419,7 @@ spec:
         app.kubernetes.io/part-of: ingress-nginx
         app.kubernetes.io/version: 1.12.0-beta.0
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - /nginx-ingress-controller
@@ -442,11 +443,6 @@ spec:
           value: /usr/local/lib/libmimalloc.so
         image: registry.k8s.io/ingress-nginx/controller:v1.12.0-beta.0@sha256:9724476b928967173d501040631b23ba07f47073999e80e34b120e8db5f234d5
         imagePullPolicy: IfNotPresent
-        lifecycle:
-          preStop:
-            exec:
-              command:
-              - /wait-shutdown
         livenessProbe:
           failureThreshold: 5
           httpGet:
@@ -531,6 +527,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-create
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - create
@@ -583,6 +580,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-patch
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - patch

deploy/static/provider/cloud/deploy.yaml

@@ -420,6 +420,7 @@ spec:
         app.kubernetes.io/part-of: ingress-nginx
         app.kubernetes.io/version: 1.12.0-beta.0
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - /nginx-ingress-controller
@@ -444,11 +445,6 @@ spec:
           value: /usr/local/lib/libmimalloc.so
         image: registry.k8s.io/ingress-nginx/controller:v1.12.0-beta.0@sha256:9724476b928967173d501040631b23ba07f47073999e80e34b120e8db5f234d5
         imagePullPolicy: IfNotPresent
-        lifecycle:
-          preStop:
-            exec:
-              command:
-              - /wait-shutdown
         livenessProbe:
           failureThreshold: 5
           httpGet:
@@ -533,6 +529,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-create
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - create
@@ -585,6 +582,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-patch
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - patch

deploy/static/provider/do/deploy.yaml

@@ -423,6 +423,7 @@ spec:
         app.kubernetes.io/part-of: ingress-nginx
         app.kubernetes.io/version: 1.12.0-beta.0
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - /nginx-ingress-controller
@@ -447,11 +448,6 @@ spec:
           value: /usr/local/lib/libmimalloc.so
         image: registry.k8s.io/ingress-nginx/controller:v1.12.0-beta.0@sha256:9724476b928967173d501040631b23ba07f47073999e80e34b120e8db5f234d5
         imagePullPolicy: IfNotPresent
-        lifecycle:
-          preStop:
-            exec:
-              command:
-              - /wait-shutdown
         livenessProbe:
           failureThreshold: 5
           httpGet:
@@ -536,6 +532,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-create
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - create
@@ -588,6 +585,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-patch
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - patch

deploy/static/provider/exoscale/deploy.yaml

@@ -425,6 +425,7 @@ spec:
         app.kubernetes.io/part-of: ingress-nginx
         app.kubernetes.io/version: 1.12.0-beta.0
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - /nginx-ingress-controller
@@ -449,11 +450,6 @@ spec:
           value: /usr/local/lib/libmimalloc.so
         image: registry.k8s.io/ingress-nginx/controller:v1.12.0-beta.0@sha256:9724476b928967173d501040631b23ba07f47073999e80e34b120e8db5f234d5
         imagePullPolicy: IfNotPresent
-        lifecycle:
-          preStop:
-            exec:
-              command:
-              - /wait-shutdown
         livenessProbe:
           failureThreshold: 5
           httpGet:
@@ -542,6 +538,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-create
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - create
@@ -594,6 +591,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-patch
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - patch

deploy/static/provider/kind/deploy.yaml

@@ -362,7 +362,7 @@ spec:
     app.kubernetes.io/component: controller
     app.kubernetes.io/instance: ingress-nginx
     app.kubernetes.io/name: ingress-nginx
-  type: NodePort
+  type: LoadBalancer
 ---
 apiVersion: v1
 kind: Service
@@ -419,6 +419,7 @@ spec:
         app.kubernetes.io/part-of: ingress-nginx
         app.kubernetes.io/version: 1.12.0-beta.0
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - /nginx-ingress-controller
@@ -444,11 +445,6 @@ spec:
           value: /usr/local/lib/libmimalloc.so
         image: registry.k8s.io/ingress-nginx/controller:v1.12.0-beta.0@sha256:9724476b928967173d501040631b23ba07f47073999e80e34b120e8db5f234d5
         imagePullPolicy: IfNotPresent
-        lifecycle:
-          preStop:
-            exec:
-              command:
-              - /wait-shutdown
         livenessProbe:
           failureThreshold: 5
           httpGet:
@@ -505,7 +501,6 @@ spec:
           readOnly: true
       dnsPolicy: ClusterFirst
       nodeSelector:
-        ingress-ready: "true"
         kubernetes.io/os: linux
       serviceAccountName: ingress-nginx
       terminationGracePeriodSeconds: 0
@@ -543,6 +538,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-create
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - create
@@ -595,6 +591,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-patch
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - patch

deploy/static/provider/oracle/deploy.yaml

@@ -424,6 +424,7 @@ spec:
         app.kubernetes.io/part-of: ingress-nginx
         app.kubernetes.io/version: 1.12.0-beta.0
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - /nginx-ingress-controller
@@ -448,11 +449,6 @@ spec:
           value: /usr/local/lib/libmimalloc.so
         image: registry.k8s.io/ingress-nginx/controller:v1.12.0-beta.0@sha256:9724476b928967173d501040631b23ba07f47073999e80e34b120e8db5f234d5
         imagePullPolicy: IfNotPresent
-        lifecycle:
-          preStop:
-            exec:
-              command:
-              - /wait-shutdown
         livenessProbe:
           failureThreshold: 5
           httpGet:
@@ -537,6 +533,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-create
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - create
@@ -589,6 +586,7 @@ spec:
         app.kubernetes.io/version: 1.12.0-beta.0
       name: ingress-nginx-admission-patch
     spec:
+      automountServiceAccountToken: true
       containers:
       - args:
         - patch