matrix-synapse: Improve first install experience

Now runs the signing key generation job as a pre-install hook, to avoid
creating an initial matrix-synapse pod that can't run due to missing the
signing key.
This commit is contained in:
Alexander Olofsson 2023-03-09 18:57:14 +01:00
parent 89fd74827f
commit ad26130d79
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
4 changed files with 18 additions and 1 deletions

View file

@ -1,4 +1,7 @@
** Note, this chart may take a while to finish setup, please be patient ** ** Note, this chart may take a while to finish setup, please be patient **
{{- if .Values.signingkey.job.enabled }}
** Also, remember to disable the signingkey job (signingkey.job.enabled=false) **
{{- end }}
{{- if not .Values.ingress.enabled }} {{- if not .Values.ingress.enabled }}
Synapse has been installed without an ingress, you will need to manage Synapse has been installed without an ingress, you will need to manage

View file

@ -5,5 +5,7 @@ metadata:
name: {{ include "matrix-synapse.fullname" . }}-scripts name: {{ include "matrix-synapse.fullname" . }}-scripts
labels: labels:
{{- include "matrix-synapse.labels" . | nindent 4 }} {{- include "matrix-synapse.labels" . | nindent 4 }}
annotations:
helm.sh/hook: pre-install
data: data:
{{ (.Files.Glob "scripts/*.sh").AsConfig | indent 2 }} {{ (.Files.Glob "scripts/*.sh").AsConfig | indent 2 }}

View file

@ -95,6 +95,7 @@ apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
annotations: annotations:
helm.sh/hook: pre-install
helm.sh/resource-policy: keep helm.sh/resource-policy: keep
name: {{ $name }} name: {{ $name }}
labels: labels:

View file

@ -12,6 +12,9 @@ metadata:
labels: labels:
{{- include "matrix-synapse.labels" . | nindent 4 }} {{- include "matrix-synapse.labels" . | nindent 4 }}
app.kubernetes.io/component: signingkey-job app.kubernetes.io/component: signingkey-job
annotations:
helm.sh/hook: pre-install
helm.sh/hook-delete-policy: hook-succeeded
--- ---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
@ -20,6 +23,9 @@ metadata:
labels: labels:
{{- include "matrix-synapse.labels" . | nindent 4 }} {{- include "matrix-synapse.labels" . | nindent 4 }}
app.kubernetes.io/component: signingkey-job app.kubernetes.io/component: signingkey-job
annotations:
helm.sh/hook: pre-install
helm.sh/hook-delete-policy: hook-succeeded
rules: rules:
- apiGroups: - apiGroups:
- "" - ""
@ -39,6 +45,9 @@ metadata:
labels: labels:
{{- include "matrix-synapse.labels" . | nindent 4 }} {{- include "matrix-synapse.labels" . | nindent 4 }}
app.kubernetes.io/component: signingkey-job app.kubernetes.io/component: signingkey-job
annotations:
helm.sh/hook: pre-install
helm.sh/hook-delete-policy: hook-succeeded
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: Role kind: Role
@ -55,8 +64,10 @@ metadata:
labels: labels:
{{- include "matrix-synapse.labels" . | nindent 4 }} {{- include "matrix-synapse.labels" . | nindent 4 }}
app.kubernetes.io/component: signingkey-job app.kubernetes.io/component: signingkey-job
{{- with .Values.signingkey.job.annotations }}
annotations: annotations:
helm.sh/hook: pre-install
helm.sh/hook-delete-policy: hook-succeeded
{{- with .Values.signingkey.job.annotations }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec: