A few fixes

.github/workflows/k8s.yml

@@ -12,6 +12,7 @@ on:
 
 jobs:
   lint:
+    name: Lint Helm chart
     runs-on: ubuntu-latest
     outputs:
       changed: ${{ steps.list-changed.outputs.changed }}
@@ -36,14 +37,14 @@ jobs:
           fi
 
       - name: Run lint
-        run: ct lint --config helm/ct.yaml --target-branch ${{ github.event.repository.default_branch }}
+        run: ct lint --config helm/ct.yaml
 
   # only bother to run if lint step reports a change to the helm chart
   install:
     needs:
       - lint
     if: ${{ needs.lint.outputs.changed == 'true' }}
-    name: Install charts
+    name: Install Helm charts
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

helm/dendrite/ci/ct-gen-key.yaml

@@ -1,6 +0,0 @@
-postgresql:
-  enabled: true
-
-configuration:
-  signing_key:
-    create: true

helm/dendrite/ci/ct-postgres.yaml

@@ -1,2 +0,0 @@
-postgresql:
-  enabled: true

helm/dendrite/templates/deployment.yaml

@@ -18,26 +18,26 @@ spec:
         app: {{ $.Chart.Name }}
     spec:
       volumes:
-      - name: {{ $.Chart.Name }}-conf-vol
+      - name: {{ .Release.Name }}-conf-vol
         secret:
-          secretName: {{ $.Chart.Name }}-conf
-      - name: {{ $.Chart.Name }}-signing-key
+          secretName: {{ .Release.Name }}-conf
+      - name: {{ .Release.Name }}-signing-key
         secret:
-          secretName: {{ default "dendrite-signing-key" $.Values.configuration.signing_key.existingSecret | quote }}
+          secretName: {{ default (print .Release.Name "-signing-key") $.Values.configuration.signing_key.existingSecret | quote }}
       {{- if (gt (len ($.Files.Glob "appservices/*")) 0) }}
-      - name: {{ $.Chart.Name }}-appservices
+      - name:{{ .Release.Name }}-appservices
         secret:
-          secretName: {{ $.Chart.Name }}-appservices-conf
+          secretName: {{ .Release.Name }}-appservices-conf
       {{- end }}
-      - name: dendrite-jetstream
+      - name: {{ .Release.Name }}-jetstream
         persistentVolumeClaim:
-          claimName: {{ default "dendrite-jetstream-pvc" $.Values.persistence.jetstream.existingClaim | quote }}
-      - name: dendrite-media
+          claimName: {{ default (print .Release.Name "-jetstream-pvc") $.Values.persistence.jetstream.existingClaim | quote }}
+      - name: {{ .Release.Name }}-media
         persistentVolumeClaim:
-          claimName: {{ default "dendrite-media-pvc" $.Values.persistence.media.existingClaim | quote }}
-      - name: dendrite-search
+          claimName: {{ default (print .Release.Name "-media-pvc") $.Values.persistence.media.existingClaim | quote }}
+      - name: {{ .Release.Name }}-search
         persistentVolumeClaim:
-          claimName: {{ default "dendrite-serach-pvc" $.Values.persistence.search.existingClaim | quote }}
+          claimName: {{ default (print .Release.Name "-search-pvc") $.Values.persistence.search.existingClaim | quote }}
       containers:
       - name: {{ $.Chart.Name }}
         {{- include "image.name" $.Values.image | nindent 8 }}
@@ -48,17 +48,17 @@ spec:
         {{- toYaml $.Values.resources | nindent 10 }}
         volumeMounts:
         - mountPath: /etc/dendrite/
-          name: {{ $.Chart.Name }}-conf-vol
+          name: {{ .Release.Name }}-conf-vol
         - mountPath: /etc/dendrite/secrets/
-          name: {{ $.Chart.Name }}-signing-key
+          name: {{ .Release.Name }}-signing-key
         {{- if (gt (len ($.Files.Glob "appservices/*")) 0) }}
         - mountPath: /etc/dendrite/appservices
-          name: {{ $.Chart.Name }}-appservices
+          name: {{ .Release.Name }}-appservices
           readOnly: true
         {{ end }}
         - mountPath: /data/media_store
-          name: dendrite-media
+          name: {{ .Release.Name }}-media
         - mountPath: /data/jetstream
-          name: dendrite-jetstream
+          name: {{ .Release.Name }}-jetstream
         - mountPath: /data/search
-          name: dendrite-search
+          name: {{ .Release.Name }}-search

helm/dendrite/templates/jobs.yaml

@@ -1,6 +1,6 @@
 {{ if and .Values.configuration.signing_key.create (not .Values.configuration.signing_key.existingSecret ) }}
-{{ $name := "dendrite-signing-key" }}
-{{ $secretName := "dendrite-signing-key" }}
+{{ $name := (print .Release.Name "-signing-key") }}
+{{ $secretName := (print .Release.Name "-signing-key") }}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -50,7 +50,7 @@ spec:
   template:
     spec:
       restartPolicy: "Never"
-      serviceAccount: dendrite-signing-key
+      serviceAccount: {{ $name }}
       containers:
       - name: upload-key
         image: bitnami/kubectl

helm/dendrite/templates/pvc.yaml

@@ -1,27 +1,11 @@
 {{ if not .Values.persistence.media.existingClaim }}
 ---
 apiVersion: v1
-kind: PersistentVolume
-metadata:
-  annotations:
-    helm.sh/resource-policy: keep
-  name: dendrite-media
-spec:
-  capacity:
-    storage: {{ .Values.persistence.media.capacity }}
-  volumeMode: Filesystem
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: {{ .Values.persistence.storageClass }}
----
-apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   annotations:
     helm.sh/resource-policy: keep
-  name: dendrite-media-pvc
-  labels:
-    app: dendrite
+  name: {{ .Release.Name }}-media-pvc
 spec:
   accessModes:
     - ReadWriteOnce
@@ -33,27 +17,11 @@ spec:
 {{ if not .Values.persistence.jetstream.existingClaim }}
 ---
 apiVersion: v1
-kind: PersistentVolume
-metadata:
-  annotations:
-    helm.sh/resource-policy: keep
-  name: dendrite-jetstream
-spec:
-  capacity:
-    storage: {{ .Values.persistence.jetstream.capacity }}
-  volumeMode: Filesystem
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: {{ .Values.persistence.storageClass }}
----
-apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   annotations:
     helm.sh/resource-policy: keep
-  name: dendrite-jetstream-pvc
-  labels:
-    app: dendrite
+  name: {{ .Release.Name }}-jetstream-pvc
 spec:
   accessModes:
     - ReadWriteOnce
@@ -65,27 +33,11 @@ spec:
 {{ if not .Values.persistence.search.existingClaim }}
 ---
 apiVersion: v1
-kind: PersistentVolume
-metadata:
-  annotations:
-    helm.sh/resource-policy: keep
-  name: dendrite-search
-spec:
-  capacity:
-    storage: {{ .Values.persistence.search.capacity }}
-  volumeMode: Filesystem
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: {{ .Values.persistence.storageClass }}
----
-apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   annotations:
     helm.sh/resource-policy: keep
-  name: dendrite-search-pvc
-  labels:
-    app: dendrite
+  name: {{ .Release.Name }}-search-pvc
 spec:
   accessModes:
     - ReadWriteOnce

helm/dendrite/templates/secrets.yaml

@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Chart.Name }}-appservices-conf
+  name: {{ .Release.Name }}-appservices-conf
   namespace: {{ .Release.Namespace }}
 type: Opaque
 data:
@@ -16,7 +16,7 @@ kind: Secret
 metadata:
   annotations:
     helm.sh/resource-policy: keep
-  name: {{ .Chart.Name }}-signing-key
+  name: {{ .Release.Name }}-signing-key
   namespace: {{ .Release.Namespace }}
 type: Opaque
 {{ end }}
@@ -30,12 +30,13 @@ apiVersion: v1
 kind: Secret
 type: Opaque
 metadata:
-  name: {{ .Chart.Name }}-conf
+  name: {{ .Release.Name }}-conf
   namespace: {{ .Release.Namespace }}
 stringData:
   dendrite.yaml: |
     version: 2
     global:
+      server_name: {{ .Values.configuration.server_name }}
       private_key: /etc/dendrite/secrets/signing.key
       key_id: ed25519:auto
       key_validity_period: {{ .Values.configuration.key_validity_period | quote }}

helm/dendrite/values.yaml

@@ -6,7 +6,7 @@ image:
 
 configuration:
   # -- Servername for this Dendrite deployment
-  servername: ""
+  server_name: ""
 
   # -- The server name to delegate server-server communications to, with optional port
   # e.g. localhost:443
@@ -151,13 +151,13 @@ persistence:
   storageClass: local-path
   jetstream:
     existingClaim: ""
-    capacity: "5Gi"
+    capacity: "1Gi"
   media:
     existingClaim: ""
-    capacity: "10Gi"
+    capacity: "1Gi"
   search:
     existingClaim: ""
-    capacity: "5Gi"
+    capacity: "1Gi"
 
 clientapi:
   registration: