Standardize config.

keila/db-init-job.yaml

@@ -26,7 +26,7 @@ spec:
           readOnlyRootFilesystem: false
         env:
         - name: PGHOST
-          value: {{ .dbHostname }}
+          value: {{ .db.host }}
         - name: PGUSER
           value: postgres
         - name: PGPASSWORD
@@ -35,9 +35,9 @@ spec:
               name: keila-secrets
               key: postgres.password
         - name: DB_NAME
-          value: {{ .dbName }}
+          value: {{ .db.name }}
         - name: DB_USER
-          value: {{ .dbUsername }}
+          value: {{ .db.user }}
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:

keila/deployment.yaml

@@ -16,9 +16,9 @@ spec:
     spec:
       containers:
       - name: keila
-        image: "{{ .image }}"
+        image: "pentacent/keila:0.17.1"
         ports:
-        - containerPort: {{ .port }}
+        - containerPort: 4000
         env:
         - name: DB_URL
           valueFrom:
@@ -32,7 +32,7 @@ spec:
         - name: URL_PORT
           value: "443"
         - name: PORT
-          value: "{{ .port }}"
+          value: "4000"
         - name: SECRET_KEY_BASE
           valueFrom:
             secretKeyRef:
@@ -72,13 +72,13 @@ spec:
         livenessProbe:
           httpGet:
             path: /
-            port: {{ .port }}
+            port: 4000
           initialDelaySeconds: 30
           periodSeconds: 10
         readinessProbe:
           httpGet:
             path: /
-            port: {{ .port }}
+            port: 4000
           initialDelaySeconds: 5
           periodSeconds: 5
       volumes:

keila/manifest.yaml

@@ -1,38 +1,37 @@
 name: keila
 is: keila
 description: Keila is an open-source email marketing platform that allows you to send newsletters and manage mailing lists with privacy and control.
-version: 0.17.1
+version: 0.17.1-1
 icon: https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/keila.svg
 requires:
   - name: postgres
   - name: smtp
 defaultConfig:
   namespace: keila
-  externalDnsDomain: "{{ .cloud.domain }}"
-  image: pentacent/keila:0.17.1
-  port: 4000
+  externalDnsDomain: '{{ .cloud.domain }}'
   storage: 1Gi
   domain: keila.{{ .cloud.domain }}
-  dbHostname: "{{ .apps.postgres.host }}"
-  dbPort: "{{ .apps.postgres.port }}"
-  dbName: keila
-  dbUsername: keila
-  disableRegistration: "true"
+  disableRegistration: 'true'
   adminUser: admin@{{ .cloud.domain }}
   tlsSecretName: wildcard-wild-cloud-tls
+  db:
+    host: '{{ .apps.postgres.host }}'
+    port: '{{ .apps.postgres.port }}'
+    name: keila
+    user: keila
   smtp:
-    host: "{{ .apps.smtp.host }}"
-    port: "{{ .apps.smtp.port }}"
-    from: "{{ .apps.smtp.from }}"
-    user: "{{ .apps.smtp.user }}"
-    tls: "{{ .apps.smtp.tls }}"
-    startTls: "{{ .apps.smtp.startTls }}"
+    host: '{{ .apps.smtp.host }}'
+    port: '{{ .apps.smtp.port }}'
+    from: '{{ .apps.smtp.from }}'
+    user: '{{ .apps.smtp.user }}'
+    tls: '{{ .apps.smtp.tls }}'
+    startTls: '{{ .apps.smtp.startTls }}'
 defaultSecrets:
   - key: secretKeyBase
     default: "{{ random.AlphaNum 64 }}"
   - key: dbPassword
   - key: dbUrl
-    default: "postgres://{{ .app.dbUsername }}:{{ .secrets.dbPassword }}@{{ .app.dbHostname }}:{{ .app.dbPort }}/keila?sslmode=disable"
+    default: "postgres://{{ .app.db.user }}:{{ .secrets.dbPassword }}@{{ .app.db.host }}:{{ .app.db.port }}/{{ .app.db.name }}?sslmode=disable"
   - key: adminPassword
   - key: smtpPassword
 requiredSecrets:

keila/service.yaml

@@ -7,5 +7,5 @@ spec:
     component: web
   ports:
   - port: 80
-    targetPort: {{ .port }}
+    targetPort: 4000
     protocol: TCP