Skip to content

Commit 7e4e7fe

Browse files
committed
gceworker.sh: update default worker image
Ubuntu 20.04 LTS is past EOL and no longer available. DevInf has made 20.04 available in the cockroach-workers project as 'crl-ubuntu-2004'. We also no longer suppoert image families, so this patch changes the image project to 'cockroach-workers' and points at the new image. Epic: none Release note: None
1 parent b9a9506 commit 7e4e7fe

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

scripts/gceworker.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ USER_ID=$(id -un)
1717
NAME=${GCEWORKER_NAME-gceworker-${USER_ID//./}}
1818
FQNAME="${NAME}.${CLOUDSDK_COMPUTE_ZONE}.${CLOUDSDK_CORE_PROJECT}"
1919

20-
# IMAGE_FAMILY can be used to override the image when creating a gceworker.
20+
# IMAGE can be used to override the image when creating a gceworker.
2121
# For example:
22-
# IMAGE_FAMILY=ubuntu-2410-amd64 scripts/gceworker.sh create
22+
# IMAGE=crl-ubuntu-2004 scripts/gceworker.sh create
2323
#
2424
# Note that ubuntu-2004-lts is the only image that we know will consistently
2525
# work with respect to our build or scripts.
26-
IMAGE_FAMILY=${IMAGE_FAMILY-ubuntu-2004-lts}
26+
IMAGE=${IMAGE-crl-ubuntu-2004}
2727

2828
cmd=${1-}
2929
if [[ "${cmd}" ]]; then
@@ -111,8 +111,8 @@ create)
111111
--machine-type "n2-custom-24-32768" \
112112
--network "default" \
113113
--maintenance-policy "MIGRATE" \
114-
--image-project "ubuntu-os-cloud" \
115-
--image-family "${IMAGE_FAMILY}" \
114+
--image-project "cockroach-workers" \
115+
--image "${IMAGE}" \
116116
--boot-disk-size "250" \
117117
--boot-disk-type "pd-ssd" \
118118
--boot-disk-device-name "${NAME}" \

0 commit comments

Comments
 (0)