replace containers,www with svtree modules equivalents

Signed-off-by: Robert Günzler <r@gnzler.io>

14 files changed, 0 insertions, 130 deletions

diff --git a/bundles/containers/files/etc/containers/containers.conf.d/10-firewall-driver.conf b/bundles/containers/files/etc/containers/containers.conf.d/10-firewall-driver.conf
deleted file mode 100644
index be33d99..0000000
--- a/bundles/containers/files/etc/containers/containers.conf.d/10-firewall-driver.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[network]
-firewall_driver = "nftables"
diff --git a/bundles/containers/files/etc/init.d/podman-healthcheck b/bundles/containers/files/etc/init.d/podman-healthcheck
deleted file mode 100644
index 8e12fa4..0000000
--- a/bundles/containers/files/etc/init.d/podman-healthcheck
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-
-description="Run podman healthchecks when containers start."
-
-supervisor=supervise-daemon
-command="/bin/podman-healthcheckd"
-
-depend()
-{
-        need localmount
-}
diff --git a/bundles/containers/files/etc/periodic/15min/podman-healthcheck b/bundles/containers/files/etc/periodic/15min/podman-healthcheck
deleted file mode 100755
index 7aa6d41..0000000
--- a/bundles/containers/files/etc/periodic/15min/podman-healthcheck
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eu
-/bin/podman-healthcheck >/dev/null 2>&1
-exit 0
diff --git a/bundles/containers/files/etc/periodic/weekly/podman-prune b/bundles/containers/files/etc/periodic/weekly/podman-prune
deleted file mode 100755
index 5715b95..0000000
--- a/bundles/containers/files/etc/periodic/weekly/podman-prune
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eu
-/usr/bin/podman system prune --force --all --volumes >/dev/null 2>&1
-exit 0
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/consumer-for b/bundles/containers/files/etc/s6-rc/templates/container/+service-log/consumer-for
deleted file mode 100644
index 83c1762..0000000
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/consumer-for
+++ /dev/null
@@ -1 +0,0 @@
-+service-srv
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/notification-fd b/bundles/containers/files/etc/s6-rc/templates/container/+service-log/notification-fd
deleted file mode 100644
index 00750ed..0000000
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/pipeline-name b/bundles/containers/files/etc/s6-rc/templates/container/+service-log/pipeline-name
deleted file mode 100644
index 0db7d83..0000000
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/pipeline-name
+++ /dev/null
@@ -1 +0,0 @@
-+service
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/run b/bundles/containers/files/etc/s6-rc/templates/container/+service-log/run
deleted file mode 100644
index d558f3c..0000000
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/execlineb -P
-
-envfile -I /etc/s6-rc/system.conf
-importas -sCuD "/run/log" s6_log_dir s6_log_dir
-
-envfile -I /etc/s6-rc/+service.conf
-importas -sCuD "n3 s2000000 T" s6_log_directives s6_log_directives
-
-foreground { install -d ${s6_log_dir}/+service }
-exec -c s6-log -d3 -b -- ${s6_log_directives} ${s6_log_dir}/+service
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/type b/bundles/containers/files/etc/s6-rc/templates/container/+service-log/type
deleted file mode 100644
index 5883cff..0000000
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/producer-for b/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/producer-for
deleted file mode 100644
index cba6eea..0000000
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/producer-for
+++ /dev/null
@@ -1 +0,0 @@
-+service-log
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/run b/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/run
deleted file mode 100755
index 3ca06e2..0000000
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/run
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/execlineb -P
-
-# load location of deployments from system config
-envfile /etc/s6-rc/system.conf
-importas -iu deployments_dir deployments_dir
-
-# route all logs to stdout
-fdmove -c 2 1
-
-ifthenelse { eltest -e ${deployments_dir}/+service/secret.yaml }
-{
-	foreground { podman secret rm -i +service }
-	foreground { podman secret create +service ${deployments_dir}/+service/secret.yaml }
-}
-{
-	# noop
-}
-
-exec podman play kube \
-	--log-driver=passthrough \
-	--replace \
-	--wait \
-	${deployments_dir}/+service/kube.yaml
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/type b/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/type
deleted file mode 100644
index 5883cff..0000000
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
diff --git a/bundles/containers/items.py b/bundles/containers/items.py
deleted file mode 100644
index ea5b341..0000000
--- a/bundles/containers/items.py
+++ /dev/null
@@ -1,62 +0,0 @@
-if node.os != "alpine":
-    raise BundleError(f"{node.name}: OS {node.os} is not supported.")
-
-from os.path import join
-
-# TODO: healthcheck metrics?
-svc_openrc = {
-    "podman-healthcheck": {
-        "runlevel": "default",
-        "enabled": True,
-        "needs": {"file:/etc/init.d/podman-healthcheck"},
-    },
-}
-
-directories = {
-    "/etc/s6-rc/src/containers/contents.d": { 'purge': True },
-}
-
-files = {
-    "/etc/containers/containers.conf.d/10-firewall-driver.conf": {
-        "needs": {
-            "bundle:firewall",
-        },
-    },
-
-    "/etc/s6-rc/templates/container/+service-srv/run": { "mode": "0755" },
-    "/etc/s6-rc/templates/container/+service-log/run": { "mode": "0755" },
-    "/etc/s6-rc/src/default/contents.d/containers": {
-        "content_type": "text",
-        "content": "",
-        "triggers": {
-            "svc_openrc:svtree:reload",
-        },
-    },
-    "/etc/s6-rc/src/containers/type": {
-        "content_type": "text",
-        "content": "bundle",
-        "triggers": {
-            "svc_openrc:svtree:reload",
-        },
-    },
-
-    "/bin/podman-healthcheck": { "mode": "0755" },
-    "/etc/periodic/15min/podman-healthcheck": { "mode": "0755" },
-    "/etc/periodic/weekly/podman-prune": { "mode": "0755" },
-    "/bin/podman-healthcheckd": { "mode": "0755" },
-    "/etc/init.d/podman-healthcheck": { "mode": "0755" },
-}
-
-repo.libs.gen.add_files_recursive(
-    files,
-    join(repo.path, "bundles", "containers", "files"),
-)
-
-for container, _ in node.metadata.get("containers", {}).items():
-    svc_s6rc[container] = {
-        "bundle": "containers",
-        "generate": "container",
-        "triggers": {
-            "svc_openrc:svtree:reload",
-        },
-    }
diff --git a/bundles/containers/metadata.py b/bundles/containers/metadata.py
deleted file mode 100644
index dc5832c..0000000
--- a/bundles/containers/metadata.py
+++ /dev/null
@@ -1,8 +0,0 @@
-defaults = {
-    "apk": {
-        "packages": {
-            "crun": {},
-            "podman": {},
-        },
-    },
-}