Skip to content

Commit

Permalink
Merge pull request #77285 from pjh/automated-cherry-pick-of-#76722-up…
Browse files Browse the repository at this point in the history
…stream-release-1.14

Automated cherry pick of #76722: Pin GCE Windows node image to 1809 v20190312.
  • Loading branch information
k8s-ci-robot committed May 2, 2019
2 parents b083bd4 + d606e12 commit 1023bb9
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion cluster/gce/util.sh
Expand Up @@ -2020,7 +2020,9 @@ function create-node-template() {
if [[ "${os}" == 'linux' ]]; then
node_image_flags="--image-project ${NODE_IMAGE_PROJECT} --image ${NODE_IMAGE}"
elif [[ "${os}" == 'windows' ]]; then
node_image_flags="--image-project ${WINDOWS_NODE_IMAGE_PROJECT} --image-family ${WINDOWS_NODE_IMAGE_FAMILY}"
# TODO(pjh): revert back to using WINDOWS_NODE_IMAGE_FAMILY instead of
# pinning to the v20190312 image once #76666 is resolved.
node_image_flags="--image-project ${WINDOWS_NODE_IMAGE_PROJECT} --image=windows-server-1809-dc-core-for-containers-v20190312"
else
echo "Unknown OS ${os}" >&2
exit 1
Expand Down

0 comments on commit 1023bb9

Please sign in to comment.