Merge branch 'update-k3s-template' into 'main'

Use new template for CI

Closes #1121

See merge request stackspin/stackspin!788

.gitlab/ci_scripts/create_vps.sh

@@ -11,7 +11,7 @@ echo "Deleting old machine"
 python3 -c "import greenhost_cloud;
 greenhost_cloud.terminate_droplets_by_name(\"^${VPS_HOSTNAME}$\")"
 echo "Creating new machine"
-# Uses a custom disk image built with 1f2bee2 on 2021-10-19. See
+# Uses a custom disk image built with a6854a89 on 2022-01-28. See
 # CONTRIBUTING.md#ci-pipeline-image for more info.
 python3 -m stackspin "$VPS_HOSTNAME" create \
   --create-droplet "$DOMAIN" \
@@ -19,7 +19,7 @@ python3 -m stackspin "$VPS_HOSTNAME" create \
   --ssh-key-id "$SSH_KEY_ID" \
   --create-domain-records \
   --subdomain "$SUBDOMAIN" \
-  --disk-image-id '-9102' \
+  --disk-image-id '-10248' \
   --truncate-subdomain
 # Disabled for now, see https://open.greenhost.net/stackspin/stackspin/-/issues/1057
 # --docker-mirror-server="${CI_DEPENDENCY_PROXY_SERVER}" \

CONTRIBUTING.md

@@ -117,7 +117,8 @@ use it. This is a manual process for now. Follow these steps:
 8. Change the `--disk-image-id` argument in `.gitlab/ci_scripts/create_vps.sh`
    to your current disk-image-id **with a minus in front of it**. This is
    because custom images are negative integers, whereas Greenhost's disk images
-   are positive integers
+   are positive integers. Don't forget to change the comment above to include
+   the current commit sha and date.
 9. Remove the droplet
 
 You are now ready to merge the changes you made to the `install-kubernetes`