From 38a8c35ba0040f81b347a75abf36d2363606b23b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20W=C3=BCrbach?= <johannes.wuerbach@googlemail.com>
Date: Tue, 19 Jan 2021 21:53:29 +0100
Subject: [PATCH] Increase CoreDNS default ttl

---
 upup/models/bindata.go                                          | 1 +
 .../addons/coredns.addons.k8s.io/k8s-1.12.yaml.template         | 1 +
 .../bootstrapchannelbuilder/awscloudcontroller/manifest.yaml    | 2 +-
 .../bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml   | 2 +-
 .../cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml  | 2 +-
 .../cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml   | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/upup/models/bindata.go b/upup/models/bindata.go
index 13cd342f27..438f269947 100644
--- a/upup/models/bindata.go
+++ b/upup/models/bindata.go
@@ -28186,6 +28186,7 @@ data:
         kubernetes {{ KubeDNS.Domain }}. in-addr.arpa ip6.arpa {
           pods insecure
           fallthrough in-addr.arpa ip6.arpa
+          ttl 30
         }
         prometheus :9153
         forward . /etc/resolv.conf {
diff --git a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template
index c4d8f5b665..32e63807ee 100644
--- a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template
+++ b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template
@@ -70,6 +70,7 @@ data:
         kubernetes {{ KubeDNS.Domain }}. in-addr.arpa ip6.arpa {
           pods insecure
           fallthrough in-addr.arpa ip6.arpa
+          ttl 30
         }
         prometheus :9153
         forward . /etc/resolv.conf {
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
index 0f153c03bc..1c9b7ff955 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
@@ -20,7 +20,7 @@ spec:
     version: 1.4.0
   - id: k8s-1.12
     manifest: coredns.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 0af83c370d13df45c6a2db67fa8f28e41502b6e1
+    manifestHash: c39ee62b44bc391d426293c951bfcdbbd28950c9
     name: coredns.addons.k8s.io
     selector:
       k8s-addon: coredns.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml
index c8a42fb9da..35e2f26f41 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml
@@ -20,7 +20,7 @@ spec:
     version: 1.4.0
   - id: k8s-1.12
     manifest: coredns.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 0af83c370d13df45c6a2db67fa8f28e41502b6e1
+    manifestHash: c39ee62b44bc391d426293c951bfcdbbd28950c9
     name: coredns.addons.k8s.io
     selector:
       k8s-addon: coredns.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
index 7e48710d15..5db48b2279 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
@@ -20,7 +20,7 @@ spec:
     version: 1.4.0
   - id: k8s-1.12
     manifest: coredns.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 0af83c370d13df45c6a2db67fa8f28e41502b6e1
+    manifestHash: c39ee62b44bc391d426293c951bfcdbbd28950c9
     name: coredns.addons.k8s.io
     selector:
       k8s-addon: coredns.addons.k8s.io
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
index e46e09a04d..3a21ebdba8 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
@@ -20,7 +20,7 @@ spec:
     version: 1.4.0
   - id: k8s-1.12
     manifest: coredns.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 0af83c370d13df45c6a2db67fa8f28e41502b6e1
+    manifestHash: c39ee62b44bc391d426293c951bfcdbbd28950c9
     name: coredns.addons.k8s.io
     selector:
       k8s-addon: coredns.addons.k8s.io