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

Merge pull request #15645 from ArtfulCoder/oneNS

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-01 13:51:37 -08:00
parent 727412c5ce 015df14a4a
commit 4602220ad0
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/integration/integration.go
View File

@@ -248,7 +248,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)
@@ -281,7 +281,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