mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-20 18:31:15 +00:00
Merge pull request #113635 from andrewsykim/remove-ignore-cloud-provider-taint-envvar
cluster: remove KUBE_TEST_IGNORE_CLOUDPROVIDER_TAINT which is no longer needed
This commit is contained in:
commit
c9d87a9f7c
@ -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"
|
||||
|
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user