Merge pull request #9430 from johngmyers/automated-cherry-pick-of-#94…

…04-upstream-release-1.17 Automated cherry pick of #9404: Fix: dns-controller: 3999 port address already in use
kubernetes · Jun 24, 2020 · d70c1d4 · d70c1d4
2 parents ae20f44 + fcc4d46
commit d70c1d4
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 4 deletions.
diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
@@ -9,6 +9,8 @@ metadata:
     version: v1.17.0
 spec:
   replicas: 1
+  strategy:
+    type: Recreate
   selector:
     matchLabels:
       k8s-app: dns-controller

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
@@ -83,7 +83,7 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: f98b5d85929920a1ddc15b7bc71adfb70b9887ed
+    manifestHash: 51722b9a06f074dd4b045e5d8b4adc809f13fc6a
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io

diff --git a/...i/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml b/...i/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
@@ -12,6 +12,8 @@ spec:
   selector:
     matchLabels:
       k8s-app: dns-controller
+  strategy:
+    type: Recreate
   template:
     metadata:
       annotations:

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@@ -83,7 +83,7 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: f98b5d85929920a1ddc15b7bc71adfb70b9887ed
+    manifestHash: 51722b9a06f074dd4b045e5d8b4adc809f13fc6a
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io

diff --git a/...i/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml b/...i/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml
@@ -12,6 +12,8 @@ spec:
   selector:
     matchLabels:
       k8s-app: dns-controller
+  strategy:
+    type: Recreate
   template:
     metadata:
       annotations:

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
@@ -83,7 +83,7 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: f98b5d85929920a1ddc15b7bc71adfb70b9887ed
+    manifestHash: 51722b9a06f074dd4b045e5d8b4adc809f13fc6a
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.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
@@ -83,7 +83,7 @@ spec:
   - id: k8s-1.12
     kubernetesVersion: '>=1.12.0'
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: f98b5d85929920a1ddc15b7bc71adfb70b9887ed
+    manifestHash: 51722b9a06f074dd4b045e5d8b4adc809f13fc6a
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io