From 4ccb7443c4fbcf59db7e851f6cd3ea73e9a49954 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 30 Jun 2020 12:10:51 +0300 Subject: [PATCH 1/2] Update KubeDNS to v1.15.13 --- upup/models/bindata.go | 16 ++++++++-------- .../coredns.addons.k8s.io/k8s-1.12.yaml.template | 2 +- .../k8s-1.12.yaml.template | 6 +++--- .../kube-dns.addons.k8s.io/k8s-1.6.yaml.template | 8 ++++---- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/upup/models/bindata.go b/upup/models/bindata.go index 2e9d04da92b23..7e37f0020c2f1 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -1272,7 +1272,7 @@ spec: spec: containers: - name: autoscaler - image: k8s.gcr.io/cluster-proportional-autoscaler-{{Arch}}:1.4.0 + image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.8.1 resources: requests: cpu: "20m" @@ -2694,7 +2694,7 @@ spec: spec: containers: - name: autoscaler - image: k8s.gcr.io/cluster-proportional-autoscaler-{{Arch}}:1.4.0 + image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.8.1 resources: requests: cpu: "20m" @@ -2771,7 +2771,7 @@ spec: containers: - name: kubedns - image: k8s.gcr.io/k8s-dns-kube-dns-{{Arch}}:1.14.13 + image: k8s.gcr.io/k8s-dns-kube-dns:1.15.13 resources: # TODO: Set memory limits when we've profiled the container for large # clusters, then set request = limit to keep this container in @@ -2865,7 +2865,7 @@ spec: mountPath: /etc/k8s/dns/dnsmasq-nanny - name: sidecar - image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.13 + image: k8s.gcr.io/k8s-dns-sidecar:1.15.13 livenessProbe: httpGet: path: /metrics @@ -3047,7 +3047,7 @@ spec: spec: containers: - name: autoscaler - image: k8s.gcr.io/cluster-proportional-autoscaler-{{Arch}}:1.1.2-r2 + image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.8.1 resources: requests: cpu: "20m" @@ -3112,7 +3112,7 @@ spec: containers: - name: kubedns - image: k8s.gcr.io/k8s-dns-kube-dns-{{Arch}}:1.14.10 + image: k8s.gcr.io/k8s-dns-kube-dns:1.15.13 resources: # TODO: Set memory limits when we've profiled the container for large # clusters, then set request = limit to keep this container in @@ -3164,7 +3164,7 @@ spec: mountPath: /kube-dns-config - name: dnsmasq - image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-{{Arch}}:1.14.10 + image: k8s.gcr.io/k8s-dns-dnsmasq-nanny:1.15.13 livenessProbe: httpGet: path: /healthcheck/dnsmasq @@ -3206,7 +3206,7 @@ spec: mountPath: /etc/k8s/dns/dnsmasq-nanny - name: sidecar - image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.10 + image: k8s.gcr.io/k8s-dns-sidecar:1.15.13 livenessProbe: httpGet: path: /metrics 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..0fa2bbefde827 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 @@ -103,7 +103,7 @@ spec: spec: containers: - name: autoscaler - image: k8s.gcr.io/cluster-proportional-autoscaler-{{Arch}}:1.4.0 + image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.8.1 resources: requests: cpu: "20m" diff --git a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template index a1d9e917fcbb7..7e47e2ebc8f63 100644 --- a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template +++ b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template @@ -53,7 +53,7 @@ spec: spec: containers: - name: autoscaler - image: k8s.gcr.io/cluster-proportional-autoscaler-{{Arch}}:1.4.0 + image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.8.1 resources: requests: cpu: "20m" @@ -130,7 +130,7 @@ spec: containers: - name: kubedns - image: k8s.gcr.io/k8s-dns-kube-dns-{{Arch}}:1.14.13 + image: k8s.gcr.io/k8s-dns-kube-dns:1.15.13 resources: # TODO: Set memory limits when we've profiled the container for large # clusters, then set request = limit to keep this container in @@ -224,7 +224,7 @@ spec: mountPath: /etc/k8s/dns/dnsmasq-nanny - name: sidecar - image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.13 + image: k8s.gcr.io/k8s-dns-sidecar:1.15.13 livenessProbe: httpGet: path: /metrics diff --git a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template index 97909fd2ec2ec..f54ef76fed748 100644 --- a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template +++ b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template @@ -52,7 +52,7 @@ spec: spec: containers: - name: autoscaler - image: k8s.gcr.io/cluster-proportional-autoscaler-{{Arch}}:1.1.2-r2 + image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.8.1 resources: requests: cpu: "20m" @@ -117,7 +117,7 @@ spec: containers: - name: kubedns - image: k8s.gcr.io/k8s-dns-kube-dns-{{Arch}}:1.14.10 + image: k8s.gcr.io/k8s-dns-kube-dns:1.15.13 resources: # TODO: Set memory limits when we've profiled the container for large # clusters, then set request = limit to keep this container in @@ -169,7 +169,7 @@ spec: mountPath: /kube-dns-config - name: dnsmasq - image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-{{Arch}}:1.14.10 + image: k8s.gcr.io/k8s-dns-dnsmasq-nanny:1.15.13 livenessProbe: httpGet: path: /healthcheck/dnsmasq @@ -211,7 +211,7 @@ spec: mountPath: /etc/k8s/dns/dnsmasq-nanny - name: sidecar - image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.10 + image: k8s.gcr.io/k8s-dns-sidecar:1.15.13 livenessProbe: httpGet: path: /metrics diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 1a70a9a04f3c3..138de322e8cfa 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -240,7 +240,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { { key := "kube-dns.addons.k8s.io" - version := "1.14.13-kops.2" + version := "1.15.13-kops.1" { location := key + "/k8s-1.6.yaml" @@ -294,7 +294,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons { { key := "coredns.addons.k8s.io" - version := "1.6.7-kops.1" + version := "1.6.7-kops.2" { location := key + "/k8s-1.12.yaml" From ecbb512db36abdc8c394ee7a1e2f2194398130e5 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Tue, 30 Jun 2020 12:25:52 +0300 Subject: [PATCH 2/2] Update tests output --- .../tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml | 8 ++++---- .../tests/bootstrapchannelbuilder/cilium/manifest.yaml | 8 ++++---- .../tests/bootstrapchannelbuilder/simple/manifest.yaml | 8 ++++---- .../tests/bootstrapchannelbuilder/weave/manifest.yaml | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index 22167e0ae4e7e..4f9f5d717ab3d 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -21,19 +21,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml - manifestHash: 555f952a8b955ce7a5dd0bcd06a5be9e72bd2895 + manifestHash: ec19148bdfd08c59c75a4806e53672a00f0209c6 name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.15.13-kops.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 15ade04df128488a534141bd5b8593d078f4953f + manifestHash: 42ba17717415e9c2e3c9a2142654c2a48a915318 name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.15.13-kops.1 - id: k8s-1.8 manifest: rbac.addons.k8s.io/k8s-1.8.yaml manifestHash: 5d53ce7b920cd1e8d65d2306d80a041420711914 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index 7bf386976eadc..8000c88b4f856 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -21,19 +21,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml - manifestHash: 555f952a8b955ce7a5dd0bcd06a5be9e72bd2895 + manifestHash: ec19148bdfd08c59c75a4806e53672a00f0209c6 name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.15.13-kops.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 15ade04df128488a534141bd5b8593d078f4953f + manifestHash: 42ba17717415e9c2e3c9a2142654c2a48a915318 name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.15.13-kops.1 - id: k8s-1.8 manifest: rbac.addons.k8s.io/k8s-1.8.yaml manifestHash: 5d53ce7b920cd1e8d65d2306d80a041420711914 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index 6a6e6451e2372..823161ab6d727 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -21,19 +21,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml - manifestHash: 555f952a8b955ce7a5dd0bcd06a5be9e72bd2895 + manifestHash: ec19148bdfd08c59c75a4806e53672a00f0209c6 name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.15.13-kops.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 15ade04df128488a534141bd5b8593d078f4953f + manifestHash: 42ba17717415e9c2e3c9a2142654c2a48a915318 name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.15.13-kops.1 - id: k8s-1.8 manifest: rbac.addons.k8s.io/k8s-1.8.yaml manifestHash: 5d53ce7b920cd1e8d65d2306d80a041420711914 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index fbef49c02269a..71d190959dbf2 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -21,19 +21,19 @@ spec: - id: k8s-1.6 kubernetesVersion: <1.12.0 manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml - manifestHash: 555f952a8b955ce7a5dd0bcd06a5be9e72bd2895 + manifestHash: ec19148bdfd08c59c75a4806e53672a00f0209c6 name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.15.13-kops.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 15ade04df128488a534141bd5b8593d078f4953f + manifestHash: 42ba17717415e9c2e3c9a2142654c2a48a915318 name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.15.13-kops.1 - id: k8s-1.8 manifest: rbac.addons.k8s.io/k8s-1.8.yaml manifestHash: 5d53ce7b920cd1e8d65d2306d80a041420711914