github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
before we get here, which eliminates any cluster/gke use if
KUBERNETES_CONFORMANCE_PROVIDER is set to "gke".
pull/6/head
Zach Loafman 2017-07-17 11:59:41 -07:00
parent 12ba9bdc8c
commit 3a2e9d51bb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hack/ginkgo-e2e.sh
View File

@ -76,8 +76,6 @@ fi
if [[ -n "${NODE_INSTANCE_PREFIX:-}" ]]; then if [[ -n "${NODE_INSTANCE_PREFIX:-}" ]]; then
NODE_INSTANCE_GROUP="${NODE_INSTANCE_PREFIX}-group" NODE_INSTANCE_GROUP="${NODE_INSTANCE_PREFIX}-group"
else
NODE_INSTANCE_GROUP=""
fi fi
if [[ "${KUBERNETES_PROVIDER}" == "gce" ]]; then if [[ "${KUBERNETES_PROVIDER}" == "gce" ]]; then
@ -93,7 +91,10 @@ if [[ "${KUBERNETES_PROVIDER}" == "gce" ]]; then
done done
fi 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 detect-node-instance-groups
NODE_INSTANCE_GROUP=$(kube::util::join , "${NODE_INSTANCE_GROUPS[@]}") NODE_INSTANCE_GROUP=$(kube::util::join , "${NODE_INSTANCE_GROUPS[@]}")
fi fi