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

This commit is contained in:
Alexander Olofsson 2021-03-06 10:42:44 +01:00
commit ec3f89a43e
3 changed files with 13 additions and 13 deletions

View file

@ -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

View file

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

View file

@ -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.
##