Standardize config.

openproject/configmap_core.yaml

@@ -5,19 +5,19 @@ kind: "ConfigMap"
 metadata:
   name: "openproject-core"
 data:
-  DATABASE_HOST: "{{ .dbHostname }}"
-  DATABASE_PORT: "5432"
-  DATABASE_NAME: "{{ .dbName }}"
-  DATABASE_USERNAME: "{{ .dbUsername }}"
-  DATABASE_URL: "postgresql://{{ .dbUsername }}@{{ .dbHostname }}:5432/{{ .dbName }}"
-  OPENPROJECT_SEED_ADMIN_USER_PASSWORD_RESET: "{{ .adminPasswordReset }}"
+  DATABASE_HOST: "{{ .db.host }}"
+  DATABASE_PORT: "{{ .db.port }}"
+  DATABASE_NAME: "{{ .db.name }}"
+  DATABASE_USERNAME: "{{ .db.user }}"
+  DATABASE_URL: "postgresql://{{ .db.user }}@{{ .db.host }}:{{ .db.port }}/{{ .db.name }}"
+  OPENPROJECT_SEED_ADMIN_USER_PASSWORD_RESET: "true"
   OPENPROJECT_SEED_ADMIN_USER_NAME: "{{ .adminUserName }}"
   OPENPROJECT_SEED_ADMIN_USER_MAIL: "{{ .adminUserEmail }}"
-  OPENPROJECT_HTTPS: "{{ .https }}"
-  OPENPROJECT_SEED_LOCALE: "{{ .seedLocale }}"
+  OPENPROJECT_HTTPS: "true"
+  OPENPROJECT_SEED_LOCALE: "en"
   OPENPROJECT_HOST__NAME: "{{ .domain }}"
-  OPENPROJECT_HSTS: "{{ .hsts }}"
-  OPENPROJECT_RAILS__CACHE__STORE: "{{ .cacheStore }}"
-  OPENPROJECT_RAILS__RELATIVE__URL__ROOT: "{{ .railsRelativeUrlRoot }}"
-  POSTGRES_STATEMENT_TIMEOUT: "{{ .postgresStatementTimeout }}"
+  OPENPROJECT_HSTS: "true"
+  OPENPROJECT_RAILS__CACHE__STORE: "memcache"
+  OPENPROJECT_RAILS__RELATIVE__URL__ROOT: ""
+  POSTGRES_STATEMENT_TIMEOUT: "120s"
 ...

openproject/configmap_memcached.yaml

@@ -5,5 +5,5 @@ kind: "ConfigMap"
 metadata:
   name: "openproject-memcached"
 data:
-  OPENPROJECT_CACHE__MEMCACHE__SERVER: "{{ .memcachedHostname }}:{{ .memcachedPort }}"
+  OPENPROJECT_CACHE__MEMCACHE__SERVER: "{{ .memcached.host }}:{{ .memcached.port }}"
 ...

openproject/db-init-job.yaml

@@ -38,11 +38,11 @@ spec:
                   name: postgres-secrets
                   key: password
             - name: DB_HOSTNAME
-              value: "{{ .dbHostname }}"
+              value: "{{ .db.host }}"
             - name: DB_DATABASE_NAME
-              value: "{{ .dbName }}"
+              value: "{{ .db.name }}"
             - name: DB_USERNAME
-              value: "{{ .dbUsername }}"
+              value: "{{ .db.user }}"
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:

openproject/manifest.yaml

@@ -2,7 +2,7 @@ name: openproject
 is: openproject
 description: OpenProject is an open-source project management software that provides
   comprehensive features for project planning, tracking, and collaboration.
-version: 16.1.1
+version: 16.1.1-1
 icon: https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/openproject.svg
 requires:
 - name: postgres
@@ -10,27 +10,19 @@ requires:
 defaultConfig:
   namespace: openproject
   externalDnsDomain: '{{ .cloud.domain }}'
-  serverImage: openproject/openproject:16.1.1-slim
-  timezone: UTC
-  serverPort: 8080
   storage: 5Gi
-  dbHostname: postgres.postgres.svc.cluster.local
-  dbUsername: openproject
-  dbName: openproject
-  memcachedHostname: memcached.memcached.svc.cluster.local
-  memcachedPort: 11211
-  domain: openproject.{{ .cloud.domain }}
-  https: true
-  hsts: true
-  seedLocale: en
   adminUserName: OpenProject Admin
   adminUserEmail: '{{ .operator.email }}'
-  adminPasswordReset: true
-  postgresStatementTimeout: 120s
-  tmpVolumesStorage: 2Gi
+  domain: openproject.{{ .cloud.domain }}
   tlsSecretName: wildcard-wild-cloud-tls
-  cacheStore: memcache
-  railsRelativeUrlRoot: ''
+  db:
+    host: '{{ .apps.postgres.host }}'
+    port: '{{ .apps.postgres.port }}'
+    name: openproject
+    user: openproject
+  memcached:
+    host: '{{ .apps.memcached.host }}'
+    port: '{{ .apps.memcached.port }}'
 defaultSecrets:
 - key: dbPassword
 - key: adminPassword

openproject/seeder-job.yaml

@@ -27,7 +27,7 @@ spec:
                 accessModes: ["ReadWriteOnce"]
                 resources:
                   requests:
-                    storage: {{ .tmpVolumesStorage }}
+                    storage: 2Gi
         - name: app-tmp
           # we can't use emptyDir due to the sticky bit / world writable issue
           # see: https://github.com/kubernetes/kubernetes/issues/110835
@@ -39,7 +39,7 @@ spec:
                 accessModes: ["ReadWriteOnce"]
                 resources:
                   requests:
-                    storage: {{ .tmpVolumesStorage }}
+                    storage: 2Gi
         - name: "data"
           persistentVolumeClaim:
             claimName: openproject        
@@ -91,7 +91,7 @@ spec:
               type: RuntimeDefault
       containers:
         - name: seeder
-          image: "{{ .serverImage }}"
+          image: "openproject/openproject:16.1.1-slim"
           imagePullPolicy: Always
           args:
             - bash

openproject/web-deployment.yaml

@@ -43,7 +43,7 @@ spec:
                 accessModes: ["ReadWriteOnce"]
                 resources:
                   requests:
-                    storage: {{ .tmpVolumesStorage }}
+                    storage: 2Gi
         - 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: {{ .tmpVolumesStorage }}
+                    storage: 2Gi
         - name: "data"
           persistentVolumeClaim:
             claimName: openproject        
@@ -118,7 +118,7 @@ spec:
             runAsUser: 1000
             seccompProfile:
               type: RuntimeDefault
-          image: {{ .serverImage }}
+          image: openproject/openproject:16.1.1-slim
           imagePullPolicy: Always
           envFrom:
             - configMapRef:

openproject/worker-deployment.yaml

@@ -43,7 +43,7 @@ spec:
                 accessModes: ["ReadWriteOnce"]
                 resources:
                   requests:
-                    storage: {{ .tmpVolumesStorage }}
+                    storage: 2Gi
         - 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: {{ .tmpVolumesStorage }}
+                    storage: 2Gi
         - name: "data"
           persistentVolumeClaim:
             claimName: openproject        
@@ -118,7 +118,7 @@ spec:
             runAsUser: 1000
             seccompProfile:
               type: RuntimeDefault
-          image: {{ .serverImage }}
+          image: openproject/openproject:16.1.1-slim
           imagePullPolicy: Always
           envFrom:
             - configMapRef: