v2 app deployment--templating mainly in manifest now.

keila/db-init-job.yaml

@@ -26,23 +26,23 @@ spec:
           readOnlyRootFilesystem: false
         env:
         - name: PGHOST
-          value: {{ .apps.keila.dbHostname }}
+          value: {{ .dbHostname }}
         - name: PGUSER
           value: postgres
         - name: PGPASSWORD
           valueFrom:
             secretKeyRef:
               name: keila-secrets
-              key: apps.postgres.password
+              key: postgres.password
         - name: DB_NAME
-          value: {{ .apps.keila.dbName }}
+          value: {{ .dbName }}
         - name: DB_USER
-          value: {{ .apps.keila.dbUsername }}
+          value: {{ .dbUsername }}
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:
               name: keila-secrets
-              key: apps.keila.dbPassword
+              key: dbPassword
         command:
         - /bin/bash
         - -c

keila/deployment.yaml

@@ -14,54 +14,54 @@ spec:
     spec:
       containers:
       - name: keila
-        image: {{ .apps.keila.image }}
+        image: "{{ .image }}"
         ports:
-        - containerPort: {{ .apps.keila.port }}
+        - containerPort: {{ .port }}
         env:
         - name: DB_URL
           valueFrom:
             secretKeyRef:
               name: keila-secrets
-              key: apps.keila.dbUrl
+              key: dbUrl
         - name: URL_HOST
-          value: {{ .apps.keila.domain }}
+          value: "{{ .domain }}"
         - name: URL_SCHEMA
           value: https
         - name: URL_PORT
           value: "443"
         - name: PORT
-          value: "{{ .apps.keila.port }}"
+          value: "{{ .port }}"
         - name: SECRET_KEY_BASE
           valueFrom:
             secretKeyRef:
               name: keila-secrets
-              key: apps.keila.secretKeyBase
+              key: secretKeyBase
         - name: MAILER_SMTP_HOST
-          value: {{ .apps.keila.smtp.host }}
+          value: "{{ .smtp.host }}"
         - name: MAILER_SMTP_PORT
-          value: "{{ .apps.keila.smtp.port }}"
+          value: "{{ .smtp.port }}"
         - name: MAILER_ENABLE_SSL
-          value: "{{ .apps.keila.smtp.tls }}"
+          value: "{{ .smtp.tls }}"
         - name: MAILER_ENABLE_STARTTLS
-          value: "{{ .apps.keila.smtp.startTls }}"
+          value: "{{ .smtp.startTls }}"
         - name: MAILER_SMTP_USER
-          value: {{ .apps.keila.smtp.user }}
+          value: "{{ .smtp.user }}"
         - name: MAILER_SMTP_PASSWORD
           valueFrom:
             secretKeyRef:
               name: keila-secrets
-              key: apps.keila.smtpPassword
+              key: smtpPassword
         - name: MAILER_SMTP_FROM_EMAIL
-          value: {{ .apps.keila.smtp.from }}
+          value: "{{ .smtp.from }}"
         - name: DISABLE_REGISTRATION
-          value: "{{ .apps.keila.disableRegistration }}"
+          value: "{{ .disableRegistration }}"
         - name: KEILA_USER
-          value: "{{ .apps.keila.adminUser }}"
+          value: "{{ .adminUser }}"
         - name: KEILA_PASSWORD
           valueFrom:
             secretKeyRef:
               name: keila-secrets
-              key: apps.keila.adminPassword
+              key: adminPassword
         - name: USER_CONTENT_DIR
           value: /var/lib/keila/uploads
         volumeMounts:
@@ -70,13 +70,13 @@ spec:
         livenessProbe:
           httpGet:
             path: /
-            port: {{ .apps.keila.port }}
+            port: {{ .port }}
           initialDelaySeconds: 30
           periodSeconds: 10
         readinessProbe:
           httpGet:
             path: /
-            port: {{ .apps.keila.port }}
+            port: {{ .port }}
           initialDelaySeconds: 5
           periodSeconds: 5
       volumes:

keila/ingress.yaml

@@ -5,12 +5,12 @@ metadata:
   annotations:
     traefik.ingress.kubernetes.io/router.tls: "true"
     traefik.ingress.kubernetes.io/router.tls.certresolver: letsencrypt
-    external-dns.alpha.kubernetes.io/target: {{ .cloud.domain }}
+    external-dns.alpha.kubernetes.io/target: {{ .externalDnsDomain }}
     external-dns.alpha.kubernetes.io/cloudflare-proxied: "false"
     traefik.ingress.kubernetes.io/router.middlewares: keila-cors@kubernetescrd
 spec:
   rules:
-  - host: {{ .apps.keila.domain }}
+  - host: {{ .domain }}
     http:
       paths:
       - path: /
@@ -23,4 +23,4 @@ spec:
   tls:
     - secretName: "wildcard-wild-cloud-tls"
       hosts:
-        - "{{ .apps.keila.domain }}"
+        - "{{ .domain }}"

keila/manifest.yaml

@@ -1,15 +1,18 @@
 name: 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: 1.0.0
-icon: https://www.keila.io/images/logo.svg
+version: 0.17.1
+icon: https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/keila.svg
 requires:
   - name: postgres
 defaultConfig:
-  image: pentacent/keila:latest
+  namespace: keila
+  externalDnsDomain: "{{ .cloud.domain }}"
+  image: pentacent/keila:0.17.1
   port: 4000
   storage: 1Gi
   domain: keila.{{ .cloud.domain }}
-  dbHostname: postgres.postgres.svc.cluster.local
+  dbHostname: "{{ .apps.postgres.host }}"
+  dbPort: "{{ .apps.postgres.port }}"
   dbName: keila
   dbUsername: keila
   disableRegistration: "true"
@@ -20,12 +23,15 @@ defaultConfig:
     port: "{{ .cloud.smtp.port }}"
     from: "{{ .cloud.smtp.from }}"
     user: "{{ .cloud.smtp.user }}"
-    tls: {{ .cloud.smtp.tls }}
-    startTls: {{ .cloud.smtp.startTls }}
+    tls: "{{ .cloud.smtp.tls }}"
+    startTls: "{{ .cloud.smtp.startTls }}"
 defaultSecrets:
-  - key: apps.keila.secretKeyBase
-  - key: apps.keila.dbPassword
-  - key: apps.keila.dbUrl
-  - key: apps.keila.adminPassword
-  - key: apps.keila.smtpPassword
-  - key: apps.postgres.password
+  - key: secretKeyBase
+    default: "{{ random.AlphaNum 64 }}"
+  - key: dbPassword
+  - key: dbUrl
+    default: "postgres://{{ .app.dbUsername }}:{{ .secrets.dbPassword }}@{{ .app.dbHostname }}:{{ .app.dbPort }}/keila?sslmode=disable"
+  - key: adminPassword
+  - key: smtpPassword
+requiredSecrets:
+  - postgres.password

keila/middleware-cors.yaml

@@ -21,8 +21,8 @@ spec:
       - "OPTIONS"
     accessControlAllowOriginList:
       - "http://localhost:1313"
-      - "https://*.{{ .cloud.domain }}"
-      - "https://{{ .cloud.domain }}"
+      - "https://*.{{ .externalDnsDomain }}"
+      - "https://{{ .externalDnsDomain }}"
     accessControlExposeHeaders:
       - "*"
     accessControlMaxAge: 86400

keila/namespace.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: keila
+  name: "{{ .namespace }}"

keila/pvc.yaml

@@ -7,4 +7,4 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: {{ .apps.keila.storage }}
+      storage: {{ .storage }}

keila/service.yaml

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