Merge pull request #71010 from neolit123/revert-68890-dnspolicy

Revert "kubeadm: Create control plane with ClusterFirstWithHostNet dns policy"

Merge pull request #71010 from neolit123/revert-68890-dnspolicy
90295640 · k8s-ci-robot · GitHub · 50c384ff · 24b4280e · 90295640
Unverified Commit 90295640 authored Nov 13, 2018 by k8s-ci-robot Committed by GitHub Nov 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

utils.go cmd/kubeadm/app/util/staticpod/utils.go +0 -1

utils_test.go cmd/kubeadm/app/util/staticpod/utils_test.go +0 -1

No files found.
--- a/cmd/kubeadm/app/util/staticpod/utils.go
+++ b/cmd/kubeadm/app/util/staticpod/utils.go
@@ -68,7 +68,6 @@ func ComponentPod(container v1.Container, volumes map[string]v1.Volume) v1.Pod {
 			Containers:        []v1.Container{container},
 			PriorityClassName: "system-cluster-critical",
 			HostNetwork:       true,
-			DNSPolicy:         v1.DNSClusterFirstWithHostNet,
 			Volumes:           VolumeMapToSlice(volumes),
 		},
 	}

--- a/cmd/kubeadm/app/util/staticpod/utils_test.go
+++ b/cmd/kubeadm/app/util/staticpod/utils_test.go
@@ -369,7 +369,6 @@ func TestComponentPod(t *testing.T) {
 					},
 					PriorityClassName: "system-cluster-critical",
 					HostNetwork:       true,
-					DNSPolicy:         v1.DNSClusterFirstWithHostNet,
 					Volumes:           []v1.Volume{},
 				},
 			},