Merge pull request #21641 from bprashanth/promisc

Teach the kubelet about promiscuous mode, take 2

hack/jenkins/job-configs/kubernetes-soak.yaml

@@ -96,7 +96,6 @@
             branch: 'master'
             provider-env: '{gce-provider-env}'
             job-env: |
-                export HAIRPIN_MODE="false"
                 export PROJECT="k8s-jkns-gce-soak"
         - 'gce-2':
             deploy-description: Clone of kubernetes-soak-weekly-deploy-gce.
@@ -104,6 +103,7 @@
             branch: 'master'
             provider-env: '{gce-provider-env}'
             job-env: |
+                export HAIRPIN_MODE="hairpin-veth"
                 export PROJECT="k8s-jkns-gce-soak-2"
         - 'gce-1.1':
             deploy-description: |

hack/verify-flags/exceptions.txt

@@ -108,3 +108,4 @@ test/e2e/host_path.go:			fmt.Sprintf("--retry_time=%d", retryDuration),
 test/images/mount-tester/mt.go:	flag.BoolVar(&breakOnExpectedContent, "break_on_expected_content", true, "Break out of loop on expected content, (use with --file_content_in_loop flag only)")
 test/images/mount-tester/mt.go:	flag.IntVar(&retryDuration, "retry_time", 180, "Retry time during the loop")
 test/images/mount-tester/mt.go:	flag.StringVar(&readFileContentInLoopPath, "file_content_in_loop", "", "Path to read the file content in loop from")
+pkg/kubelet/network/hairpin/hairpin.go:	hairpinModeRelativePath = "hairpin_mode"

hack/verify-flags/known-flags.txt

@@ -390,5 +390,5 @@ leader-elect-lease-duration
 leader-elect-renew-deadline
 leader-elect-retry-period
 watch-cache-sizes
-configure-hairpin-mode
 lock-file
+hairpin-mode