From 76282b6a8b1b5308f6414372f82572f458c1363b Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Sat, 2 Apr 2022 11:43:08 +0200 Subject: [PATCH] Fix signing key job for modern Synapse images --- charts/matrix-synapse/Chart.yaml | 2 +- charts/matrix-synapse/templates/signing-key-job.yaml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/matrix-synapse/Chart.yaml b/charts/matrix-synapse/Chart.yaml index 8c0d086..9ff6dd4 100644 --- a/charts/matrix-synapse/Chart.yaml +++ b/charts/matrix-synapse/Chart.yaml @@ -6,7 +6,7 @@ icon: https://matrix.org/images/matrix-logo.svg appVersion: 1.55.0 type: application -version: 2.1.30 +version: 2.1.31 maintainers: - name: Alexander Olofsson email: ace@haxalot.com diff --git a/charts/matrix-synapse/templates/signing-key-job.yaml b/charts/matrix-synapse/templates/signing-key-job.yaml index b5d421e..ac40345 100644 --- a/charts/matrix-synapse/templates/signing-key-job.yaml +++ b/charts/matrix-synapse/templates/signing-key-job.yaml @@ -69,7 +69,11 @@ spec: - -c - | echo "Generating signing key..." - generate_signing_key.py -o /synapse/keys/signing.key + if which generate_signing_key.py >/dev/null; then + generate_signing_key.py -o /synapse/keys/signing.key + else + generate_signing_key -o /synapse/keys/signing.key + fi image: "{{ .Values.signingkey.job.generateImage.repository }}:{{ default .Values.signingkey.job.generateImage.tag "latest" }}" imagePullPolicy: {{ .Values.signingkey.job.generateImage.pullPolicy }} name: signing-key-generate