dep: upgrade helm/kube providers

.drone.yml

@@ -1,6 +1,6 @@
 ---
 kind: pipeline
-type: kubernetes
+type: docker
 name: Terraform root module
 
 trigger:
@@ -87,6 +87,6 @@ steps:
 
 ---
 kind: signature
-hmac: cccf1769bef0cc4d09ee8717ef22d8376e7e405c0e2548cebe6082c969d2a4ea
+hmac: fab1e0f28b70ec8cee84520cd4b03df265e12e1ed0625403304ced079ecd11ae
 
 ...

README.md

@@ -74,11 +74,14 @@ Version:
 The following resources are used by this module:
 
 - [gitea_oauth2_app.this](https://registry.terraform.io/providers/malarinv/gitea/latest/docs/resources/oauth2_app) (resource)
-- [helm_release.drone_runner](https://registry.terraform.io/providers/hashicorp/helm/2.5.1/docs/resources/release) (resource)
+- [helm_release.drone_runner_docker](https://registry.terraform.io/providers/hashicorp/helm/2.5.1/docs/resources/release) (resource)
+- [helm_release.drone_runner_kube](https://registry.terraform.io/providers/hashicorp/helm/2.5.1/docs/resources/release) (resource)
 - [helm_release.drone_server](https://registry.terraform.io/providers/hashicorp/helm/2.5.1/docs/resources/release) (resource)
 - [kubernetes_namespace.jobs](https://registry.terraform.io/providers/hashicorp/kubernetes/2.11.0/docs/resources/namespace) (resource)
 - [kubernetes_namespace.server](https://registry.terraform.io/providers/hashicorp/kubernetes/2.11.0/docs/resources/namespace) (resource)
+- [kubernetes_secret.runner_dashboard](https://registry.terraform.io/providers/hashicorp/kubernetes/2.11.0/docs/resources/secret) (resource)
 - [random_password.drone_rpc_secret](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password) (resource)
+- [random_password.runner_dashboard](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password) (resource)
 
 ## Required Inputs
 

dashboard.tf

@@ -0,0 +1,21 @@
+locals {
+  runner_dashboard_user = "admin"
+}
+
+resource "random_password" "runner_dashboard" {
+  length  = 30
+  special = false
+}
+
+resource "kubernetes_secret" "runner_dashboard" {
+  metadata {
+    name      = "runner-dashboard-access"
+    namespace = kubernetes_namespace.server.metadata.0.name
+  }
+  data = {
+    username = local.runner_dashboard_user
+    password = random_password.runner_dashboard.result
+  }
+
+  type = "kubernetes.io/basic-auth"
+}

drone.tf

@@ -3,14 +3,19 @@ resource "helm_release" "drone_server" {
   name             = "drone"
   chart            = "drone"
   repository       = "https://charts.drone.io"
-  version          = "0.6.4"
+  version          = "0.6.5"
   namespace        = kubernetes_namespace.server.metadata.0.name
   create_namespace = false
 
+  set {
+    name = "image.tag"
+    value = "2.26.0"
+  }
+
   values = [
     jsonencode({
       env = {
-        DRONE_SERVER_HOST  = local.ingress_domain
+        DRONE_SERVER_HOST  = local.drone_domain
         DRONE_SERVER_PROTO = "https"
         DRONE_GITEA_SERVER = "https://${local.gitea_server}/"
       }
@@ -19,15 +24,13 @@ resource "helm_release" "drone_server" {
       ingress = {
         enabled = true
         annotations = {
-          "kubernetes.io/ingress.class"                             = "traefik"
+          "kubernetes.io/ingress.class"                      = "traefik"
-          "traefik.ingress.kubernetes.io/router.entrypoints"        = "websecure"
+          "traefik.ingress.kubernetes.io/router.entrypoints" = "websecure"
-          "traefik.ingress.kubernetes.io/router.tls"                = "true"
+          "cert-manager.io/cluster-issuer"                   = "acme-thomasklein-me"
-          "traefik.ingress.kubernetes.io/router.tls.certresolver"   = "acme-thomasklein-me"
-          "traefik.ingress.kubernetes.io/router.tls.domains.0.main" = local.ingress_domain
         }
         hosts = [
           {
-            host = local.ingress_domain
+            host = local.drone_domain
             paths = [
               {
                 path     = "/"
@@ -36,6 +39,14 @@ resource "helm_release" "drone_server" {
             ]
           }
         ]
+        tls = [
+          {
+            secretName = "drone-thomasklein.me-tls"
+            hosts = [
+              local.drone_domain,
+            ]
+          }
+        ]
       }
     }),
     jsonencode({

locals.tf

@@ -1,4 +1,7 @@
 locals {
-  gitea_server   = "git.thomasklein.me"
+  gitea_server = "git.thomasklein.me"
-  ingress_domain = "drone.thomasklein.me"
+  drone_domain = "drone.thomasklein.me"
+
+  runner_gc_interval = "5m"
+  runner_cache_size  = "5G"
 }

oauth.tf

@@ -1,6 +1,6 @@
 resource "gitea_oauth2_app" "this" {
   name = "Drone"
   redirect_uris = [
-    "https://drone.thomasklein.me/login",
+    "https://${local.drone_domain}/login",
   ]
 }

provider.tf

@@ -12,12 +12,12 @@ terraform {
 
     helm = {
       source  = "hashicorp/helm"
-      version = "2.5.1"
+      version = "2.8.0"
     }
 
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "2.11.0"
+      version = "~> 2.16.1"
     }
 
   }

runner.tf

@@ -1,10 +1,99 @@
-resource "helm_release" "drone_runner" {
+resource "helm_release" "drone_runner_docker" {
-  name             = "runner"
+  name             = "runner-docker"
-  chart            = "drone-runner-kube"
+  chart            = "drone-runner-docker"
   repository       = "https://charts.drone.io"
+  version          = "0.7.0"
   namespace        = kubernetes_namespace.server.metadata.0.name
   create_namespace = false
 
+  set {
+    name = "image.tag"
+    value = "1.8.4"
+  }
+  set {
+    name = "dind.tag"
+    value = "28-dind"
+  }
+
+  values = [jsonencode({
+    serviceAccount = {
+      create = true
+    }
+    }),
+    jsonencode({
+      env = {
+        DRONE_SERVER_HOST = "https://${local.drone_domain}"
+        DRONE_RPC_HOST    = "${helm_release.drone_server.name}.${helm_release.drone_server.namespace}.svc.k8s.lawndale:8080"
+        DRONE_RPC_PROTO   = "http"
+        DRONE_UI_USERNAME = local.runner_dashboard_user
+        DRONE_RUNNER_NAME = "docker"
+        DRONE_RUNNER_CAPACITY = 10
+      }
+    }),
+    jsonencode({
+      dind = {
+        commandArgs = [
+          "--host",
+          "tcp://localhost:2375",
+          "--mtu",
+          "\"1360\"",
+        ]
+      }
+    }),
+    jsonencode({
+      dind = {
+        resources = {
+          requests = {
+            cpu                 = "250m"
+            memory              = "1G"
+            "ephemeral-storage" = upper(local.runner_cache_size)
+          }
+          limits = {
+            cpu                 = "1"
+            memory              = "3G"
+            "ephemeral-storage" = upper(local.runner_cache_size)
+          }
+        }
+      }
+    }),
+    jsonencode({
+      ingress = {
+        enabled = false
+      }
+    }),
+    jsonencode({
+      gc = {
+        enabled = true
+        env = {
+          GC_INTERVAL = local.runner_gc_interval
+          GC_CACHE    = "${lower(local.runner_cache_size)}b"
+        }
+      }
+    }),
+  ]
+  set_sensitive {
+    name  = "env.DRONE_RPC_SECRET"
+    value = random_password.drone_rpc_secret.result
+  }
+  set_sensitive {
+    name  = "env.DRONE_UI_PASSWORD"
+    value = random_password.runner_dashboard.result
+  }
+}
+
+resource "helm_release" "drone_runner_kube" {
+  name             = "runner-kube"
+  chart            = "drone-runner-kube"
+  repository       = "https://charts.drone.io"
+  version          = "0.1.10"
+  namespace        = kubernetes_namespace.server.metadata.0.name
+  create_namespace = false
+
+  set {
+    name = "image.tag"
+    value = "1.0.0-rc.5"
+  }
+
   values = [jsonencode({
     rbac = {
       buildNamespaces = [
@@ -14,10 +103,23 @@ resource "helm_release" "drone_runner" {
     }),
     jsonencode({
       env = {
-        DRONE_SERVER_HOST       = "https://${local.ingress_domain}"
+        DRONE_SERVER_HOST       = "https://${local.drone_domain}"
-        DRONE_RPC_HOST          = "${helm_release.drone_server.name}.${helm_release.drone_server.namespace}.svc.cluster.local"
+        DRONE_RPC_HOST          = "${helm_release.drone_server.name}.${helm_release.drone_server.namespace}.svc.k8s.lawndale:8080"
         DRONE_RPC_PROTO         = "http"
         DRONE_NAMESPACE_DEFAULT = kubernetes_namespace.jobs.metadata.0.name
+        DRONE_UI_USERNAME       = local.runner_dashboard_user
+      }
+    }),
+    jsonencode({
+      resources = {
+        requests = {
+          cpu    = "100m"
+          memory = "50Mi"
+        }
+        limits = {
+          cpu    = "300m"
+          memory = "200Mi"
+        }
       }
     }),
     jsonencode({
@@ -30,4 +132,8 @@ resource "helm_release" "drone_runner" {
     name  = "env.DRONE_RPC_SECRET"
     value = random_password.drone_rpc_secret.result
   }
+  set_sensitive {
+    name  = "env.DRONE_UI_PASSWORD"
+    value = random_password.runner_dashboard.result
+  }
 }