matrix-synapse: Reduce scripts to hook ussage

This should hopefully make the chart friendlier with Flux
This commit is contained in:
Alexander "Ace" Olofsson 2023-03-15 19:20:31 +01:00
parent 27d20ebf5e
commit db32226fb5
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
3 changed files with 4 additions and 8 deletions

View file

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

View file

@ -1,3 +1,4 @@
{{- if .Values.signingkey.job.enabled }}
--- ---
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
@ -7,6 +8,7 @@ metadata:
{{- include "matrix-synapse.labels" . | nindent 4 }} {{- include "matrix-synapse.labels" . | nindent 4 }}
annotations: annotations:
helm.sh/hook: pre-install helm.sh/hook: pre-install
helm.sh/resource-policy: keep helm.sh/hook-delete-policy: hook-succeeded
data: data:
{{ (.Files.Glob "scripts/*.sh").AsConfig | indent 2 }} {{ (.Files.Glob "scripts/*.sh").AsConfig | indent 2 }}
{{- end }}

View file

@ -133,8 +133,6 @@ spec:
volumeMounts: volumeMounts:
- name: config - name: config
mountPath: /synapse/config mountPath: /synapse/config
- name: scripts
mountPath: /opt/k8s-synapse
- name: tmpconf - name: tmpconf
mountPath: /synapse/config/conf.d mountPath: /synapse/config/conf.d
- name: secrets - name: secrets
@ -154,10 +152,6 @@ spec:
- name: config - name: config
configMap: configMap:
name: {{ include "matrix-synapse.fullname" . }} name: {{ include "matrix-synapse.fullname" . }}
- name: scripts
configMap:
name: {{ include "matrix-synapse.fullname" . }}-scripts
defaultMode: 0755
- name: secrets - name: secrets
secret: secret:
secretName: {{ include "matrix-synapse.fullname" . }} secretName: {{ include "matrix-synapse.fullname" . }}