v2 app deployment--templating mainly in manifest now.

openproject/worker-deployment.yaml

@@ -43,7 +43,7 @@ spec:
                 accessModes: ["ReadWriteOnce"]
                 resources:
                   requests:
-                    storage: {{ .apps.openproject.tmpVolumesStorage }}
+                    storage: {{ .tmpVolumesStorage }}
         - name: app-tmp
           # we can't use emptyDir due to the sticky bit / world writable issue
           # see: https://github.com/kubernetes/kubernetes/issues/110835
@@ -55,7 +55,7 @@ spec:
                 accessModes: ["ReadWriteOnce"]
                 resources:
                   requests:
-                    storage: {{ .apps.openproject.tmpVolumesStorage }}
+                    storage: {{ .tmpVolumesStorage }}
         - name: "data"
           persistentVolumeClaim:
             claimName: openproject        
@@ -72,8 +72,13 @@ spec:
             runAsUser: 1000
             seccompProfile:
               type: RuntimeDefault
-          image: {{ .apps.openproject.serverImage }}
+          image: postgres:17
           imagePullPolicy: Always
+          command: [
+            'sh',
+            '-c',
+            'until pg_isready -h $DATABASE_HOST -p $DATABASE_PORT; do echo "waiting for database $DATABASE_HOST:$DATABASE_PORT"; sleep 2; done; echo "Database is ready!"'
+          ]
           envFrom:
             - configMapRef:
                 name: openproject-core
@@ -84,15 +89,12 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: openproject-secrets
-                  key: apps.openproject.dbPassword
+                  key: dbPassword
             - name: OPENPROJECT_SEED_ADMIN_USER_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: openproject-secrets
-                  key: apps.openproject.adminPassword
-          args:
-            - bash
-            - /app/docker/prod/wait-for-db
+                  key: adminPassword
           resources:
             limits:
               memory: 1Gi
@@ -116,7 +118,7 @@ spec:
             runAsUser: 1000
             seccompProfile:
               type: RuntimeDefault
-          image: {{ .apps.openproject.serverImage }}
+          image: {{ .serverImage }}
           imagePullPolicy: Always
           envFrom:
             - configMapRef:
@@ -132,7 +134,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: openproject-secrets
-                  key: apps.openproject.dbPassword
+                  key: dbPassword
             - name: "OPENPROJECT_GOOD_JOB_QUEUES"
               value: ""
           volumeMounts: