github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #28299 from freehan/nodee2e 

Automatic merge from submit-queue

switch back to promiscuous-bridge mode

fix: #27498
pull/6/head
k8s-merge-robot 2016-06-30 14:43:33 -07:00 committed by GitHub
parent 038ac428f4 6db354b1ef
commit 5478aa828b
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e_node/e2e_service.go
View File

@ -243,7 +243,6 @@ func (es *e2eService) startKubeletServer() (*killCmd, error) {
"--v", LOG_VERBOSITY_LEVEL, "--logtostderr", "--v", LOG_VERBOSITY_LEVEL, "--logtostderr",
"--network-plugin=kubenet", "--network-plugin=kubenet",
"--pod-cidr=10.180.0.0/24", // Assign a fixed CIDR to the node because there is no node controller. "--pod-cidr=10.180.0.0/24", // Assign a fixed CIDR to the node because there is no node controller.
"--hairpin-mode=hairpin-veth",
) )
cmd := exec.Command("sudo", cmdArgs...) cmd := exec.Command("sudo", cmdArgs...)
hcc := newHealthCheckCommand( hcc := newHealthCheckCommand(