Skip to content

K
k3s
Commit 049b35c9 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #43355 from luxas/kubeadm_dns_hostnet

Automatic merge from submit-queue (batch tested with PRs 43355, 42827) kubeadm: In-cluster DNS should be used when self-hosting **What this PR does / why we need it**: I noticed that the master components doesn't use the built-in cluster DNS which they really should do in order to be able to discover other services inside the cluster (like extension API Servers like service catalog). This is a really small change that fixes a misconfiguration that had slipped though earlier. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` @jbeda @bowei @MrHohn
parents 8532c63c b7d84d53
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
cmd/kubeadm/app/master/selfhosted.go
View file @ 049b35c9
......@@ -219,6 +219,7 @@ func getAPIServerDS(cfg *kubeadmapi.MasterConfiguration, volumes []v1.Volume, vo
},
},
Tolerations: []v1.Toleration{kubeadmconstants.MasterToleration},
DNSPolicy: v1.DNSClusterFirstWithHostNet,
},
},
},
......@@ -270,7 +271,7 @@ func getControllerManagerDeployment(cfg *kubeadmapi.MasterConfiguration, volumes
},
},
Tolerations: []v1.Toleration{kubeadmconstants.MasterToleration},
DNSPolicy: v1.DNSDefault,
DNSPolicy: v1.DNSClusterFirstWithHostNet,
},
},
},
......@@ -322,6 +323,7 @@ func getSchedulerDeployment(cfg *kubeadmapi.MasterConfiguration, volumes []v1.Vo
},
},
Tolerations: []v1.Toleration{kubeadmconstants.MasterToleration},
DNSPolicy: v1.DNSClusterFirstWithHostNet,
},
},
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment