Merge pull request #6630 from wind0r/coredns_lameduck

port Add ready plugin to CoreDNS and use health.lameduck for a safer shutdown to 1.25, 1.26 and 1.27
eksctl-io · May 30, 2023 · 9e7232b · 9e7232b
2 parents 931cb8d + a4395bf
commit 9e7232b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/pkg/addons/default/assets/coredns-1.25.json b/pkg/addons/default/assets/coredns-1.25.json
@@ -61,7 +61,7 @@
     {
       "apiVersion": "v1",
       "data": {
-        "Corefile": ".:53 {\n    errors\n    health\n    kubernetes cluster.local in-addr.arpa ip6.arpa {\n      pods insecure\n      fallthrough in-addr.arpa ip6.arpa\n    }\n    prometheus :9153\n    forward . /etc/resolv.conf\n    cache 30\n    loop\n    reload\n    loadbalance\n}\n"
+        "Corefile": ".:53 {\n    errors\n    health {\n      lameduck 5s\n    }\n    ready\n    kubernetes cluster.local in-addr.arpa ip6.arpa {\n      pods insecure\n      fallthrough in-addr.arpa ip6.arpa\n    }\n    prometheus :9153\n    forward . /etc/resolv.conf\n    cache 30\n    loop\n    reload\n    loadbalance\n}\n"
       },
       "kind": "ConfigMap",
       "metadata": {
@@ -205,8 +205,8 @@
                 "readinessProbe": {
                   "failureThreshold": 3,
                   "httpGet": {
-                    "path": "/health",
-                    "port": 8080,
+                    "path": "/ready",
+                    "port": 8181,
                     "scheme": "HTTP"
                   },
                   "periodSeconds": 10,

diff --git a/pkg/addons/default/assets/coredns-1.26.json b/pkg/addons/default/assets/coredns-1.26.json
@@ -61,7 +61,7 @@
     {
       "apiVersion": "v1",
       "data": {
-        "Corefile": ".:53 {\n    errors\n    health\n    kubernetes cluster.local in-addr.arpa ip6.arpa {\n      pods insecure\n      fallthrough in-addr.arpa ip6.arpa\n    }\n    prometheus :9153\n    forward . /etc/resolv.conf\n    cache 30\n    loop\n    reload\n    loadbalance\n}\n"
+        "Corefile": ".:53 {\n    errors\n    health {\n      lameduck 5s\n    }\n    ready\n    kubernetes cluster.local in-addr.arpa ip6.arpa {\n      pods insecure\n      fallthrough in-addr.arpa ip6.arpa\n    }\n    prometheus :9153\n    forward . /etc/resolv.conf\n    cache 30\n    loop\n    reload\n    loadbalance\n}\n"
       },
       "kind": "ConfigMap",
       "metadata": {
@@ -175,8 +175,8 @@
                 "livenessProbe": {
                   "failureThreshold": 5,
                   "httpGet": {
-                    "path": "/health",
-                    "port": 8080,
+                    "path": "/ready",
+                    "port": 8181,
                     "scheme": "HTTP"
                   },
                   "initialDelaySeconds": 60,

diff --git a/pkg/addons/default/assets/coredns-1.27.json b/pkg/addons/default/assets/coredns-1.27.json
@@ -61,7 +61,7 @@
       {
         "apiVersion": "v1",
         "data": {
-          "Corefile": ".:53 {\n    errors\n    health\n    kubernetes cluster.local in-addr.arpa ip6.arpa {\n      pods insecure\n      fallthrough in-addr.arpa ip6.arpa\n    }\n    prometheus :9153\n    forward . /etc/resolv.conf\n    cache 30\n    loop\n    reload\n    loadbalance\n}\n"
+          "Corefile": ".:53 {\n    errors\n    health {\n      lameduck 5s\n    }\n    ready\n    kubernetes cluster.local in-addr.arpa ip6.arpa {\n      pods insecure\n      fallthrough in-addr.arpa ip6.arpa\n    }\n    prometheus :9153\n    forward . /etc/resolv.conf\n    cache 30\n    loop\n    reload\n    loadbalance\n}\n"
         },
         "kind": "ConfigMap",
         "metadata": {
@@ -205,8 +205,8 @@
                   "readinessProbe": {
                     "failureThreshold": 3,
                     "httpGet": {
-                      "path": "/health",
-                      "port": 8080,
+                      "path": "/ready",
+                      "port": 8181,
                       "scheme": "HTTP"
                     },
                     "periodSeconds": 10,

diff --git a/pkg/addons/default/testdata/sample-1.22.json b/pkg/addons/default/testdata/sample-1.22.json
@@ -225,7 +225,7 @@
     {
       "apiVersion": "v1",
       "data": {
-        "Corefile": ".:53 {\n    errors\n    health\n    kubernetes cluster.local in-addr.arpa ip6.arpa {\n      pods insecure\n      upstream\n      fallthrough in-addr.arpa ip6.arpa\n    }\n    prometheus :9153\n    forward . /etc/resolv.conf\n    cache 30\n    loop\n    reload\n    loadbalance\n}\n"
+        "Corefile": ".:53 {\n    errors\n    health {\n      lameduck 5s\n    }\n    ready\n    kubernetes cluster.local in-addr.arpa ip6.arpa {\n      pods insecure\n      upstream\n      fallthrough in-addr.arpa ip6.arpa\n    }\n    prometheus :9153\n    forward . /etc/resolv.conf\n    cache 30\n    loop\n    reload\n    loadbalance\n}\n"
       },
       "kind": "ConfigMap",
       "metadata": {
@@ -338,8 +338,8 @@
                 "livenessProbe": {
                   "failureThreshold": 5,
                   "httpGet": {
-                    "path": "/health",
-                    "port": 8080,
+                    "path": "/ready",
+                    "port": 8181,
                     "scheme": "HTTP"
                   },
                   "initialDelaySeconds": 60,

diff --git a/pkg/addons/default/testdata/sample-1.25.json b/pkg/addons/default/testdata/sample-1.25.json
@@ -247,7 +247,7 @@
     {
       "apiVersion": "v1",
       "data": {
-        "Corefile": ".:53 {\n    errors\n    health\n    kubernetes cluster.local in-addr.arpa ip6.arpa {\n      pods insecure\n      fallthrough in-addr.arpa ip6.arpa\n    }\n    prometheus :9153\n    forward . /etc/resolv.conf\n    cache 30\n    loop\n    reload\n    loadbalance\n}\n"
+        "Corefile": ".:53 {\n    errors\n    health {\n      lameduck 5s\n    }\n    ready\n    kubernetes cluster.local in-addr.arpa ip6.arpa {\n      pods insecure\n      fallthrough in-addr.arpa ip6.arpa\n    }\n    prometheus :9153\n    forward . /etc/resolv.conf\n    cache 30\n    loop\n    reload\n    loadbalance\n}\n"
       },
       "kind": "ConfigMap",
       "metadata": {
@@ -361,8 +361,8 @@
                 "livenessProbe": {
                   "failureThreshold": 5,
                   "httpGet": {
-                    "path": "/health",
-                    "port": 8080,
+                    "path": "/ready",
+                    "port": 8181,
                     "scheme": "HTTP"
                   },
                   "initialDelaySeconds": 60,