about summary refs log tree commit diff
path: root/chart
diff options
context:
space:
mode:
authorAlex Nordlund <deep.alexander@gmail.com>2022-11-08 17:19:14 +0100
committerGitHub <noreply@github.com>2022-11-08 17:19:14 +0100
commitfd3c48210419441f95b08a951f715e5ecd55e5c1 (patch)
treebc7a8719f0f60f7b2cd5a873a6c76bf08f4d4a6d /chart
parentd3afd7a2f1c12de4d02777585550183b04167625 (diff)
Roll pods to pick up db migrations even if podAnnotations is empty (#19702)
Diffstat (limited to 'chart')
-rw-r--r--chart/templates/deployment-sidekiq.yaml4
-rw-r--r--chart/templates/deployment-web.yaml4
2 files changed, 4 insertions, 4 deletions
diff --git a/chart/templates/deployment-sidekiq.yaml b/chart/templates/deployment-sidekiq.yaml
index 994a66445..b2e5af522 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 ab722c77b..c50f32d98 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