CoreDNS

kubernetes · Oct 19, 2020 · b2b614f · b2b614f
1 parent 0d6ba93
commit b2b614f
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 62 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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