github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 03:57:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25763 from andyzheng0831/gci-image

Browse Source 
Automatic merge from submit-queue

GCI: Fix the condition for using the default image

This PR revises the condition for using the default GCI image. The old logic is not convenient for manually run e2e tests in some cases (mainly for GCI team to test custom images). The new logic by this PR is very similar to the logic in using ContainerVM. When setting distro to "gci", if master or node image is unset, we use gci-dev for it. If either is set, we respect it.

@roberthbailey @zmerlynn @dchen1107 please review it, and we should cherry pick it in release-1.2 branch. Thanks!

cc/ @kubernetes/goog-image @adityakali FYI
This commit is contained in:
k8s-merge-robot 2016-05-17 22:55:41 -07:00
commit 51203dad7a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cluster/gce/util.sh
View File

@ -28,16 +28,17 @@ if [[ "${OS_DISTRIBUTION}" == "debian" || "${OS_DISTRIBUTION}" == "coreos" || "$
elif [[ "${OS_DISTRIBUTION}" == "gci" ]]; then elif [[ "${OS_DISTRIBUTION}" == "gci" ]]; then
# TODO(andyzheng0831): Switch to use the GCI specific code. # TODO(andyzheng0831): Switch to use the GCI specific code.
source "${KUBE_ROOT}/cluster/gce/trusty/helper.sh" source "${KUBE_ROOT}/cluster/gce/trusty/helper.sh"
MASTER_IMAGE_PROJECT="google-containers" # If the master or node image is not set, we use the latest GCI dev image.
# If choosing "gci" disto, at least the cluster master needs to run on GCI image. # Otherwise, we respect whatever set by the user.
# If the user does not set a GCI image for master, we run both master and nodes gci_images=( $(gcloud compute images list --project google-containers \
# using the latest GCI dev image.
if [[ "${MASTER_IMAGE}" != gci* ]]; then
gci_images=( $(gcloud compute images list --project google-containers \
--regexp='gci-dev.*' --format='value(name)') ) --regexp='gci-dev.*' --format='value(name)') )
if [[ -z "${KUBE_GCE_MASTER_IMAGE:-}" ]]; then
MASTER_IMAGE="${gci_images[0]}" MASTER_IMAGE="${gci_images[0]}"
NODE_IMAGE="${MASTER_IMAGE}" MASTER_IMAGE_PROJECT="google-containers"
NODE_IMAGE_PROJECT="${MASTER_IMAGE_PROJECT}" fi
if [[ -z "${KUBE_GCE_NODE_IMAGE:-}" ]]; then
NODE_IMAGE="${gci_images[0]}"
NODE_IMAGE_PROJECT="google-containers"
fi fi
else else
echo "Cannot operate on cluster using os distro: ${OS_DISTRIBUTION}" >&2 echo "Cannot operate on cluster using os distro: ${OS_DISTRIBUTION}" >&2