Skip to content

K
k3s
Commit 5478aa82 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28299 from freehan/nodee2e

Automatic merge from submit-queue switch back to promiscuous-bridge mode fix: #27498
parents 038ac428 6db354b1
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
test/e2e_node/e2e_service.go
View file @ 5478aa82
...@@ -243,7 +243,6 @@ func (es *e2eService) startKubeletServer() (*killCmd, error) { ...@@ -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(
......
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