kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always use coreDNS by default

This commit is contained in:
Ole Markus With 2022-06-07 11:04:56 +02:00
parent 014f3d3e68
commit 4ea0fe89e1
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
View File

@ -356,15 +356,9 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*Addon
kubeDNS := b.Cluster.Spec.KubeDNS kubeDNS := b.Cluster.Spec.KubeDNS
// This checks if the Kubernetes version is greater than or equal to 1.20
// and makes the default DNS server as CoreDNS if the DNS provider is not specified
// and the Kubernetes version is >=1.19
if kubeDNS.Provider == "" { if kubeDNS.Provider == "" {
kubeDNS.Provider = "KubeDNS"
if b.Cluster.IsKubernetesGTE("1.20") {
kubeDNS.Provider = "CoreDNS" kubeDNS.Provider = "CoreDNS"
} }
}
if kubeDNS.Provider == "KubeDNS" { if kubeDNS.Provider == "KubeDNS" {
{ {

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml
View File

@ -19,11 +19,11 @@ spec:
k8s-addon: core.addons.k8s.io k8s-addon: core.addons.k8s.io
version: 9.99.0 version: 9.99.0
- id: k8s-1.12 - id: k8s-1.12
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml manifest: coredns.addons.k8s.io/k8s-1.12.yaml
manifestHash: 6031d02efd43be93b5e17323df6b5eb80d4e3149675fa0c58e86f610d60b94e2 manifestHash: c930f84e40f98a66d2d21f5abb02300980216e73abcc78d4641c4d65335fc065
name: kube-dns.addons.k8s.io name: coredns.addons.k8s.io
selector: selector:
k8s-addon: kube-dns.addons.k8s.io k8s-addon: coredns.addons.k8s.io
version: 9.99.0 version: 9.99.0
- id: k8s-1.9 - id: k8s-1.9
manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml
View File

@ -19,11 +19,11 @@ spec:
k8s-addon: core.addons.k8s.io k8s-addon: core.addons.k8s.io
version: 9.99.0 version: 9.99.0
- id: k8s-1.12 - id: k8s-1.12
manifest: kube-dns.addons.k8s.io/k8s-1.12.yaml manifest: coredns.addons.k8s.io/k8s-1.12.yaml
manifestHash: 6031d02efd43be93b5e17323df6b5eb80d4e3149675fa0c58e86f610d60b94e2 manifestHash: c930f84e40f98a66d2d21f5abb02300980216e73abcc78d4641c4d65335fc065
name: kube-dns.addons.k8s.io name: coredns.addons.k8s.io
selector: selector:
k8s-addon: kube-dns.addons.k8s.io k8s-addon: coredns.addons.k8s.io
version: 9.99.0 version: 9.99.0
- id: k8s-1.9 - id: k8s-1.9
manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml