From 7c68206c4b990b2c2e03e3edb3cb53958c69cb4d Mon Sep 17 00:00:00 2001 From: th3r3al Date: Tue, 6 Dec 2022 10:35:43 +0100 Subject: [PATCH 1/2] feature: Add optional annotations to signingkey job --- charts/matrix-synapse/templates/signing-key-job.yaml | 4 ++++ charts/matrix-synapse/values.yaml | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/charts/matrix-synapse/templates/signing-key-job.yaml b/charts/matrix-synapse/templates/signing-key-job.yaml index 526b7c5..12eb4c5 100644 --- a/charts/matrix-synapse/templates/signing-key-job.yaml +++ b/charts/matrix-synapse/templates/signing-key-job.yaml @@ -55,6 +55,10 @@ metadata: labels: {{- include "matrix-synapse.labels" . | nindent 4 }} app.kubernetes.io/component: signingkey-job + { { - with .Values.signingkey.job.annotations } } + annotations: + { { - toYaml . | nindent 4 } } + { { - end } } spec: ttlSecondsAfterFinished: 0 template: diff --git a/charts/matrix-synapse/values.yaml b/charts/matrix-synapse/values.yaml index df163dd..8f7bf28 100644 --- a/charts/matrix-synapse/values.yaml +++ b/charts/matrix-synapse/values.yaml @@ -46,6 +46,11 @@ signingkey: ## job: enabled: true + ## Annotations to apply to the signing-key-job. + ## + annotations: { } + # argocd.argoproj.io/hook: PostSync + # argocd.argoproj.io/hook-delete-policy: HookSucceeded generateImage: repository: matrixdotorg/synapse From 7e0ae00074a52abc1dfc5add8e6f4053dbef8135 Mon Sep 17 00:00:00 2001 From: th3r3al Date: Tue, 6 Dec 2022 12:56:22 +0100 Subject: [PATCH 2/2] hotfix: fix to much spaces, newline --- charts/matrix-synapse/templates/signing-key-job.yaml | 6 +++--- charts/matrix-synapse/values.yaml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/matrix-synapse/templates/signing-key-job.yaml b/charts/matrix-synapse/templates/signing-key-job.yaml index 12eb4c5..85417c0 100644 --- a/charts/matrix-synapse/templates/signing-key-job.yaml +++ b/charts/matrix-synapse/templates/signing-key-job.yaml @@ -55,10 +55,10 @@ metadata: labels: {{- include "matrix-synapse.labels" . | nindent 4 }} app.kubernetes.io/component: signingkey-job - { { - with .Values.signingkey.job.annotations } } + {{- with .Values.signingkey.job.annotations }} annotations: - { { - toYaml . | nindent 4 } } - { { - end } } + {{- toYaml . | nindent 4 }} + {{- end }} spec: ttlSecondsAfterFinished: 0 template: diff --git a/charts/matrix-synapse/values.yaml b/charts/matrix-synapse/values.yaml index 8f7bf28..c99cf80 100644 --- a/charts/matrix-synapse/values.yaml +++ b/charts/matrix-synapse/values.yaml @@ -46,6 +46,7 @@ signingkey: ## job: enabled: true + ## Annotations to apply to the signing-key-job. ## annotations: { }