From 5f1f105d967f7cb0cfc2a0a815235ca23be41e50 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Wed, 21 Apr 2021 10:22:37 +0200
Subject: [PATCH] update template creation instructions, use template created
from them
---
.gitlab/ci_scripts/create_vps.sh | 2 +-
CONTRIBUTING.md | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/.gitlab/ci_scripts/create_vps.sh b/.gitlab/ci_scripts/create_vps.sh
index 7a2bd7422..0e8972148 100644
--- a/.gitlab/ci_scripts/create_vps.sh
+++ b/.gitlab/ci_scripts/create_vps.sh
@@ -17,5 +17,5 @@ python3 -m openappstack $HOSTNAME create \
--ssh-key-id $SSH_KEY_ID \
--create-domain-records \
--subdomain $SUBDOMAIN \
- --disk-image-id '-7351' \
+ --disk-image-id '-7473' \
--truncate-subdomain
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6f2300da9..b48c5f164 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,7 +8,8 @@ for details.
## Preparing the development environment
-Make sure you have development dependencies installed in your development environment.
+Make sure you have development dependencies installed in your development
+environment.
```
pip install -r requirements-dev.txt
@@ -80,8 +81,8 @@ use it. This is a manual process for now. Follow these steps:
```
$ python3 -m openappstack <cluster> install --install-kubernetes --no-install-openappstack
```
-3. Log into your machine and delete the coredns and metrics-server deployments,
- then delete the cluster data:
+3. Log into your machine and clean up the k3s server, then delete the cluster
+ data:
```
# Clean up running containers and firewall
/usr/local/bin/k3s-killall.sh
@@ -94,8 +95,10 @@ use it. This is a manual process for now. Follow these steps:
1. Change the Disk Label to something like `k3s-template`
2. Set VPS to `-- not assigned --`
3. Click 'make template'
- 4. Remember the disk image ID that you can see in the current URL as `id=...`
- 5. Click save
+ 4. Choose "Linux Latest LTS" as the kernel
+ 5. Choose OS type Debian 10
+ 6. Remember the disk image ID that you can see in the current URL as `id=...`
+ 7. Click save
6. 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
--
GitLab