From 1594f39ff855867baf2c4943abdf71d464d8c790 Mon Sep 17 00:00:00 2001 From: GuyTempleton Date: Thu, 6 Feb 2020 23:31:22 +0000 Subject: [PATCH] Revert "Merge pull request #8459 from gjtempleton/automated-cherry-pick-of-#8452-upstream-release-1.17" This reverts commit 97439050ec036f25259a9e2ea75493ca4eb45c8d, reversing changes made to bf41d33b38c426cb596e807903c1f3b982cc0e6a. --- .../addons/coredns.addons.k8s.io/k8s-1.12.yaml.template | 2 +- .../addons/coredns.addons.k8s.io/k8s-1.6.yaml.template | 2 +- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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 43bd49a89a539..cb8f8713f11f8 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 @@ -168,7 +168,7 @@ spec: beta.kubernetes.io/os: linux containers: - name: coredns - image: {{ if KubeDNS.CoreDNSImage }}{{ KubeDNS.CoreDNSImage }}{{ else }}k8s.gcr.io/coredns:1.6.7{{ end }} + image: {{ if KubeDNS.CoreDNSImage }}{{ KubeDNS.CoreDNSImage }}{{ else }}k8s.gcr.io/coredns:1.6.6{{ end }} imagePullPolicy: IfNotPresent resources: limits: diff --git a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.6.yaml.template index 11499edd0a91d..c10d748d5be75 100644 --- a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.6.yaml.template +++ b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.6.yaml.template @@ -113,7 +113,7 @@ spec: beta.kubernetes.io/os: linux containers: - name: coredns - image: {{ if KubeDNS.CoreDNSImage }}{{ KubeDNS.CoreDNSImage }}{{ else }}k8s.gcr.io/coredns:1.6.7{{ end }} + image: {{ if KubeDNS.CoreDNSImage }}{{ KubeDNS.CoreDNSImage }}{{ else }}k8s.gcr.io/coredns:1.6.6{{ end }} imagePullPolicy: IfNotPresent resources: limits: diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 2a278556a7d87..7884614237717 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -285,7 +285,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { if kubeDNS.Provider == "CoreDNS" { { key := "coredns.addons.k8s.io" - version := "1.6.7-kops.1" + version := "1.6.6-kops.1" { location := key + "/k8s-1.6.yaml" @@ -304,7 +304,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { { key := "coredns.addons.k8s.io" - version := "1.6.7-kops.1" + version := "1.6.6-kops.2" { location := key + "/k8s-1.12.yaml"