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

Merge pull request #24987 from andyzheng0831/image 

Automatic merge from submit-queue

GCI: Update the command to get the image

When we announced public GCI, we used the project google-containers to host GCI release images. However, later we encountered a licence issue and the administrators of google-containers project decided to remove this project from gcloud commands. According, we should list GCI images with the flag "--project google-containers". But the same image is listed twice during this transient period. This PR updates the code of getting the GCI image, which works during the transient period and after the google-containers project change finishes.

@roberthbailey @dchen1107 @zmerlynn please review it.

cc/ @wonderfly @fabioy FYI
pull/6/head
k8s-merge-robot 2016-04-29 15:01:50 -07:00
parent c53d3e1e26 967fd495e0
commit 54b62b6000
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/gce/util.sh
View File

@ -33,7 +33,8 @@ elif [[ "${OS_DISTRIBUTION}" == "gci" ]]; then
# If the user does not set a GCI image for master, we run both master and nodes # If the user does not set a GCI image for master, we run both master and nodes
# using the latest GCI dev image. # using the latest GCI dev image.
if [[ "${MASTER_IMAGE}" != gci* ]]; then if [[ "${MASTER_IMAGE}" != gci* ]]; then
MASTER_IMAGE=$(gcloud compute images list | grep "gci-dev" | cut -d ' ' -f1) gci_images=( $(gcloud compute images list --project google-containers | grep "gci-dev" | cut -d ' ' -f1) )
MASTER_IMAGE="${gci_images[0]}"
NODE_IMAGE="${MASTER_IMAGE}" NODE_IMAGE="${MASTER_IMAGE}"
NODE_IMAGE_PROJECT="${MASTER_IMAGE_PROJECT}" NODE_IMAGE_PROJECT="${MASTER_IMAGE_PROJECT}"
fi fi