replace containers,www with svtree modules equivalents

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

14 files changed, 4 insertions, 62 deletions

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/files/etc/containers/containers.conf.d/10-firewall-driver.conf b/bundles/svtree-containers/files/etc/containers/containers.conf.d/10-firewall-driver.conf
index be33d99..be33d99 100644
--- a/bundles/containers/files/etc/containers/containers.conf.d/10-firewall-driver.conf
+++ b/bundles/svtree-containers/files/etc/containers/containers.conf.d/10-firewall-driver.conf
diff --git a/bundles/containers/files/etc/init.d/podman-healthcheck b/bundles/svtree-containers/files/etc/init.d/podman-healthcheck
index 8e12fa4..8e12fa4 100644
--- a/bundles/containers/files/etc/init.d/podman-healthcheck
+++ b/bundles/svtree-containers/files/etc/init.d/podman-healthcheck
diff --git a/bundles/containers/files/etc/periodic/15min/podman-healthcheck b/bundles/svtree-containers/files/etc/periodic/15min/podman-healthcheck
index 7aa6d41..7aa6d41 100755
--- a/bundles/containers/files/etc/periodic/15min/podman-healthcheck
+++ b/bundles/svtree-containers/files/etc/periodic/15min/podman-healthcheck
diff --git a/bundles/containers/files/etc/periodic/weekly/podman-prune b/bundles/svtree-containers/files/etc/periodic/weekly/podman-prune
index 5715b95..5715b95 100755
--- a/bundles/containers/files/etc/periodic/weekly/podman-prune
+++ b/bundles/svtree-containers/files/etc/periodic/weekly/podman-prune
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/consumer-for b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-log/consumer-for
index 83c1762..83c1762 100644
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/consumer-for
+++ b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-log/consumer-for
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/notification-fd b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-log/notification-fd
index 00750ed..00750ed 100644
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/notification-fd
+++ b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-log/notification-fd
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/pipeline-name b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-log/pipeline-name
index 0db7d83..0db7d83 100644
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/pipeline-name
+++ b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-log/pipeline-name
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/run b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-log/run
index d558f3c..d558f3c 100644
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/run
+++ b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-log/run
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/type b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-log/type
index 5883cff..5883cff 100644
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-log/type
+++ b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-log/type
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/producer-for b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-srv/producer-for
index cba6eea..cba6eea 100644
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/producer-for
+++ b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-srv/producer-for
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/run b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-srv/run
index 3ca06e2..3ca06e2 100755
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/run
+++ b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-srv/run
diff --git a/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/type b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-srv/type
index 5883cff..5883cff 100644
--- a/bundles/containers/files/etc/s6-rc/templates/container/+service-srv/type
+++ b/bundles/svtree-containers/files/etc/s6-rc/templates/container/+service-srv/type
diff --git a/bundles/containers/metadata.py b/bundles/svtree-containers/metadata.py
index dc5832c..85fa34b 100644
--- a/bundles/containers/metadata.py
+++ b/bundles/svtree-containers/metadata.py
@@ -3,6 +3,10 @@ defaults = {
         "packages": {
             "crun": {},
             "podman": {},
+            "prometheus-podman-exporter": {},
         },
     },
+    "metrics": {
+        "podman": {},
+    },
 }