From 545835e28826d888b3d236f71fbbd88107d3b635 Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Fri, 4 Nov 2022 16:17:04 -0400 Subject: [PATCH 1/2] cluster: remove KUBE_TEST_IGNORE_CLOUDPROVIDER_TAINT which is no longer needed Signed-off-by: Andrew Sy Kim --- cluster/gce/config-test.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index a6ba4abb15d..98762fe9901 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -160,9 +160,6 @@ fi # shellcheck disable=SC2034 # Variables sourced in other scripts. 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. @@ -298,8 +295,6 @@ 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" From ae1e93bfbe98d58c4b55e7f7135cddcd91e83be5 Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Sat, 5 Nov 2022 22:04:37 -0400 Subject: [PATCH 2/2] remove TEST_IGNORE_CLOUDPROVIDER_TAINT from hack/ginkgo-e2e.sh Signed-off-by: Andrew Sy Kim --- hack/ginkgo-e2e.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hack/ginkgo-e2e.sh b/hack/ginkgo-e2e.sh index b49828c4892..7814433d200 100755 --- a/hack/ginkgo-e2e.sh +++ b/hack/ginkgo-e2e.sh @@ -130,11 +130,6 @@ 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 - # These arguments are understood by both Ginkgo test suite and CLI. # Some arguments (like --nodes) are only supported when using the CLI. # Those get set below when choosing the program.