source container image version from metadata

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

16 files changed, 29 insertions, 15 deletions

diff --git a/bundles/authelia/files/kube.yaml b/bundles/authelia/files/kube.yaml
index cda7d2c..78ad0a3 100644
--- a/bundles/authelia/files/kube.yaml
+++ b/bundles/authelia/files/kube.yaml
@@ -32,7 +32,7 @@ spec:
   imagePullPolicy: Always
   containers:
     - name: authelia
-      image: ghcr.io/authelia/authelia:4.39.4
+      image: ghcr.io/authelia/authelia:${version}
       envFrom:
         - configMapRef:
             name: authelia
diff --git a/bundles/authelia/items.py b/bundles/authelia/items.py
index 0ac3a71..b7711c0 100644
--- a/bundles/authelia/items.py
+++ b/bundles/authelia/items.py
@@ -17,7 +17,7 @@ files = {
 
     "/etc/deployments/authelia/kube.yaml": {
         "content_type": "mako",
-        "source": "kube.yaml",
+        "context": node.metadata.get("containers")["authelia"],
         "triggers": {"svc_s6rc:authelia:restart"},
     },
     "/etc/deployments/authelia/secret.yaml": {
diff --git a/bundles/authelia/metadata.py b/bundles/authelia/metadata.py
index 294e295..b502cac 100644
--- a/bundles/authelia/metadata.py
+++ b/bundles/authelia/metadata.py
@@ -5,7 +5,9 @@ defaults = {
         }
     },
     "containers": {
-        "authelia": {},
+        "authelia": {
+            "version": "4.39.15"
+        },
     },
     "metrics": {
         "authelia": {},
diff --git a/bundles/immich/files/kube.yaml b/bundles/immich/files/kube.yaml
index 9ea3661..18f5cf6 100644
--- a/bundles/immich/files/kube.yaml
+++ b/bundles/immich/files/kube.yaml
@@ -23,7 +23,7 @@ spec:
   dnsPolicy: Default
   containers:
     - name: immich
-      image: ghcr.io/immich-app/immich-server:v1.140.1
+      image: ghcr.io/immich-app/immich-server:v${version}
       envFrom:
         - secretRef:
             name: immich
diff --git a/bundles/immich/items.py b/bundles/immich/items.py
index 450027c..2e67eb3 100644
--- a/bundles/immich/items.py
+++ b/bundles/immich/items.py
@@ -1,5 +1,7 @@
 files = {
     "/etc/deployments/immich/kube.yaml": {
+        "content_type": "mako",
+        "context": node.metadata.get("containers")["immich"],
         "triggers": {"svc_s6rc:immich:restart"},
     },
     "/etc/deployments/immich/secret.yaml": {
diff --git a/bundles/immich/metadata.py b/bundles/immich/metadata.py
index 2a0a806..30b9eb3 100644
--- a/bundles/immich/metadata.py
+++ b/bundles/immich/metadata.py
@@ -9,7 +9,9 @@ defaults = {
         }
     },
     "containers": {
-        "immich": {},
+        "immich": {
+            "version": "2.4.1",
+        },
     },
     # "metrics": {
     #     "immich": {},
diff --git a/bundles/jellyfin/files/kube.yaml b/bundles/jellyfin/files/kube.yaml
index fb6897c..f0f1668 100644
--- a/bundles/jellyfin/files/kube.yaml
+++ b/bundles/jellyfin/files/kube.yaml
@@ -32,7 +32,7 @@ spec:
   dnsPolicy: Default
   containers:
     - name: jellyfin
-      image: ghcr.io/jellyfin/jellyfin:10.10.7
+      image: ghcr.io/jellyfin/jellyfin:${version}
       envFrom:
       - configMapRef:
           name: jellyfin
diff --git a/bundles/jellyfin/items.py b/bundles/jellyfin/items.py
index 5ed07ef..f612261 100644
--- a/bundles/jellyfin/items.py
+++ b/bundles/jellyfin/items.py
@@ -19,8 +19,8 @@ files = {
     },
 
     "/etc/deployments/jellyfin/kube.yaml": {
-        "content_type": "text",
-        "source": "kube.yaml",
+        "content_type": "mako",
+        "context": node.metadata.get("containers")["jellyfin"],
         "triggers": {"svc_s6rc:jellyfin:restart"},
     },
 }
diff --git a/bundles/jellyfin/metadata.py b/bundles/jellyfin/metadata.py
index a614afd..dc33c38 100644
--- a/bundles/jellyfin/metadata.py
+++ b/bundles/jellyfin/metadata.py
@@ -8,7 +8,9 @@ defaults = {
         }
     },
     "containers": {
-        "jellyfin": {},
+        "jellyfin": {
+            "version": "10.11.6",
+        },
     },
     "metrics": {
         "jellyfin": {},
diff --git a/bundles/miniflux/files/kube.yaml b/bundles/miniflux/files/kube.yaml
index 83b7edf..01fc091 100644
--- a/bundles/miniflux/files/kube.yaml
+++ b/bundles/miniflux/files/kube.yaml
@@ -36,7 +36,7 @@ spec:
   dnsPolicy: Default
   containers:
     - name: miniflux
-      image: docker.io/miniflux/miniflux:2.2.10
+      image: docker.io/miniflux/miniflux:${version}
       ports:
         - containerPort: 8080
           protocol: TCP
diff --git a/bundles/miniflux/items.py b/bundles/miniflux/items.py
index 8245778..93af00c 100644
--- a/bundles/miniflux/items.py
+++ b/bundles/miniflux/items.py
@@ -1,6 +1,7 @@
 files = {
     "/etc/deployments/miniflux/kube.yaml": {
-        "content_type": "text",
+        "content_type": "mako",
+        "context": node.metadata.get("containers")["miniflux"],
         "triggers": {"svc_s6rc:miniflux:restart"},
     },
     "/etc/deployments/miniflux/secret.yaml": {
diff --git a/bundles/miniflux/metadata.py b/bundles/miniflux/metadata.py
index a6e3b41..fc7abef 100644
--- a/bundles/miniflux/metadata.py
+++ b/bundles/miniflux/metadata.py
@@ -5,7 +5,9 @@ defaults = {
         }
     },
     "containers": {
-        "miniflux": {},
+        "miniflux": {
+            "version": "2.2.16",
+        },
     },
     "metrics": {
         "miniflux": {}
diff --git a/bundles/traefik/files/kube.yaml b/bundles/traefik/files/kube.yaml
index 5c2298a..2849091 100644
--- a/bundles/traefik/files/kube.yaml
+++ b/bundles/traefik/files/kube.yaml
@@ -32,7 +32,7 @@ spec:
   dnsPolicy: Default
   containers:
     - name: traefik
-      image: docker.io/library/traefik:v3.4.3
+      image: index.docker.io/library/traefik:v${version}
       args:
         - --log.level=info
         - --accesslog=true
diff --git a/bundles/traefik/items.py b/bundles/traefik/items.py
index 9ed76aa..8b4eec7 100644
--- a/bundles/traefik/items.py
+++ b/bundles/traefik/items.py
@@ -1,6 +1,7 @@
 files = {
     "/etc/deployments/traefik/kube.yaml": {
         "content_type": "mako",
+        "context": node.metadata.get("containers")["traefik"],
         "triggers": {"svc_s6rc:traefik:restart"},
     },
     "/etc/deployments/traefik/secret.yaml": {
diff --git a/bundles/traefik/metadata.py b/bundles/traefik/metadata.py
index e90f053..a44e46f 100644
--- a/bundles/traefik/metadata.py
+++ b/bundles/traefik/metadata.py
@@ -1,6 +1,8 @@
 defaults = {
     "containers": {
-        "traefik": {},
+        "traefik": {
+            "version": "3.6.7"
+        },
     },
     "metrics": {
         "traefik": {},
diff --git a/bundles/vaultwarden/files/kube.yaml b/bundles/vaultwarden/files/kube.yaml
index edb0b9b..e9af2ca 100644
--- a/bundles/vaultwarden/files/kube.yaml
+++ b/bundles/vaultwarden/files/kube.yaml
@@ -16,7 +16,7 @@ spec:
   dnsPolicy: Default
   containers:
     - name: vaultwarden
-      image: ghcr.io/dani-garcia/vaultwarden:1.34.1-alpine
+      image: ghcr.io/dani-garcia/vaultwarden:${version}-alpine
       volumeMounts:
         - name: data
           mountPath: /data