From 7b647431b199849be09cfad1077bc332ba0e92d9 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Tue, 20 Feb 2018 21:09:16 -0500 Subject: [PATCH] Update kube-dns to 1.14.8 --- .../addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template | 6 +++--- .../addons/kube-dns.addons.k8s.io/pre-k8s-1.6.yaml.template | 2 +- upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 2 +- .../bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml | 4 ++-- .../tests/bootstrapchannelbuilder/simple/manifest.yaml | 4 ++-- .../tests/bootstrapchannelbuilder/weave/manifest.yaml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) 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 238e6d7cbd..f44631c98e 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 @@ -96,7 +96,7 @@ spec: containers: - name: kubedns - image: k8s.gcr.io/k8s-dns-kube-dns-{{Arch}}:1.14.5 + image: k8s.gcr.io/k8s-dns-kube-dns-{{Arch}}:1.14.8 resources: # TODO: Set memory limits when we've profiled the container for large # clusters, then set request = limit to keep this container in @@ -148,7 +148,7 @@ spec: mountPath: /kube-dns-config - name: dnsmasq - image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-{{Arch}}:1.14.5 + image: k8s.gcr.io/k8s-dns-dnsmasq-nanny-{{Arch}}:1.14.8 livenessProbe: httpGet: path: /healthcheck/dnsmasq @@ -187,7 +187,7 @@ spec: mountPath: /etc/k8s/dns/dnsmasq-nanny - name: sidecar - image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5 + image: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.8 livenessProbe: httpGet: path: /metrics diff --git a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/pre-k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/pre-k8s-1.6.yaml.template index 208b386071..eb9fe16aa3 100644 --- a/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/pre-k8s-1.6.yaml.template +++ b/upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/pre-k8s-1.6.yaml.template @@ -131,7 +131,7 @@ spec: name: metrics protocol: TCP - name: dnsmasq - image: k8s.gcr.io/k8s-dns-dnsmasq-{{Arch}}:1.14.5 + image: k8s.gcr.io/k8s-dns-dnsmasq-{{Arch}}:1.14.8 livenessProbe: httpGet: path: /healthz-dnsmasq diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 238a62d6fd..d61a66b820 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -112,7 +112,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri { key := "kube-dns.addons.k8s.io" - version := "1.14.5" + version := "1.14.8" { location := key + "/pre-k8s-1.6.yaml" diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml index 4952544a94..5cfa51f3e3 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml @@ -15,14 +15,14 @@ spec: name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.5 + version: 1.14.8 - id: k8s-1.6 kubernetesVersion: '>=1.6.0' manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.5 + version: 1.14.8 - id: k8s-1.8 kubernetesVersion: '>=1.8.0' manifest: rbac.addons.k8s.io/k8s-1.8.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index 50beec1beb..d2addc151b 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -15,14 +15,14 @@ spec: name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.5 + version: 1.14.8 - id: k8s-1.6 kubernetesVersion: '>=1.6.0' manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.5 + version: 1.14.8 - id: k8s-1.8 kubernetesVersion: '>=1.8.0' manifest: rbac.addons.k8s.io/k8s-1.8.yaml diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index bc33bcd2a7..6d60b019ed 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -15,14 +15,14 @@ spec: name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.5 + version: 1.14.8 - id: k8s-1.6 kubernetesVersion: '>=1.6.0' manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.5 + version: 1.14.8 - id: k8s-1.8 kubernetesVersion: '>=1.8.0' manifest: rbac.addons.k8s.io/k8s-1.8.yaml