diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 5e2b87078f0..aed9c24673e 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -556,4 +556,4 @@ export CLOUD_PROVIDER_FLAG="${CLOUD_PROVIDER_FLAG:-gce}" # --image-credential-provider-bin-dir=${path-to-auth-provider-binary} # Also, it is required that DisableKubeletCloudCredentialProviders and KubeletCredentialProviders # feature gates are set to true for kubelet to use external credential provider. -ENABLE_AUTH_PROVIDER_GCP="${ENABLE_AUTH_PROVIDER_GCP:-false}" \ No newline at end of file +ENABLE_AUTH_PROVIDER_GCP="${ENABLE_AUTH_PROVIDER_GCP:-false}" diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index d0750642be4..875b69f59e9 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -159,6 +159,9 @@ fi # Optional: set feature gates FEATURE_GATES=${KUBE_FEATURE_GATES:-} +#Optional: disable the cloud provider no schedule taint for testing. +TEST_IGNORE_CLOUDPROVIDER_TAINT=${KUBE_TEST_IGNORE_CLOUDPROVIDER_TAINT:-} + TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100} # Extra docker options for nodes. @@ -294,6 +297,8 @@ export LOGGING_DESTINATION=${KUBE_LOGGING_DESTINATION:-gcp} # options: gcp export ENABLE_CLUSTER_LOGGING=${KUBE_ENABLE_CLUSTER_LOGGING:-true} export ELASTICSEARCH_LOGGING_REPLICAS=1 +export TEST_IGNORE_CLOUDPROVIDER_TAINT=${KUBE_TEST_IGNORE_CLOUDPROVIDER_TAINT:-false} + # Optional: Don't require https for registries in our local RFC1918 network if [[ ${KUBE_ENABLE_INSECURE_REGISTRY:-false} = 'true' ]]; then EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS} --insecure-registry 10.0.0.0/8" diff --git a/hack/ginkgo-e2e.sh b/hack/ginkgo-e2e.sh index 6d5f6f928f7..edebc6fa2ac 100755 --- a/hack/ginkgo-e2e.sh +++ b/hack/ginkgo-e2e.sh @@ -130,6 +130,11 @@ if [[ "${KUBERNETES_PROVIDER}" == "azure" ]]; then fi fi +if [[ "${TEST_IGNORE_CLOUDPROVIDER_TAINT:-}" == true ]]; then + echo "Found test ignore cloude provider taint, removing NoSchedule taint from all nodes" + "${KUBE_ROOT}/cluster/kubectl.sh" taint nodes --all node.cloudprovider.kubernetes.io/uninitialized:NoSchedule- +fi + ginkgo_args=() if [[ -n "${CONFORMANCE_TEST_SKIP_REGEX:-}" ]]; then ginkgo_args+=("--skip=${CONFORMANCE_TEST_SKIP_REGEX}")