commit 3ec51f1d66ce87dab3d2b837036030fba51f0c40
parent 73c983582499700a3585ccaf29fd38940459b4ea
Author: Andreas Gruhler <andreas.gruhler@adfinis.com>
Date: Fri, 19 May 2023 00:40:21 +0200
feat: podman driver & mem oversubscription
Diffstat:
19 files changed, 42 insertions(+), 39 deletions(-)
diff --git a/hcl/default/0x0/0x0.nomad b/hcl/default/0x0/0x0.nomad
@@ -43,7 +43,7 @@ job "0x0" {
# Prepare database migrations
task "db-upgrade" {
- driver = "docker"
+ driver = "podman"
volume_mount {
volume = "0x0"
@@ -72,7 +72,7 @@ job "0x0" {
}
task "nginx" {
- driver = "docker"
+ driver = "podman"
config {
image = "nginx:stable-alpine"
@@ -100,7 +100,7 @@ job "0x0" {
}
task "fhost" {
- driver = "docker"
+ driver = "podman"
config {
image = "127.0.0.1:5000/0x0:latest"
diff --git a/hcl/default/aload/aload.nomad b/hcl/default/aload/aload.nomad
@@ -23,7 +23,7 @@ job "aload" {
}
task "aload" {
- driver = "docker"
+ driver = "podman"
config {
image = "127.0.0.1:5000/aload:latest"
diff --git a/hcl/default/ampache/ampache-catalog.nomad b/hcl/default/ampache/ampache-catalog.nomad
@@ -23,7 +23,7 @@ job "ampache-catalog" {
}
task "update-catalog" {
- driver = "docker"
+ driver = "podman"
config {
image = "ampache/ampache:nosql5.5.2"
diff --git a/hcl/default/ampache/ampache.nomad b/hcl/default/ampache/ampache.nomad
@@ -37,7 +37,7 @@ job "ampache" {
}
task "nginx" {
- driver = "docker"
+ driver = "podman"
config {
image = "nginx:stable-alpine"
@@ -65,7 +65,7 @@ job "ampache" {
}
task "ampache" {
- driver = "docker"
+ driver = "podman"
config {
image = "ampache/ampache:nosql"
diff --git a/hcl/default/certbot/certbot.levant b/hcl/default/certbot/certbot.levant
@@ -33,7 +33,7 @@ job "certbot" {
[[ range $i,$d := $Values.domains ]]
task "request-[[ $d ]]" {
- driver = "docker"
+ driver = "podman"
volume_mount {
volume = "certbot-data"
diff --git a/hcl/default/certbot/certbot.nomad b/hcl/default/certbot/certbot.nomad
@@ -44,7 +44,7 @@ job "certbot" {
}
task "request" {
- driver = "docker"
+ driver = "podman"
volume_mount {
volume = "certbot-data"
diff --git a/hcl/default/cv/cv.nomad b/hcl/default/cv/cv.nomad
@@ -26,7 +26,7 @@ job "cv" {
}
task "jekyll" {
- driver = "docker"
+ driver = "podman"
config {
image = "127.0.0.1:5000/jekyll-cv:latest"
@@ -40,7 +40,7 @@ job "cv" {
}
task "nginx" {
- driver = "docker"
+ driver = "podman"
config {
image = "nginx:stable-alpine"
diff --git a/hcl/default/diary/diary.nomad b/hcl/default/diary/diary.nomad
@@ -26,7 +26,7 @@ job "diary" {
}
task "jekyll" {
- driver = "docker"
+ driver = "podman"
config {
image = "127.0.0.1:5000/jekyll-diary:latest"
@@ -40,7 +40,7 @@ job "diary" {
}
task "nginx" {
- driver = "docker"
+ driver = "podman"
config {
image = "nginx:stable-alpine"
diff --git a/hcl/default/git/git.nomad b/hcl/default/git/git.nomad
@@ -44,7 +44,7 @@ job "git" {
}
task "smarthttp" {
- driver = "docker"
+ driver = "podman"
config {
image = "127.0.0.1:5000/git:latest"
@@ -80,7 +80,7 @@ job "git" {
}
task "stagit" {
- driver = "docker"
+ driver = "podman"
config {
image = "127.0.0.1:5000/git:latest"
diff --git a/hcl/default/mastodon/mastodon.nomad b/hcl/default/mastodon/mastodon.nomad
@@ -46,7 +46,7 @@ job "mastodon" {
# Prepare database migrations
task "db-upgrade" {
- driver = "docker"
+ driver = "podman"
volume_mount {
volume = "mastodon"
@@ -77,7 +77,7 @@ job "mastodon" {
}
task "nginx" {
- driver = "docker"
+ driver = "podman"
config {
image = "nginx:stable-alpine"
@@ -105,7 +105,7 @@ job "mastodon" {
}
task "mastodon-web" {
- driver = "docker"
+ driver = "podman"
config {
image = "tootsuite/mastodon:latest"
@@ -132,7 +132,7 @@ job "mastodon" {
}
task "mastodon-streaming" {
- driver = "docker"
+ driver = "podman"
config {
image = "tootsuite/mastodon:latest"
@@ -154,7 +154,7 @@ job "mastodon" {
}
task "mastodon-sidekiq" {
- driver = "docker"
+ driver = "podman"
config {
image = "tootsuite/mastodon:latest"
@@ -180,7 +180,7 @@ job "mastodon" {
}
task "redis" {
- driver = "docker"
+ driver = "podman"
config {
image = "redis:7-alpine"
diff --git a/hcl/default/myheats-demo/myheats-demo.nomad b/hcl/default/myheats-demo/myheats-demo.nomad
@@ -31,7 +31,7 @@ job "myheats-demo" {
}
task "myheats" {
- driver = "docker"
+ driver = "podman"
config {
image = "127.0.0.1:5000/myheats:latest"
@@ -59,7 +59,7 @@ EOT
}
task "nginx" {
- driver = "docker"
+ driver = "podman"
config {
image = "nginx:stable-alpine"
diff --git a/hcl/default/myheats/myheats.nomad b/hcl/default/myheats/myheats.nomad
@@ -26,7 +26,7 @@ job "myheats" {
}
task "jekyll" {
- driver = "docker"
+ driver = "podman"
config {
image = "127.0.0.1:5000/jekyll-myheats:latest"
@@ -40,7 +40,7 @@ job "myheats" {
}
task "nginx" {
- driver = "docker"
+ driver = "podman"
config {
image = "nginx:stable-alpine"
diff --git a/hcl/default/postfix/postfix.nomad b/hcl/default/postfix/postfix.nomad
@@ -14,7 +14,7 @@ job "postfix" {
}
task "postfix" {
- driver = "docker"
+ driver = "podman"
config {
image = "127.0.0.1:5000/postfix:latest"
diff --git a/hcl/default/snibox/snibox.nomad b/hcl/default/snibox/snibox.nomad
@@ -37,7 +37,7 @@ job "snibox" {
}
task "nginx" {
- driver = "docker"
+ driver = "podman"
config {
image = "nginx:stable-alpine"
@@ -65,7 +65,7 @@ job "snibox" {
}
task "server" {
- driver = "docker"
+ driver = "podman"
env {
RAILS_LOG_TO_STDOUT = true
diff --git a/hcl/default/writefreely/writefreely.nomad b/hcl/default/writefreely/writefreely.nomad
@@ -39,7 +39,7 @@ job "writefreely" {
# Prepare database schema
# https://github.com/writefreely/writefreely/blob/develop/docker-setup.sh
task "db-upgrade" {
- driver = "docker"
+ driver = "podman"
config {
image = "docker.io/arm64v8/mysql:latest"
@@ -79,7 +79,7 @@ job "writefreely" {
# this won't overwrite any existing key, and instead outputs a message.
# https://github.com/writefreely/writefreely/blob/develop/docker-setup.sh
task "gen-keys" {
- driver = "docker"
+ driver = "podman"
config {
image = "127.0.0.1:5000/writefreely:latest"
@@ -114,7 +114,7 @@ job "writefreely" {
}
task "writefreely" {
- driver = "docker"
+ driver = "podman"
config {
image = "127.0.0.1:5000/writefreely:latest"
@@ -142,7 +142,7 @@ job "writefreely" {
}
task "nginx" {
- driver = "docker"
+ driver = "podman"
config {
image = "nginx:stable-alpine"
diff --git a/hcl/infra/nfs/plugin-nfs-controller.nomad b/hcl/infra/nfs/plugin-nfs-controller.nomad
@@ -16,7 +16,7 @@ job "plugin-nfs-controller" {
group "controller" {
task "plugin" {
- driver = "docker"
+ driver = "podman"
config {
image = "mcr.microsoft.com/k8s/csi/nfs-csi:latest"
@@ -36,7 +36,8 @@ job "plugin-nfs-controller" {
}
resources {
- memory = 256
+ memory = 50
+ memory_max = 256
cpu = 300
}
}
diff --git a/hcl/infra/nfs/plugin-nfs-nodes.nomad b/hcl/infra/nfs/plugin-nfs-nodes.nomad
@@ -9,7 +9,7 @@ job "plugin-nfs-nodes" {
group "nodes" {
task "plugin" {
- driver = "docker"
+ driver = "podman"
config {
image = "mcr.microsoft.com/k8s/csi/nfs-csi:latest"
@@ -33,7 +33,8 @@ job "plugin-nfs-nodes" {
}
resources {
- memory = 256
+ memory = 50
+ memory_max = 256
cpu = 300
}
}
diff --git a/hcl/infra/registry/public-registry.nomad b/hcl/infra/registry/public-registry.nomad
@@ -27,7 +27,7 @@ job "public-registry" {
}
task "registry" {
- driver = "docker"
+ driver = "podman"
volume_mount {
volume = "registry-data"
diff --git a/hcl/infra/registry/simple-registry.nomad b/hcl/infra/registry/simple-registry.nomad
@@ -22,7 +22,7 @@ job "simple-registry" {
}
task "registry" {
- driver = "docker"
+ driver = "podman"
volume_mount {
volume = "registry-data"
@@ -35,7 +35,8 @@ job "simple-registry" {
}
resources {
- memory = 256
+ memory = 50
+ memory_max = 256
cpu = 300
}
}
