Standardize config.

lemmy/configmap.yaml

@@ -8,15 +8,15 @@ data:
     {
       hostname: "{{ .domain }}"
       bind: "0.0.0.0"
-      port: {{ .backendPort }}
+      port: 8536
       tls_enabled: false
 
       database: {
-        uri: "postgresql://{{ .dbUser }}:DBPASSWORD@{{ .dbHost }}:{{ .dbPort }}/{{ .dbName }}"
+        uri: "postgresql://{{ .db.user }}:DBPASSWORD@{{ .db.host }}:{{ .db.port }}/{{ .db.name }}"
       }
 
       pictrs: {
-        url: "http://lemmy-pictrs:{{ .pictrsPort }}/"
+        url: "http://lemmy-pictrs:8080/"
         api_key: "PICTRS_API_KEY"
       }
 

lemmy/db-init-job.yaml

@@ -26,9 +26,9 @@ spec:
           readOnlyRootFilesystem: false
         env:
         - name: PGHOST
-          value: "{{ .dbHost }}"
+          value: "{{ .db.host }}"
         - name: PGPORT
-          value: "{{ .dbPort }}"
+          value: "{{ .db.port }}"
         - name: PGUSER
           value: postgres
         - name: PGPASSWORD
@@ -37,9 +37,9 @@ spec:
               name: lemmy-secrets
               key: postgres.password
         - name: DB_NAME
-          value: "{{ .dbName }}"
+          value: "{{ .db.name }}"
         - name: DB_USER
-          value: "{{ .dbUser }}"
+          value: "{{ .db.user }}"
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:

lemmy/deployment-backend.yaml

@@ -4,7 +4,7 @@ metadata:
   name: lemmy-backend
   namespace: {{ .namespace }}
 spec:
-  replicas: {{ .backendReplicas }}
+  replicas: 1
   selector:
     matchLabels:
       component: backend
@@ -65,7 +65,7 @@ spec:
           mountPath: /config
       containers:
       - name: backend
-        image: {{ .backendImage }}
+        image: dessalines/lemmy:0.19.15
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -75,9 +75,9 @@ spec:
         - name: LEMMY_CONFIG_LOCATION
           value: /config/lemmy.hjson
         - name: TZ
-          value: "{{ .timezone }}"
+          value: "UTC"
         ports:
-        - containerPort: {{ .backendPort }}
+        - containerPort: 8536
           name: http
         volumeMounts:
         - name: config
@@ -85,13 +85,13 @@ spec:
         livenessProbe:
           httpGet:
             path: /api/v3/site
-            port: {{ .backendPort }}
+            port: 8536
           initialDelaySeconds: 30
           periodSeconds: 10
         readinessProbe:
           httpGet:
             path: /api/v3/site
-            port: {{ .backendPort }}
+            port: 8536
           initialDelaySeconds: 10
           periodSeconds: 5
       volumes:

lemmy/deployment-pictrs.yaml

@@ -4,7 +4,7 @@ metadata:
   name: lemmy-pictrs
   namespace: {{ .namespace }}
 spec:
-  replicas: {{ .pictrsReplicas }}
+  replicas: 1
   selector:
     matchLabels:
       component: pictrs
@@ -22,7 +22,7 @@ spec:
           type: RuntimeDefault
       containers:
       - name: pictrs
-        image: {{ .pictrsImage }}
+        image: asonix/pictrs:0.5.5
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -30,7 +30,7 @@ spec:
           readOnlyRootFilesystem: false
         env:
         - name: PICTRS__SERVER__BIND
-          value: "0.0.0.0:{{ .pictrsPort }}"
+          value: "0.0.0.0:8080"
         - name: PICTRS__MEDIA__VIDEO_CODEC
           value: vp9
         - name: PICTRS__MEDIA__GIF__MAX_WIDTH
@@ -54,7 +54,7 @@ spec:
         - name: PICTRS__STORE__PATH
           value: /mnt/files
         ports:
-        - containerPort: {{ .pictrsPort }}
+        - containerPort: 8080
           name: http
         volumeMounts:
         - name: storage
@@ -62,13 +62,13 @@ spec:
         livenessProbe:
           httpGet:
             path: /healthz
-            port: {{ .pictrsPort }}
+            port: 8080
           initialDelaySeconds: 30
           periodSeconds: 10
         readinessProbe:
           httpGet:
             path: /healthz
-            port: {{ .pictrsPort }}
+            port: 8080
           initialDelaySeconds: 10
           periodSeconds: 5
       volumes:

lemmy/deployment-ui.yaml

@@ -4,7 +4,7 @@ metadata:
   name: lemmy-ui
   namespace: {{ .namespace }}
 spec:
-  replicas: {{ .uiReplicas }}
+  replicas: 1
   selector:
     matchLabels:
       component: ui
@@ -21,7 +21,7 @@ spec:
           type: RuntimeDefault
       containers:
       - name: ui
-        image: {{ .uiImage }}
+        image: dessalines/lemmy-ui:0.19.15
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -29,25 +29,25 @@ spec:
           readOnlyRootFilesystem: false
         env:
         - name: LEMMY_UI_LEMMY_INTERNAL_HOST
-          value: "lemmy-backend:{{ .backendPort }}"
+          value: "lemmy-backend:8536"
         - name: LEMMY_UI_LEMMY_EXTERNAL_HOST
           value: "{{ .domain }}"
         - name: LEMMY_UI_HTTPS
           value: "true"
         ports:
-        - containerPort: {{ .uiPort }}
+        - containerPort: 1234
           name: http
         livenessProbe:
           httpGet:
             path: /
-            port: {{ .uiPort }}
+            port: 1234
           initialDelaySeconds: 30
           periodSeconds: 10
           timeoutSeconds: 5
         readinessProbe:
           httpGet:
             path: /
-            port: {{ .uiPort }}
+            port: 1234
           initialDelaySeconds: 10
           periodSeconds: 5
           timeoutSeconds: 5

lemmy/ingress.yaml

@@ -25,18 +25,18 @@ spec:
           service:
             name: lemmy-backend
             port:
-              number: {{ .backendPort }}
+              number: 8536
       - path: /pictrs
         pathType: Prefix
         backend:
           service:
             name: lemmy-pictrs
             port:
-              number: {{ .pictrsPort }}
+              number: 8080
       - path: /
         pathType: Prefix
         backend:
           service:
             name: lemmy-ui
             port:
-              number: {{ .uiPort }}
+              number: 1234

lemmy/manifest.yaml

@@ -1,38 +1,29 @@
 name: lemmy
 is: lemmy
 description: Lemmy is a selfhosted social link aggregation and discussion platform. It is an open source alternative to Reddit, designed for the fediverse.
-version: 0.19.15
+version: 0.19.15-2
 icon: https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/lemmy.svg
 requires:
   - name: postgres
   - name: smtp
 defaultConfig:
   namespace: lemmy
-  backendImage: dessalines/lemmy:0.19.15
-  uiImage: dessalines/lemmy-ui:0.19.15
-  pictrsImage: asonix/pictrs:0.5.5
-  backendPort: 8536
-  uiPort: 1234
-  pictrsPort: 8080
-  backendReplicas: 1
-  uiReplicas: 1
-  pictrsReplicas: 1
+  externalDnsDomain: lemmy.{{ .cloud.baseDomain }}
+  domain: lemmy.{{ .cloud.domain }}
+  tlsSecretName: wildcard-wild-cloud-tls
   storage: 10Gi
   pictrsStorage: 50Gi
-  timezone: UTC
-  domain: lemmy.{{ .cloud.domain }}
-  externalDnsDomain: lemmy.{{ .cloud.baseDomain }}
-  tlsSecretName: lemmy-tls
-  dbName: lemmy
-  dbUser: lemmy
-  dbHost: postgres.postgres.svc.cluster.local
-  dbPort: 5432
+  db:
+    host: '{{ .apps.postgres.host }}'
+    port: '{{ .apps.postgres.port }}'
+    name: lemmy
+    user: lemmy
   smtp:
-    host: "{{ .apps.smtp.host }}"
-    port: "{{ .apps.smtp.port }}"
-    user: "{{ .apps.smtp.user }}"
-    from: "noreply@{{ .cloud.baseDomain }}"
-    tls: "{{ .apps.smtp.tls }}"
+    host: '{{ .apps.smtp.host }}'
+    port: '{{ .apps.smtp.port }}'
+    user: '{{ .apps.smtp.user }}'
+    from: 'noreply@{{ .cloud.baseDomain }}'
+    tls: '{{ .apps.smtp.tls }}'
 defaultSecrets:
   - key: dbPassword
   - key: adminPassword

lemmy/service-backend.yaml

@@ -9,5 +9,5 @@ spec:
     component: backend
   ports:
   - name: http
-    port: {{ .backendPort }}
-    targetPort: {{ .backendPort }}
+    port: 8536
+    targetPort: 8536

lemmy/service-pictrs.yaml

@@ -9,5 +9,5 @@ spec:
     component: pictrs
   ports:
   - name: http
-    port: {{ .pictrsPort }}
-    targetPort: {{ .pictrsPort }}
+    port: 8080
+    targetPort: 8080

lemmy/service-ui.yaml

@@ -9,5 +9,5 @@ spec:
     component: ui
   ports:
   - name: http
-    port: {{ .uiPort }}
-    targetPort: {{ .uiPort }}
+    port: 1234
+    targetPort: 1234