mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #49043 from zmerlynn/allow-external-node-instance-group
Automatic merge from submit-queue (batch tested with PRs 49043, 49001, 49057, 49066, 48102) cluster/gke: If NODE_INSTANCE_GROUP is set, don't execute any bash Transitional part of kubernetes/test-infra#3307, should be eliminated by kubernetes/test-infra#3330: Allow NODE_INSTANCE_GROUP to be set externally from `hack/ginkgo-e2e.sh`, which eliminates any cluster/gke use if KUBERNETES_CONFORMANCE_PROVIDER is set to `gke`. ```release-note NONE ```
This commit is contained in:
commit
c8fb186391
@ -76,8 +76,6 @@ fi
|
||||
|
||||
if [[ -n "${NODE_INSTANCE_PREFIX:-}" ]]; then
|
||||
NODE_INSTANCE_GROUP="${NODE_INSTANCE_PREFIX}-group"
|
||||
else
|
||||
NODE_INSTANCE_GROUP=""
|
||||
fi
|
||||
|
||||
if [[ "${KUBERNETES_PROVIDER}" == "gce" ]]; then
|
||||
@ -93,7 +91,10 @@ if [[ "${KUBERNETES_PROVIDER}" == "gce" ]]; then
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ "${KUBERNETES_PROVIDER}" == "gke" ]]; then
|
||||
# TODO(kubernetes/test-infra#3330): Allow NODE_INSTANCE_GROUP to be
|
||||
# set before we get here, which eliminates any cluster/gke use if
|
||||
# KUBERNETES_CONFORMANCE_PROVIDER is set to "gke".
|
||||
if [[ -z "${NODE_INSTANCE_GROUP:-}" ]] && [[ "${KUBERNETES_PROVIDER}" == "gke" ]]; then
|
||||
detect-node-instance-groups
|
||||
NODE_INSTANCE_GROUP=$(kube::util::join , "${NODE_INSTANCE_GROUPS[@]}")
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user