From bf92a81f31af3cb25f7d326d5625b2deb7ad3581 Mon Sep 17 00:00:00 2001
From: David Hiendl <david.hiendl@dhswt.de>
Date: Wed, 28 Sep 2022 16:54:05 +0200
Subject: [PATCH] switched to ubuntu-22.04 and docker 20.10.x, added optional
 to pre-pull docker images

---
 .../Chart.yaml                                |  2 +-
 .../hetzner-ubuntu-2204-docker-fastinstall.sh | 26 --------------
 .../hetzner-ubuntu-docker-fastinstall.sh      | 24 -------------
 .../templates/config.yaml                     | 35 +++++++++++++++++--
 .../values.yaml                               | 10 ++++--
 5 files changed, 40 insertions(+), 57 deletions(-)
 delete mode 100644 charts/gitlab-runner-hetzner-autoscale/install-scripts/hetzner-ubuntu-2204-docker-fastinstall.sh
 delete mode 100644 charts/gitlab-runner-hetzner-autoscale/install-scripts/hetzner-ubuntu-docker-fastinstall.sh

diff --git a/charts/gitlab-runner-hetzner-autoscale/Chart.yaml b/charts/gitlab-runner-hetzner-autoscale/Chart.yaml
index e14f102..de604b5 100755
--- a/charts/gitlab-runner-hetzner-autoscale/Chart.yaml
+++ b/charts/gitlab-runner-hetzner-autoscale/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: gitlab-runner-hetzner-autoscale
 name: gitlab-runner-hetzner-autoscale
-version: 0.0.7
+version: 0.0.8
 appVersion: v0.1
 keywords:
 - gitlab-runner
diff --git a/charts/gitlab-runner-hetzner-autoscale/install-scripts/hetzner-ubuntu-2204-docker-fastinstall.sh b/charts/gitlab-runner-hetzner-autoscale/install-scripts/hetzner-ubuntu-2204-docker-fastinstall.sh
deleted file mode 100644
index 765505f..0000000
--- a/charts/gitlab-runner-hetzner-autoscale/install-scripts/hetzner-ubuntu-2204-docker-fastinstall.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-echo "Starting Hetzner Ubuntu 22.04 optimized fast docker install ..."
-
-# pin docker to 19.03*
-#sudo tee /etc/apt/preferences.d/200_docker-ce > /dev/null <<EOT
-#Package: docker-ce*
-#Pin: version 5:19.03*
-#Pin-Priority: 1001
-#EOT
-
-mkdir -p /etc/apt/keyrings
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
- 
-echo \
-  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
-  $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
-
-apt-get update
-
-apt-get install -y \
-    docker-ce \
-    docker-ce-cli \
-    containerd.io
-
-echo "Finished Hetzner Ubuntu 22.04 optimized fast docker install"
diff --git a/charts/gitlab-runner-hetzner-autoscale/install-scripts/hetzner-ubuntu-docker-fastinstall.sh b/charts/gitlab-runner-hetzner-autoscale/install-scripts/hetzner-ubuntu-docker-fastinstall.sh
deleted file mode 100644
index 8b0ec02..0000000
--- a/charts/gitlab-runner-hetzner-autoscale/install-scripts/hetzner-ubuntu-docker-fastinstall.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-echo "Starting Hetzner Ubuntu 20.04 optimized fast docker install ..."
-
-# pin docker to 19.03*
-sudo tee /etc/apt/preferences.d/200_docker-ce > /dev/null <<EOT
-Package: docker-ce*
-Pin: version 5:19.03*
-Pin-Priority: 1001
-EOT
-
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-
-sudo add-apt-repository \
-   "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-   $(lsb_release -cs) \
-   stable"
-
-sudo apt-get install -y \
-    docker-ce \
-    docker-ce-cli \
-    containerd.io
-
-echo "Finished Hetzner Ubuntu 20.04 optimized fast docker install"
diff --git a/charts/gitlab-runner-hetzner-autoscale/templates/config.yaml b/charts/gitlab-runner-hetzner-autoscale/templates/config.yaml
index 250851f..7542133 100644
--- a/charts/gitlab-runner-hetzner-autoscale/templates/config.yaml
+++ b/charts/gitlab-runner-hetzner-autoscale/templates/config.yaml
@@ -71,10 +71,39 @@ stringData:
             "hetzner-server-type={{ .Values.hetzner.serverType }}",
             # see for available versions: https://github.com/rancher/install-docker/tree/master/dist
             # "engine-install-url=https://releases.rancher.com/install-docker/19.03.15.sh"
-            # "engine-install-url=https://s3.eu-central-1.wasabisys.com/dhswt-public/scripts/noop.sh"
             # "engine-install-url=https://raw.githubusercontent.com/davidhiendl/gitlab-runner-hetzner-autoscale/master/chart/install-scripts/hetzner-ubuntu-docker-fastinstall.sh"
-            # "engine-install-url=https://s3.eu-central-1.wasabisys.com/dhswt-public/scripts/hetzner-ubuntu-docker-fastinstall.sh"
-            "engine-install-url={{ .Values.hetzner.engineInstallUrl }}"
+            "engine-install-url={{ .Values.hetzner.engineInstallUrl }}",
+            """hetzner-user-data=
+            #cloud-config
+            runcmd:
+              - |
+                # run the install script via cloud init
+                curl -s {{ .Values.hetzner.cloudInitInstallUrl }} | bash -s
+              
+                # wait for the 10-machine file to exist, then restart the agent
+                while sleep 1; do
+                  if [ -e /etc/systemd/system/docker.service.d/10-machine.conf ]; then
+                    echo "found /etc/systemd/system/docker.service.d/10-machine.conf file, waiting 1s ..."
+                    sleep 1
+                    echo "restarting docker ..."
+                    systemctl restart docker
+
+                    {{ if $.Values.prepullImages }}
+                    # pre-pull images
+                    echo "pre-pulling images ..."
+                    sleep 3
+                    {{- range $.Values.prepullImages }}
+                    docker pull {{ . }}
+                    {{- end }}
+                    {{ end }}
+
+                    echo "cloud-init background tasks completed"
+
+                    break
+                  fi
+                done &
+
+          """
         ]
         OffPeakTimezone = ""
         OffPeakIdleCount = 0
diff --git a/charts/gitlab-runner-hetzner-autoscale/values.yaml b/charts/gitlab-runner-hetzner-autoscale/values.yaml
index d914b3f..52a2eae 100644
--- a/charts/gitlab-runner-hetzner-autoscale/values.yaml
+++ b/charts/gitlab-runner-hetzner-autoscale/values.yaml
@@ -1,18 +1,22 @@
 image: ghcr.io/davidhiendl/gitlab-runner-hetzner-autoscale:master
 pullPolicy: Always
 
-
 hetzner:
   apiToken:
-  engineInstallUrl: "https://raw.githubusercontent.com/davidhiendl/gitlab-runner-hetzner-autoscale/master/charts/gitlab-runner-hetzner-autoscale/install-scripts/hetzner-ubuntu-docker-fastinstall.sh"
+  cloudInitInstallUrl: "https://raw.githubusercontent.com/davidhiendl/gitlab-runner-hetzner-autoscale/master/install-scripts/hetzner-ubuntu-2204-docker-fastinstall.sh"
+  engineInstallUrl: "https://raw.githubusercontent.com/davidhiendl/gitlab-runner-hetzner-autoscale/master/install-scripts/no-op.sh"
   serverType: "cpx21"
   serverLocation: "nbg1"
-  image: "ubuntu-20.04"
+  image: "ubuntu-22.04"
 
 runner:
   registrationToken: ""
   ciServerUrl: "https://gitlab.com/"
 
+prepullImages: []
+#  - "docker:dind"
+#  - "docker:stable"
+
 resources:
   requests:
     cpu: "150m"