From fd3c48210419441f95b08a951f715e5ecd55e5c1 Mon Sep 17 00:00:00 2001
From: Alex Nordlund <deep.alexander@gmail.com>
Date: Tue, 8 Nov 2022 17:19:14 +0100
Subject: [PATCH] Roll pods to pick up db migrations even if podAnnotations is
empty (#19702)
---
chart/templates/deployment-sidekiq.yaml | 4 ++--
chart/templates/deployment-web.yaml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/chart/templates/deployment-sidekiq.yaml b/chart/templates/deployment-sidekiq.yaml
index 994a66445e..b2e5af522e 100644
--- a/chart/templates/deployment-sidekiq.yaml
+++ b/chart/templates/deployment-sidekiq.yaml
@@ -14,12 +14,12 @@ spec:
component: rails
template:
metadata:
- {{- with .Values.podAnnotations }}
annotations:
+ {{- with .Values.podAnnotations }}
{{- toYaml . | nindent 8 }}
+ {{- end }}
# roll the pods to pick up any db migrations
rollme: {{ randAlphaNum 5 | quote }}
- {{- end }}
labels:
{{- include "mastodon.selectorLabels" . | nindent 8 }}
component: rails
diff --git a/chart/templates/deployment-web.yaml b/chart/templates/deployment-web.yaml
index ab722c77b1..c50f32d983 100644
--- a/chart/templates/deployment-web.yaml
+++ b/chart/templates/deployment-web.yaml
@@ -14,12 +14,12 @@ spec:
component: rails
template:
metadata:
- {{- with .Values.podAnnotations }}
annotations:
+ {{- with .Values.podAnnotations }}
{{- toYaml . | nindent 8 }}
+ {{- end }}
# roll the pods to pick up any db migrations
rollme: {{ randAlphaNum 5 | quote }}
- {{- end }}
labels:
{{- include "mastodon.selectorLabels" . | nindent 8 }}
component: rails
--
GitLab