From ab86dee61d1d015183f76fbe1b869c30f15736ea Mon Sep 17 00:00:00 2001
From: saibotk <git@saibotk.de>
Date: Wed, 16 Dec 2020 15:32:50 +0100
Subject: [PATCH] gitlab_runner: Remove s3 cache enabled flag

---
 roles/gitlab_runner/README.md             |  2 +-
 roles/gitlab_runner/defaults/main.yml     | 12 ++++++------
 roles/gitlab_runner/templates/config.toml |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/gitlab_runner/README.md b/roles/gitlab_runner/README.md
index 12381c0..4abcab7 100644
--- a/roles/gitlab_runner/README.md
+++ b/roles/gitlab_runner/README.md
@@ -37,7 +37,7 @@ gitlabrunner_runners:
     # The token that you received when registering the runner (not the register token!!!)
     # Register a runner first to obtain a token: https://docs.gitlab.com/runner/register/index.html#docker
     # Can be done via the API and the registration token: eg. `curl --request POST "https://gitlab.example.com/api/v4/runners" --form "token=<registration_token>"`
-    gitlab_token:
+    gitlab_token: "ENTER_YOUR_TOKEN_HERE"
     
     # Adjust the name of the runner
     name: "hetzner-docker-auto-scale"
diff --git a/roles/gitlab_runner/defaults/main.yml b/roles/gitlab_runner/defaults/main.yml
index 479dc7c..38c1e59 100644
--- a/roles/gitlab_runner/defaults/main.yml
+++ b/roles/gitlab_runner/defaults/main.yml
@@ -41,6 +41,7 @@ gitlabrunner_concurrent: 1
 # The interval in seconds, to check for available jobs. (0 means default value is used. See https://docs.gitlab.com/runner/configuration/advanced-configuration.html#how-check_interval-works)
 gitlabrunner_check_interval: 0
 
+# This is used to define all the runners, that may be served by this gitlab-runner
 gitlabrunner_runners:
     # The URL of the instance that this runner should be associated with
   - gitlab_url: https://gitlab.example.com
@@ -87,9 +88,8 @@ gitlabrunner_runners:
       hetzner-server-location: "fsn1" # The server location to use for a new machine
 
     # S3 Runner cache configuration to improve performance between runs (see https://docs.gitlab.com/runner/configuration/autoscale.html#distributed-runners-caching)
-    cache_s3:
-      enabled: false
-      server: s3.example.com
-      access_key: ""
-      secret_key: ""
-      bucket: "runner"
+    # cache_s3:
+    #   server: s3.example.com
+    #   access_key: ""
+    #   secret_key: ""
+    #   bucket: "runner"
diff --git a/roles/gitlab_runner/templates/config.toml b/roles/gitlab_runner/templates/config.toml
index fa40a55..8b78193 100644
--- a/roles/gitlab_runner/templates/config.toml
+++ b/roles/gitlab_runner/templates/config.toml
@@ -50,7 +50,7 @@ check_interval = {{ gitlabrunner_check_interval }}
     ]
 {% endif %}
   [runners.cache]
-{% if gitlabrunner.cache_s3.enabled %}
+{% if gitlabrunner.cache_s3 %}
     Type = "s3"
     Shared = false
     [runners.cache.s3]