From 36c74789df3a72eeac563e3188936ec141f5bc58 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Wed, 18 Oct 2023 19:50:33 +0200 Subject: [PATCH 1/9] jenkins health check --- apps/jenkins/live.hcl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/jenkins/live.hcl b/apps/jenkins/live.hcl index dc3bdc6..e6a883d 100644 --- a/apps/jenkins/live.hcl +++ b/apps/jenkins/live.hcl @@ -21,6 +21,12 @@ job "jenkins" { "traefik.enable=true", "traefik.http.routers.jenkins.rule=Host(`jenkins.service.nr5`)", ] + check { + type = "http" + path = "/login" + interval = "60s" + timeout = "10s" + } } volume "jenkins-master" { @@ -52,10 +58,10 @@ job "jenkins" { JAVA_OPTS = "-Dhudson.footerURL=http://jenkins.service.nr5" } resources { - cpu = 200 - memory = 256 + cpu = 500 + memory = 512 } } } -} \ No newline at end of file +} From 4cfb1e0b3b669bfd293cd1ca1d6f1ae691b33359 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sat, 21 Oct 2023 17:17:34 +0200 Subject: [PATCH 2/9] traefik with the system scheduler --- _sys/traefik.hcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_sys/traefik.hcl b/_sys/traefik.hcl index 4ca421b..0c1e330 100644 --- a/_sys/traefik.hcl +++ b/_sys/traefik.hcl @@ -1,10 +1,10 @@ job "traefik" { region = "global" datacenters = ["nummer5"] - type = "service" + type = "system" group "traefik" { - count = 5 + #count = 5 constraint { operator = "distinct_hosts" From cfb79fc709fb7999d142262e4c207f8b1a20c045 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sat, 21 Oct 2023 19:17:26 +0200 Subject: [PATCH 3/9] drone here? --- .drone.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..28b5e7e --- /dev/null +++ b/.drone.yml @@ -0,0 +1,11 @@ +--- +kind: pipeline +type: docker +name: nomad-nummer5 + +steps: +- name: test + image: alpine + commands: + - echo hello + - echo world From eb870f34ef96e02e8443fef0bcdcf397b11c515e Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sat, 21 Oct 2023 19:18:52 +0200 Subject: [PATCH 4/9] drone CI --- apps/drone/live-runner.hcl | 69 +++++++++++++++++++++++++++++++++++ apps/drone/live.hcl | 71 ++++++++++++++++++++++++++++++++++++ apps/drone/volume-runner.hcl | 20 ++++++++++ apps/drone/volume.hcl | 21 +++++++++++ 4 files changed, 181 insertions(+) create mode 100644 apps/drone/live-runner.hcl create mode 100644 apps/drone/live.hcl create mode 100644 apps/drone/volume-runner.hcl create mode 100644 apps/drone/volume.hcl diff --git a/apps/drone/live-runner.hcl b/apps/drone/live-runner.hcl new file mode 100644 index 0000000..a48844c --- /dev/null +++ b/apps/drone/live-runner.hcl @@ -0,0 +1,69 @@ +job "drone-runner" { + datacenters = [ + "nummer5", + ] + type = "service" + + group "apps" { + count = 1 + + network { + mode = "host" + port "http" { + to = 3000 + } + + } + + service { + name = "drone-runner" + port = "http" + } + + volume "drone-runner" { + type = "csi" + source = "drone-runner" + read_only = false + access_mode = "single-node-writer" + attachment_mode = "file-system" + } + + restart { + attempts = 5 + delay = "30s" + } + + task "drone-runner" { + driver = "podman" + volume_mount { + volume = "drone-runner" + destination = "/data" + read_only = false + } + + config { + image = "docker.io/drone/drone-runner-docker:1" + ports = ["http"] + volumes = [ + "/var/run/podman/podman.sock:/var/run/docker.sock", + "/etc/containers:/etc/containers" + ] + + } + + env { + TZ = "Europe/Berlin" + DRONE_RUNNER_NAME = "drone-runner01" + DRONE_RPC_SECRET = "7eb685ed81d0c34bafc5efa7783c20b2" + DRONE_RPC_HOST = "drone.service.nr5" + DRONE_RPC_PROTO = "http" + } + + resources { + cpu = 200 + memory = 128 + } + + } + } +} diff --git a/apps/drone/live.hcl b/apps/drone/live.hcl new file mode 100644 index 0000000..95cc19b --- /dev/null +++ b/apps/drone/live.hcl @@ -0,0 +1,71 @@ +job "drone" { + datacenters = [ + "nummer5", + ] + type = "service" + + group "apps" { + count = 1 + + network { + mode = "host" + port "http" { + to = 80 + } + + } + + service { + name = "drone" + port = "http" + + tags = [ + "traefik.enable=true", + "traefik.http.routers.drone.rule=Host(`drone.service.nr5`)", + ] + } + + volume "drone-data" { + type = "csi" + source = "drone-data" + read_only = false + access_mode = "single-node-writer" + attachment_mode = "file-system" + } + + restart { + attempts = 5 + delay = "30s" + } + + task "drone" { + driver = "podman" + volume_mount { + volume = "drone-data" + destination = "/data" + read_only = false + } + + config { + image = "docker.io/drone/drone:2" + ports = ["http"] + } + + env { + TZ = "Europe/Berlin" + DRONE_GITEA_SERVER = "http://gitea.service.nr5" + DRONE_GITEA_CLIENT_ID = "6c48da2c-2748-438e-b776-51f41d3fe607" + DRONE_GITEA_CLIENT_SECRET = "gto_ewohqwympejkb52veheox6doc4juodojyyvph4yf4gekhgtx7zna" + DRONE_RPC_SECRET = "7eb685ed81d0c34bafc5efa7783c20b2" + DRONE_SERVER_HOST = "drone.service.nr5" + DRONE_SERVER_PROTO = "http" + } + + resources { + cpu = 200 + memory = 128 + } + + } + } +} diff --git a/apps/drone/volume-runner.hcl b/apps/drone/volume-runner.hcl new file mode 100644 index 0000000..bb6c155 --- /dev/null +++ b/apps/drone/volume-runner.hcl @@ -0,0 +1,20 @@ +type = "csi" +id = "drone-runner" +name = "drone-runner" +plugin_id = "nfs" + +capability { + access_mode = "single-node-writer" + attachment_mode = "file-system" +} + +context { + server = "ebin01.wks" + share = "/data/raid1-ssd/app-data/drone-runner" + mountPermissions = "0" +} + +mount_options { + fs_type = "nfs" + mount_flags = [ "timeo=30", "vers=3", "_netdev" , "nolock" ] +} diff --git a/apps/drone/volume.hcl b/apps/drone/volume.hcl new file mode 100644 index 0000000..3e49b20 --- /dev/null +++ b/apps/drone/volume.hcl @@ -0,0 +1,21 @@ +type = "csi" +id = "drone-data" +name = "drone-data" +plugin_id = "nfs" +external_id = "drone-data" + +capability { + access_mode = "single-node-writer" + attachment_mode = "file-system" +} + +context { + server = "ebin02.wks" + share = "/data/raid1-ssd/app-data/drone-data" + mountPermissions = "0" +} + +mount_options { + fs_type = "nfs" + mount_flags = [ "timeo=30", "vers=3", "_netdev" , "nolock" ] +} From 8d773916011c428d91d2284c5f12f8754378b753 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sat, 21 Oct 2023 19:20:37 +0200 Subject: [PATCH 5/9] drone here? --- .drone.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 28b5e7e..0000000 --- a/.drone.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -kind: pipeline -type: docker -name: nomad-nummer5 - -steps: -- name: test - image: alpine - commands: - - echo hello - - echo world From 97b68b1baa5131e7b482e9b3dfefb049cd37acda Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sat, 21 Oct 2023 19:20:58 +0200 Subject: [PATCH 6/9] drone here? --- .drone.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..28b5e7e --- /dev/null +++ b/.drone.yml @@ -0,0 +1,11 @@ +--- +kind: pipeline +type: docker +name: nomad-nummer5 + +steps: +- name: test + image: alpine + commands: + - echo hello + - echo world From ede29d581fd2bcfe50444feeedf9a3a56666c371 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sat, 21 Oct 2023 19:26:14 +0200 Subject: [PATCH 7/9] drone here? --- .drone.yml | 1 - apps/drone/live-runner.hcl | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 28b5e7e..84eb940 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,4 +1,3 @@ ---- kind: pipeline type: docker name: nomad-nummer5 diff --git a/apps/drone/live-runner.hcl b/apps/drone/live-runner.hcl index a48844c..281d981 100644 --- a/apps/drone/live-runner.hcl +++ b/apps/drone/live-runner.hcl @@ -53,6 +53,9 @@ job "drone-runner" { env { TZ = "Europe/Berlin" + DRONE_GITEA_SERVER = "http://gitea.service.nr5" + DRONE_GITEA_CLIENT_ID = "6c48da2c-2748-438e-b776-51f41d3fe607" + DRONE_GITEA_CLIENT_SECRET = "gto_ewohqwympejkb52veheox6doc4juodojyyvph4yf4gekhgtx7zna" DRONE_RUNNER_NAME = "drone-runner01" DRONE_RPC_SECRET = "7eb685ed81d0c34bafc5efa7783c20b2" DRONE_RPC_HOST = "drone.service.nr5" From 6057353b4647f78a76646a92e2f8717b7999adf3 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sat, 21 Oct 2023 19:39:36 +0200 Subject: [PATCH 8/9] drone here? --- apps/drone/live.hcl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/drone/live.hcl b/apps/drone/live.hcl index 95cc19b..9b90244 100644 --- a/apps/drone/live.hcl +++ b/apps/drone/live.hcl @@ -53,6 +53,7 @@ job "drone" { env { TZ = "Europe/Berlin" + DRONE_GIT_ALWAYS_AUTH = true DRONE_GITEA_SERVER = "http://gitea.service.nr5" DRONE_GITEA_CLIENT_ID = "6c48da2c-2748-438e-b776-51f41d3fe607" DRONE_GITEA_CLIENT_SECRET = "gto_ewohqwympejkb52veheox6doc4juodojyyvph4yf4gekhgtx7zna" @@ -62,7 +63,7 @@ job "drone" { } resources { - cpu = 200 + cpu = 100 memory = 128 } From 17e764be59ba6618dff16058710248f2e2c24528 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sat, 21 Oct 2023 19:44:37 +0200 Subject: [PATCH 9/9] liverunner resources --- apps/drone/live-runner.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/drone/live-runner.hcl b/apps/drone/live-runner.hcl index 281d981..cc1f345 100644 --- a/apps/drone/live-runner.hcl +++ b/apps/drone/live-runner.hcl @@ -63,7 +63,7 @@ job "drone-runner" { } resources { - cpu = 200 + cpu = 500 memory = 128 }