github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18089 from ArtfulCoder/oneNSAgain

Browse Source 
SkyDNS is the only NS for Pods with DNSPolicy=ClusterFirst
This commit is contained in:
Abhi Shah
2015-12-07 10:20:29 -08:00
parent 33eda2ffb5 6c3a88cb3a
commit bb3f49e526
5 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/integration/integration.go
View File

@@ -216,7 +216,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
3*time.Second, /* NodeStatusUpdateFrequency */
10*time.Second, /* SyncFrequency */
40, /* MaxPods */
cm)
cm, net.ParseIP("127.0.0.1"))
kubeletapp.RunKubelet(kcfg)
// Kubelet (machine)
@@ -249,7 +249,8 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
10*time.Second, /* SyncFrequency */
40, /* MaxPods */
cm)
cm,
net.ParseIP("127.0.0.1"))
kubeletapp.RunKubelet(kcfg)
return apiServer.URL, configFilePath