From b2b614f6aa43ac54a4078c1895c1afbf15666a16 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Mon, 19 Oct 2020 12:28:10 +0300 Subject: [PATCH] CoreDNS --- .../private_gce/expected-v1alpha2.yaml | 2 ++ .../pkg/fi/cloudup/bootstrapchannelbuilder.go | 4 ++-- .../amazonvpc/manifest.yaml | 20 +++++++++---------- .../awsiamauthenticator/manifest.yaml | 20 +++++++++---------- .../cilium/manifest.yaml | 20 +++++++++---------- .../public-jwks/manifest.yaml | 20 +++++++++---------- .../simple/manifest.yaml | 20 +++++++++---------- .../weave/manifest.yaml | 20 +++++++++---------- 8 files changed, 64 insertions(+), 62 deletions(-) diff --git a/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml b/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml index 36135c9a5ad02..9b8b5d43a237e 100644 --- a/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml @@ -35,6 +35,8 @@ spec: iam: allowContainerRegistry: true legacy: false + kubeProxy: + enabled: false kubelet: anonymousAuth: false kubernetesApiAccess: diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 79e25329c0b74..af0c998af48b4 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -291,7 +291,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann } kubeDNS := b.Cluster.Spec.KubeDNS - if kubeDNS.Provider == "KubeDNS" || kubeDNS.Provider == "" { + if kubeDNS.Provider == "KubeDNS" { { key := "kube-dns.addons.k8s.io" @@ -327,7 +327,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann } } - if kubeDNS.Provider == "CoreDNS" { + if kubeDNS.Provider == "CoreDNS" || kubeDNS.Provider == "" { { key := "coredns.addons.k8s.io" version := "1.7.0-kops.1" diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index e095384078af8..e5e8b10d54a8b 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -20,20 +20,20 @@ spec: version: 1.4.0 - id: k8s-1.6 kubernetesVersion: <1.12.0 - manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml - manifestHash: a50e6a4c2f800b4af4ac0d80edf7762cfc1de9e3 - name: kube-dns.addons.k8s.io + manifest: coredns.addons.k8s.io/k8s-1.6.yaml + manifestHash: bca89d04b283648c29f89556261e248dfd7262a7 + name: coredns.addons.k8s.io selector: - k8s-addon: kube-dns.addons.k8s.io - version: 1.15.13-kops.3 + k8s-addon: coredns.addons.k8s.io + version: 1.7.0-kops.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' - manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: db49c98447b9d59dec4fa413461a6614bc6e43e9 - name: kube-dns.addons.k8s.io + manifest: coredns.addons.k8s.io/k8s-1.12.yaml + manifestHash: 0af83c370d13df45c6a2db67fa8f28e41502b6e1 + name: coredns.addons.k8s.io selector: - k8s-addon: kube-dns.addons.k8s.io - version: 1.15.13-kops.3 + k8s-addon: coredns.addons.k8s.io + version: 1.7.0-kops.2 - id: k8s-1.8 manifest: rbac.addons.k8s.io/k8s-1.8.yaml manifestHash: 5d53ce7b920cd1e8d65d2306d80a041420711914 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml index 369dc207f206b..44160a3b23c3c 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml @@ -20,20 +20,20 @@ spec: version: 1.4.0 - id: k8s-1.6 kubernetesVersion: <1.12.0 - manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml - manifestHash: a50e6a4c2f800b4af4ac0d80edf7762cfc1de9e3 - name: kube-dns.addons.k8s.io + manifest: coredns.addons.k8s.io/k8s-1.6.yaml + manifestHash: bca89d04b283648c29f89556261e248dfd7262a7 + name: coredns.addons.k8s.io selector: - k8s-addon: kube-dns.addons.k8s.io - version: 1.15.13-kops.3 + k8s-addon: coredns.addons.k8s.io + version: 1.7.0-kops.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' - manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: db49c98447b9d59dec4fa413461a6614bc6e43e9 - name: kube-dns.addons.k8s.io + manifest: coredns.addons.k8s.io/k8s-1.12.yaml + manifestHash: 0af83c370d13df45c6a2db67fa8f28e41502b6e1 + name: coredns.addons.k8s.io selector: - k8s-addon: kube-dns.addons.k8s.io - version: 1.15.13-kops.3 + k8s-addon: coredns.addons.k8s.io + version: 1.7.0-kops.2 - id: k8s-1.9 manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml manifestHash: e1508d77cb4e527d7a2939babe36dc350dd83745 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index b9b06756cd49d..41d292e43d7b0 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -20,20 +20,20 @@ spec: version: 1.4.0 - id: k8s-1.6 kubernetesVersion: <1.12.0 - manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml - manifestHash: a50e6a4c2f800b4af4ac0d80edf7762cfc1de9e3 - name: kube-dns.addons.k8s.io + manifest: coredns.addons.k8s.io/k8s-1.6.yaml + manifestHash: bca89d04b283648c29f89556261e248dfd7262a7 + name: coredns.addons.k8s.io selector: - k8s-addon: kube-dns.addons.k8s.io - version: 1.15.13-kops.3 + k8s-addon: coredns.addons.k8s.io + version: 1.7.0-kops.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' - manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: db49c98447b9d59dec4fa413461a6614bc6e43e9 - name: kube-dns.addons.k8s.io + manifest: coredns.addons.k8s.io/k8s-1.12.yaml + manifestHash: 0af83c370d13df45c6a2db67fa8f28e41502b6e1 + name: coredns.addons.k8s.io selector: - k8s-addon: kube-dns.addons.k8s.io - version: 1.15.13-kops.3 + k8s-addon: coredns.addons.k8s.io + version: 1.7.0-kops.2 - id: k8s-1.8 manifest: rbac.addons.k8s.io/k8s-1.8.yaml manifestHash: 5d53ce7b920cd1e8d65d2306d80a041420711914 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/manifest.yaml index 88c2d8a45ab26..e1e779af352f1 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/manifest.yaml @@ -28,20 +28,20 @@ spec: version: 1.4.0 - id: k8s-1.6 kubernetesVersion: <1.12.0 - manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml - manifestHash: a50e6a4c2f800b4af4ac0d80edf7762cfc1de9e3 - name: kube-dns.addons.k8s.io + manifest: coredns.addons.k8s.io/k8s-1.6.yaml + manifestHash: bca89d04b283648c29f89556261e248dfd7262a7 + name: coredns.addons.k8s.io selector: - k8s-addon: kube-dns.addons.k8s.io - version: 1.15.13-kops.3 + k8s-addon: coredns.addons.k8s.io + version: 1.7.0-kops.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' - manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: db49c98447b9d59dec4fa413461a6614bc6e43e9 - name: kube-dns.addons.k8s.io + manifest: coredns.addons.k8s.io/k8s-1.12.yaml + manifestHash: 0af83c370d13df45c6a2db67fa8f28e41502b6e1 + name: coredns.addons.k8s.io selector: - k8s-addon: kube-dns.addons.k8s.io - version: 1.15.13-kops.3 + k8s-addon: coredns.addons.k8s.io + version: 1.7.0-kops.2 - 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 21c8dfe44d43a..3b9807d2dc47e 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -20,20 +20,20 @@ spec: version: 1.4.0 - id: k8s-1.6 kubernetesVersion: <1.12.0 - manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml - manifestHash: a50e6a4c2f800b4af4ac0d80edf7762cfc1de9e3 - name: kube-dns.addons.k8s.io + manifest: coredns.addons.k8s.io/k8s-1.6.yaml + manifestHash: bca89d04b283648c29f89556261e248dfd7262a7 + name: coredns.addons.k8s.io selector: - k8s-addon: kube-dns.addons.k8s.io - version: 1.15.13-kops.3 + k8s-addon: coredns.addons.k8s.io + version: 1.7.0-kops.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' - manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: db49c98447b9d59dec4fa413461a6614bc6e43e9 - name: kube-dns.addons.k8s.io + manifest: coredns.addons.k8s.io/k8s-1.12.yaml + manifestHash: 0af83c370d13df45c6a2db67fa8f28e41502b6e1 + name: coredns.addons.k8s.io selector: - k8s-addon: kube-dns.addons.k8s.io - version: 1.15.13-kops.3 + k8s-addon: coredns.addons.k8s.io + version: 1.7.0-kops.2 - id: k8s-1.9 manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml manifestHash: e1508d77cb4e527d7a2939babe36dc350dd83745 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index f57644b3e7e43..403a9bf95495a 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -20,20 +20,20 @@ spec: version: 1.4.0 - id: k8s-1.6 kubernetesVersion: <1.12.0 - manifest: kube-dns.addons.k8s.io/k8s-1.6.yaml - manifestHash: a50e6a4c2f800b4af4ac0d80edf7762cfc1de9e3 - name: kube-dns.addons.k8s.io + manifest: coredns.addons.k8s.io/k8s-1.6.yaml + manifestHash: bca89d04b283648c29f89556261e248dfd7262a7 + name: coredns.addons.k8s.io selector: - k8s-addon: kube-dns.addons.k8s.io - version: 1.15.13-kops.3 + k8s-addon: coredns.addons.k8s.io + version: 1.7.0-kops.1 - id: k8s-1.12 kubernetesVersion: '>=1.12.0' - manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml - manifestHash: db49c98447b9d59dec4fa413461a6614bc6e43e9 - name: kube-dns.addons.k8s.io + manifest: coredns.addons.k8s.io/k8s-1.12.yaml + manifestHash: 0af83c370d13df45c6a2db67fa8f28e41502b6e1 + name: coredns.addons.k8s.io selector: - k8s-addon: kube-dns.addons.k8s.io - version: 1.15.13-kops.3 + k8s-addon: coredns.addons.k8s.io + version: 1.7.0-kops.2 - id: k8s-1.8 manifest: rbac.addons.k8s.io/k8s-1.8.yaml manifestHash: 5d53ce7b920cd1e8d65d2306d80a041420711914