From 18b1e22e481f0d3d280441ab508ac3fc80f15fb0 Mon Sep 17 00:00:00 2001 From: Ewocker Date: Tue, 18 Feb 2020 16:32:39 -0800 Subject: [PATCH] update kubedns service to use port name for targetPort --- .../addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template | 2 ++ upup/pkg/fi/cloudup/bootstrapchannelbuilder.go | 2 +- .../tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml | 6 +++--- .../tests/bootstrapchannelbuilder/cilium/manifest.yaml | 6 +++--- .../tests/bootstrapchannelbuilder/simple/manifest.yaml | 6 +++--- .../tests/bootstrapchannelbuilder/weave/manifest.yaml | 6 +++--- 6 files changed, 15 insertions(+), 13 deletions(-) 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..b65bdc3d9e406 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 @@ -268,9 +268,11 @@ spec: - name: dns port: 53 protocol: UDP + targetPort: dns - name: dns-tcp port: 53 protocol: TCP + targetPort: dns-tcp --- diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index d889df3d16d8d..b90616d678a64 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.14.13-kops.3" { location := key + "/k8s-1.6.yaml" diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index e2b1b891ea825..61d582c7c162f 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -25,15 +25,15 @@ spec: name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.14.13-kops.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 15ade04df128488a534141bd5b8593d078f4953f + manifestHash: dee9c0b6910a239611448bce2389cfe1de5ea487 name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.14.13-kops.3 - 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 67c6ca1e502a9..39550400c63c9 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -25,15 +25,15 @@ spec: name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.14.13-kops.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 15ade04df128488a534141bd5b8593d078f4953f + manifestHash: dee9c0b6910a239611448bce2389cfe1de5ea487 name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.14.13-kops.3 - 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 04a14dd83ed36..a5f74704ae027 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -25,15 +25,15 @@ spec: name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.14.13-kops.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 15ade04df128488a534141bd5b8593d078f4953f + manifestHash: dee9c0b6910a239611448bce2389cfe1de5ea487 name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.14.13-kops.3 - 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 8423e0b320bcd..f54221a4be3ee 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -25,15 +25,15 @@ spec: name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.14.13-kops.3 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 15ade04df128488a534141bd5b8593d078f4953f + manifestHash: dee9c0b6910a239611448bce2389cfe1de5ea487 name: kube-dns.addons.k8s.io selector: k8s-addon: kube-dns.addons.k8s.io - version: 1.14.13-kops.2 + version: 1.14.13-kops.3 - id: k8s-1.8 manifest: rbac.addons.k8s.io/k8s-1.8.yaml manifestHash: 5d53ce7b920cd1e8d65d2306d80a041420711914