Merge pull request #20883 from bprashanth/kubelet_flag

Kubelet flag for disabling hairpin mode
This commit is contained in:
Prashanth B
2016-02-09 17:31:30 -08:00
15 changed files with 1015 additions and 934 deletions

View File

@@ -609,6 +609,7 @@ case ${JOB_NAME} in
: ${E2E_TEST:="false"}
: ${E2E_UP:="true"}
: ${KUBE_GCE_INSTANCE_PREFIX:="gce-soak-weekly"}
: ${HAIRPIN_MODE:="false"}
: ${PROJECT:="kubernetes-jenkins"}
;;
@@ -627,6 +628,7 @@ case ${JOB_NAME} in
# TODO(ihmccreery) remove [Skipped] once tests are relabeled
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[Skipped\]"}
: ${KUBE_GCE_INSTANCE_PREFIX:="gce-soak-weekly"}
: ${HAIRPIN_MODE:="false"}
: ${PROJECT:="kubernetes-jenkins"}
;;

View File

@@ -381,3 +381,4 @@ leader-elect-lease-duration
leader-elect-renew-deadline
leader-elect-retry-period
watch-cache-sizes
configure-hairpin-mode