Remove both the CoreDNS and KubeDNS addons. Let Kubeadm install the c…

…orrect DNS addon.
kubernetes · Nov 13, 2018 · 6adba64 · 6adba64
1 parent 36631fa
commit 6adba64
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 55 deletions.
diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go
@@ -89,55 +89,6 @@ var Addons = map[string]*Addon{
 			"storage-provisioner.yaml",
 			"0640"),
 	}, true, "storage-provisioner"),
-	"coredns": NewAddon([]*BinDataAsset{
-		NewBinDataAsset(
-			"deploy/addons/coredns/coreDNS-controller.yaml",
-			constants.AddonsPath,
-			"coreDNS-controller.yaml",
-			"0640"),
-		NewBinDataAsset(
-			"deploy/addons/coredns/coreDNS-configmap.yaml",
-			constants.AddonsPath,
-			"coreDNS-configmap.yaml",
-			"0640"),
-		NewBinDataAsset(
-			"deploy/addons/coredns/coreDNS-svc.yaml",
-			constants.AddonsPath,
-			"coreDNS-svc.yaml",
-			"0640"),
-		NewBinDataAsset(
-			"deploy/addons/coredns/coreDNS-crbinding.yaml",
-			constants.AddonsPath,
-			"coreDNS-crbinding.yaml",
-			"0640"),
-		NewBinDataAsset(
-			"deploy/addons/coredns/coreDNS-sa.yaml",
-			constants.AddonsPath,
-			"coreDNS-sa.yaml",
-			"0640"),
-		NewBinDataAsset(
-			"deploy/addons/coredns/coreDNS-clusterrole.yaml",
-			constants.AddonsPath,
-			"coreDNS-clusterrole.yaml",
-			"0640"),
-	}, true, "coredns"),
-	"kube-dns": NewAddon([]*BinDataAsset{
-		NewBinDataAsset(
-			"deploy/addons/kube-dns/kube-dns-controller.yaml",
-			constants.AddonsPath,
-			"kube-dns-controller.yaml",
-			"0640"),
-		NewBinDataAsset(
-			"deploy/addons/kube-dns/kube-dns-cm.yaml",
-			constants.AddonsPath,
-			"kube-dns-cm.yaml",
-			"0640"),
-		NewBinDataAsset(
-			"deploy/addons/kube-dns/kube-dns-svc.yaml",
-			constants.AddonsPath,
-			"kube-dns-svc.yaml",
-			"0640"),
-	}, false, "kube-dns"),
 	"heapster": NewAddon([]*BinDataAsset{
 		NewBinDataAsset(
 			"deploy/addons/heapster/influx-grafana-rc.yaml",

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -162,12 +162,7 @@ func addAddons(files *[]assets.CopyableFile) error {
 		return errors.Wrap(err, "adding minikube dir assets")
 	}
 	// bundled addons
-	for addonName, addonBundle := range assets.Addons {
-		// TODO(r2d4): Kubeadm ignores the kube-dns addon and uses its own.
-		// expose this in a better way
-		if addonName == "kube-dns" {
-			continue
-		}
+	for _, addonBundle := range assets.Addons {
 		if isEnabled, err := addonBundle.IsEnabled(); err == nil && isEnabled {
 			for _, addon := range addonBundle.Assets {
 				*files = append(*files, addon)