Merge branch 'master' of gitlab.com:ananace/charts

charts/matrix-synapse/Chart.yaml

@@ -6,7 +6,7 @@ icon: https://matrix.org/images/matrix-logo.svg
 appVersion: 1.28.0
 
 type: application
-version: 1.3.16
+version: 1.4.0
 maintainers:
   - name: Alexander Olofsson
     email: ace@haxalot.com

charts/matrix-synapse/templates/signing-key-job.yaml

@@ -76,12 +76,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           name: signing-key-generate
           resources:
-            requests:
+            {{- toYaml .Values.signingkey.resources | nindent 12 }}
-              memory: 25Mi
-              cpu: 100m
-            limits:
-              memory: 25Mi
-              cpu: 100m
           volumeMounts:
             - mountPath: /scripts
               name: scripts
@@ -102,12 +97,7 @@ spec:
           image: bitnami/kubectl
           name: signing-key-upload
           resources:
-            requests:
+            {{- toYaml .Values.signingkey.resources | nindent 12 }}
-              memory: 100Mi
-              cpu: 100m
-            limits:
-              memory: 100Mi
-              cpu: 100m
           volumeMounts:
             - mountPath: /scripts
               name: scripts

charts/matrix-synapse/values.yaml

@@ -36,6 +36,16 @@ signingkey:
   # existingSecret:
   # existingSecretKey: signing.key
 
+  ## Resources to apply to the signing key generation job
+  ##
+  resources: {}
+  #  limits:
+  #    cpu: 100m
+  #    memory: 250Mi
+  #  requests:
+  #    cpu: 100m
+  #    memory: 250Mi
+
 ## The Matrix domain name, this is what will be used for the domain part in
 ## your MXIDs.
 ##