fix: update garden configuration to use manifestTemplates instead of files

Manuel Ruck · Manuel Ruck · commit f38615dd5400 · 2025-04-21T20:09:54.000+02:00
Changed all instances of 'files: [./manifests/*]' to 'manifestTemplates: - ./manifests/*' in various garden.yml files to standardize the configuration format. This improves clarity and consistency across the project.

upgrade garden 0.13 to 0.14

Signed-off-by: Manuel Ruck &lt;git@manuelruck.de&gt;
diff --git a/bundestag.io/admin/garden.yml b/bundestag.io/admin/garden.yml
@@ -33,7 +33,8 @@ variables:
   NON_NAMED_VOTES_AI_SECRET: ${actions.deploy.non-named-votes-ai.var.NON_NAMED_VOTES_AI_SECRET}
 
 spec:
-  files: [./manifests/*] # <--- Tell Garden what manifests to use
+  manifestTemplates:
+    - ./manifests/*
 
   defaultTarget: # <--- This tells Garden what "target" to use for logs, code syncing and more
     kind: Deployment
diff --git a/bundestag.io/admin/manifests/ingress.yaml b/bundestag.io/admin/manifests/ingress.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: 'admin.${var.hostname}'
+    - host: admin.${var.hostname}
       http:
         paths:
           - backend:
diff --git a/bundestag.io/api/garden.yml b/bundestag.io/api/garden.yml
@@ -30,7 +30,8 @@ variables:
   BIO_EDIT_TOKEN: 'TOP_SECRET_LOCAL_TOKEN'
 
 spec:
-  files: [./manifests/*] # <--- Tell Garden what manifests to use
+  manifestTemplates:
+    - ./manifests/*
 
   defaultTarget: # <--- This tells Garden what "target" to use for logs, code syncing and more
     kind: Deployment
diff --git a/bundestag.io/api/manifests/ingress.yaml b/bundestag.io/api/manifests/ingress.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: 'bundestag-io-api.${var.hostname}'
+    - host: bundestag-io-api.${var.hostname}
       http:
         paths:
           - backend:
diff --git a/democracy/desktop/garden.yml b/democracy/desktop/garden.yml
@@ -27,7 +27,8 @@ dependencies:
   - build.democracy-desktop
 
 spec:
-  files: [./manifests/*] # <--- Tell Garden what manifests to use
+  manifestTemplates:
+    - ./manifests/*
 
   defaultTarget: # <--- This tells Garden what "target" to use for logs, code syncing and more
     kind: Deployment
diff --git a/democracy/desktop/manifests/ingress.yaml b/democracy/desktop/manifests/ingress.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: 'desktop.${var.hostname}'
+    - host: desktop.${var.hostname}
       http:
         paths:
           - backend:
diff --git a/infra/democracy-api/garden.yml b/infra/democracy-api/garden.yml
@@ -2,5 +2,5 @@ kind: Deploy
 name: democracy-api
 type: kubernetes
 spec:
-  files:
-    - ./manifests/*
+  manifestTemplates:
+    - ./manifests/*
diff --git a/infra/democracy-api/manifests/Ingress.yaml b/infra/democracy-api/manifests/Ingress.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: 'democracy-api.${var.hostname}'
+    - host: democracy-api.${var.hostname}
       http:
         paths:
           - backend:
diff --git a/infra/mongo/garden.yml b/infra/mongo/garden.yml
@@ -2,5 +2,5 @@ kind: Deploy
 name: mongo
 type: kubernetes
 spec:
-  files:
+  manifestTemplates:
     - ./manifests/*
diff --git a/infra/votes-ai/garden.yml b/infra/votes-ai/garden.yml
@@ -10,5 +10,5 @@ varfiles:
   - ./.env
 
 spec:
-  files:
+  manifestTemplates:
     - ./manifests/*
diff --git a/infra/votes-ai/manifests/Ingress.yaml b/infra/votes-ai/manifests/Ingress.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: 'votes-ai.${var.hostname}'
+    - host: votes-ai.${var.hostname}
       http:
         paths:
           - backend:
diff --git a/project.garden.yml b/project.garden.yml
@@ -1,4 +1,4 @@
-apiVersion: garden.io/v1
+apiVersion: garden.io/v2
 kind: Project
 name: democracy-development
 
diff --git a/services/cron-jobs/cleanup-push-queue/garden.yml b/services/cron-jobs/cleanup-push-queue/garden.yml
@@ -28,7 +28,8 @@ variables:
   DB_URL: mongodb://democracy-mongo:27017/democracy
 
 spec:
-  files: [./manifests/*]
+  manifestTemplates:
+    - ./manifests/*
 
   patchResources:
     - name: cleanup-push-queue
diff --git a/services/cron-jobs/crawler/garden.yml b/services/cron-jobs/crawler/garden.yml
@@ -1,3 +1,23 @@
+kind: Deploy
+name: crawler-config
+type: kubernetes
+
+varfiles:
+  - .env
+  - .env.local
+
+variables:
+  DB_URL: mongodb://democracy-mongo:27017/bundestagio
+
+source:
+  path: manifests # Manifeste liegen hier außerhalb des Action‑Verzeichnisses
+
+spec:
+  manifestTemplates:
+    - configmap.yaml # ---> infra/manifests/configmap.yaml wird angewendet
+    - secret.yaml
+
+---
 kind: Build
 name: import-procedures
 description: Import procedures for the bundestag.io API
@@ -16,69 +36,33 @@ spec:
   extraFlags: ['--load']
 
 ---
-kind: Deploy
+# 2) Run-Aktion: Ad-hoc Kubernetes-Pod für einmalige Imports
+#    Sync wird hier nicht unterstützt. Für Hot-Reload und Entwicklungsmodus siehe Deploy-Aktion.
+kind: Run
 name: import-procedures
-type: kubernetes
-description: Deploy the importer of procedures for the bundestag.io API
-dependencies: [build.import-procedures, deploy.mongo]
+description: Ad-hoc Import-Job für Prozeduren
+# Abhängigkeit zu Mongo-Deploy beibehalten, damit die DB verfügbar ist
+dependencies:
+  - build.import-procedures
+  - deploy.mongo
+  - deploy.crawler-config
 
 varfiles:
   - .env
   - .env.local
 
-variables:
-  DB_URL: mongodb://democracy-mongo:27017/bundestagio
-
+type: kubernetes-pod
 spec:
-  files:
-    - ./manifests/ConfigMap.yaml
-    # - ./manifests/CronJob.yaml
-    - ./manifests/Secret.yaml
-    - ./manifests/Deployment.garden.yaml
-
-  defaultTarget:
-    kind: Deployment
-    name: import-procedures
-
-  sync:
-    paths:
-      - containerPath: /services/cron-jobs/crawler/src
-        sourcePath: src
-        mode: one-way
-    overrides:
-      - command: [pnpm, --filter, crawler, run, garden:dev]
-
-  patchResources:
-    $if: ${this.mode == "sync"}
-    $then:
-      - name: import-procedures
-        kind: Deployment
-        patch:
-          spec:
-            template:
-              spec:
-                containers:
-                  - name: import-procedures
-                    image: ${actions.build.import-procedures.outputs.deploymentImageId}
-      - name: dip-api-token
-        kind: Secret
-        patch:
-          data:
-            DIP_API_KEY: ${base64Encode(var.DIP_API_KEY)}
-    $else:
+  podSpec:
+    restartPolicy: Never
+    containers:
       - name: import-procedures
-        kind: CronJob
-        patch:
-          spec:
-            jobTemplate:
-              spec:
-                template:
-                  spec:
-                    containers:
-                      - name: import-procedures
-                        image: ${actions.build.import-procedures.outputs.deploymentImageId}
-      - name: dip-api-token
-        kind: Secret
-        patch:
-          data:
-            DIP_API_KEY: ${base64Encode(var.DIP_API_KEY)}
+        image: ${actions.build.import-procedures.outputs.deploymentImageId}
+        imagePullPolicy: IfNotPresent
+        envFrom:
+          - configMapRef:
+              name: crawler-config
+          - secretRef:
+              name: dip-api-token
+# Optional: TTL für automatische Aufräumung (wenn unterstützt)
+#    ttlSecondsAfterFinished: 300
diff --git a/services/cron-jobs/crawler/manifests/Deployment.garden.yaml b/services/cron-jobs/crawler/manifests/Deployment.garden.yaml
diff --git a/services/cron-jobs/crawler/manifests/Secret.yaml b/services/cron-jobs/crawler/manifests/Secret.yaml
@@ -3,3 +3,7 @@ kind: Secret
 metadata:
   name: dip-api-token
 type: Opaque
+
+stringData:
+  # Der Wert wird aus den geladenen Varfiles (.env/.env.local) entnommen
+  DIP_API_KEY: ${variables.DIP_API_KEY}
diff --git a/services/cron-jobs/import-deputy-profiles/garden.yml b/services/cron-jobs/import-deputy-profiles/garden.yml
@@ -28,7 +28,8 @@ variables:
   DB_URL: mongodb://democracy-mongo:27017/bundestagio
 
 spec:
-  files: [./manifests/*]
+  manifestTemplates:
+    - ./manifests/*
 
   patchResources:
     - name: import-deputy-profiles
diff --git a/services/cron-jobs/import-named-poll-deputies/garden.yml b/services/cron-jobs/import-named-poll-deputies/garden.yml
@@ -28,7 +28,8 @@ variables:
   DB_URL: mongodb://democracy-mongo:27017/bundestagio
 
 spec:
-  files: [./manifests/*]
+  manifestTemplates:
+    - ./manifests/*
 
   patchResources:
     - name: import-named-poll-deputies
diff --git a/services/cron-jobs/import-named-polls/garden.yml b/services/cron-jobs/import-named-polls/garden.yml
@@ -28,7 +28,8 @@ variables:
   DB_URL: mongodb://democracy-mongo:27017/bundestagio
 
 spec:
-  files: [./manifests/*]
+  manifestTemplates:
+    - ./manifests/*
 
   patchResources:
     - name: import-named-polls
diff --git a/services/cron-jobs/import-plenary-minutes/garden.yml b/services/cron-jobs/import-plenary-minutes/garden.yml
@@ -28,7 +28,8 @@ variables:
   DB_URL: mongodb://democracy-mongo:27017/bundestagio
 
 spec:
-  files: [./manifests/*]
+  manifestTemplates:
+    - ./manifests/*
 
   patchResources:
     - name: import-plenary-minutes
diff --git a/services/cron-jobs/index-sync-bundestagio/garden.yml b/services/cron-jobs/index-sync-bundestagio/garden.yml
@@ -28,7 +28,8 @@ variables:
   DB_URL: mongodb://democracy-mongo:27017/bundestagio
 
 spec:
-  files: [./manifests/*]
+  manifestTemplates:
+    - ./manifests/*
 
   patchResources:
     - name: index-sync-bundestagio
diff --git a/services/cron-jobs/index-sync-democracy/garden.yml b/services/cron-jobs/index-sync-democracy/garden.yml
@@ -28,7 +28,8 @@ variables:
   DB_URL: mongodb://democracy-mongo:27017/democracy
 
 spec:
-  files: [./manifests/*]
+  manifestTemplates:
+    - ./manifests/*
 
   patchResources:
     - name: index-sync-democracy
diff --git a/services/cron-jobs/push-send-queued/garden.yml b/services/cron-jobs/push-send-queued/garden.yml
@@ -31,7 +31,8 @@ variables:
   DB_URL: mongodb://democracy-mongo:27017/democracy
 
 spec:
-  files: [./manifests/*]
+  manifestTemplates:
+    - ./manifests/*
 
   patchResources:
     - name: push-send-queued
diff --git a/services/cron-jobs/queue-pushs-conference-week/garden.yml b/services/cron-jobs/queue-pushs-conference-week/garden.yml
@@ -28,7 +28,8 @@ variables:
   DB_URL: mongodb://democracy-mongo:27017/democracy
 
 spec:
-  files: [./manifests/*]
+  manifestTemplates:
+    - ./manifests/*
 
   patchResources:
     - name: queue-pushs-conference-week
diff --git a/services/cron-jobs/queue-pushs-vote-conference-week/garden.yml b/services/cron-jobs/queue-pushs-vote-conference-week/garden.yml
@@ -28,7 +28,8 @@ variables:
   DB_URL: mongodb://democracy-mongo:27017/democracy
 
 spec:
-  files: [./manifests/*]
+  manifestTemplates:
+    - ./manifests/*
 
   patchResources:
     - name: queue-pushs-vote-conference-week
diff --git a/services/cron-jobs/queue-pushs-vote-top-100/garden.yml b/services/cron-jobs/queue-pushs-vote-top-100/garden.yml
@@ -28,7 +28,8 @@ variables:
   DB_URL: mongodb://democracy-mongo:27017/democracy
 
 spec:
-  files: [./manifests/*]
+  manifestTemplates:
+    - ./manifests/*
 
   patchResources:
     - name: queue-pushs-vote-top-100
diff --git a/services/cron-jobs/shedule-bio-resync/garden.yml b/services/cron-jobs/shedule-bio-resync/garden.yml
@@ -28,7 +28,8 @@ variables:
   DB_URL: mongodb://democracy-mongo:27017/democracy
 
 spec:
-  files: [./manifests/*]
+  manifestTemplates:
+    - ./manifests/*
 
   patchResources:
     - name: shedule-bio-resync
diff --git a/services/cron-jobs/sync-deputy-profiles/garden.yml b/services/cron-jobs/sync-deputy-profiles/garden.yml
@@ -29,7 +29,8 @@ variables:
   BUNDESTAGIO_SERVER_URL: http://bundestag-io-api
 
 spec:
-  files: [./manifests/*]
+  manifestTemplates:
+    - ./manifests/*
 
   patchResources:
     - name: sync-deputy-profiles
diff --git a/services/cron-jobs/sync-named-polls/garden.yml b/services/cron-jobs/sync-named-polls/garden.yml
diff --git a/services/cron-jobs/sync-procedures/garden.yml b/services/cron-jobs/sync-procedures/garden.yml
diff --git a/services/non-named-votes-ai/garden.yml b/services/non-named-votes-ai/garden.yml
diff --git a/services/non-named-votes-ai/manifests/ingress.yaml b/services/non-named-votes-ai/manifests/ingress.yaml
diff --git a/services/procedures/garden.yml b/services/procedures/garden.yml
diff --git a/services/procedures/manifests/ingress.yaml b/services/procedures/manifests/ingress.yaml
diff --git a/services/qr-code-handler/garden.yml b/services/qr-code-handler/garden.yml
diff --git a/services/qr-code-handler/manifests/ingress.yaml b/services/qr-code-handler/manifests/ingress.yaml
