github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Revert "kubeadm: Create control plane with ClusterFirstWithHostNet dns policy"
This commit is contained in:
k8s-ci-robot 2018-11-13 18:07:33 -08:00 committed by GitHub
commit 90295640ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kubeadm/app/util/staticpod/utils.go
View File

@ -68,7 +68,6 @@ func ComponentPod(container v1.Container, volumes map[string]v1.Volume) v1.Pod {
Containers: []v1.Container{container}, Containers: []v1.Container{container},
PriorityClassName: "system-cluster-critical", PriorityClassName: "system-cluster-critical",
HostNetwork: true, HostNetwork: true,
DNSPolicy: v1.DNSClusterFirstWithHostNet,
Volumes: VolumeMapToSlice(volumes), Volumes: VolumeMapToSlice(volumes),
}, },
} }

1
cmd/kubeadm/app/util/staticpod/utils_test.go
View File

@ -369,7 +369,6 @@ func TestComponentPod(t *testing.T) {
}, },
PriorityClassName: "system-cluster-critical", PriorityClassName: "system-cluster-critical",
HostNetwork: true, HostNetwork: true,
DNSPolicy: v1.DNSClusterFirstWithHostNet,
Volumes: []v1.Volume{}, Volumes: []v1.Volume{},
}, },
}, },