github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-31 13:50:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33125 from maisem/pin_gke_tests

Browse Source 
Automatic merge from submit-queue

Setting the default image for GKE tests to Container_VM.

@vishh @spxtr @pwittrock

The purpose is to keep the current state of tests as is even if GKE changes the base image.
This commit is contained in:
Kubernetes Submit Queue
2016-09-21 18:02:15 -07:00
committed by GitHub
parent a44aeca42b 714983c9f3
commit 8c73e2bcbe
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gke/config-test.sh
View File

@@ -18,7 +18,7 @@
CLUSTER_NAME="${CLUSTER_NAME:-${USER}-gke-e2e}" CLUSTER_NAME="${CLUSTER_NAME:-${USER}-gke-e2e}"
NETWORK=${KUBE_GKE_NETWORK:-e2e} NETWORK=${KUBE_GKE_NETWORK:-e2e}
NODE_TAG="k8s-${CLUSTER_NAME}-node" NODE_TAG="k8s-${CLUSTER_NAME}-node"
IMAGE_TYPE="${KUBE_GKE_IMAGE_TYPE:-}" IMAGE_TYPE="${KUBE_GKE_IMAGE_TYPE:-container_vm}"
# For ease of maintenance, extract any pieces that do not vary between default # For ease of maintenance, extract any pieces that do not vary between default