Rename deployment annotations var, allow deploy-specific annotations

mastodon · Apr 21, 2023 · 4b6fd9f · 4b6fd9f
1 parent 8f612ab
commit 4b6fd9f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/component: sidekiq-{{ .name }}
     app.kubernetes.io/part-of: rails
   annotations:
-    {{- with $context.Values.deployAnnotations }}
+    {{- with $context.Values.deploymentAnnotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:

diff --git a/templates/deployment-streaming.yaml b/templates/deployment-streaming.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     {{- include "mastodon.labels" . | nindent 4 }}
   annotations:
-    {{- with .Values.deployAnnotations }}
+    {{- with (default .Values.deploymentAnnotations .Values.mastodon.streaming.deploymentAnnotations) }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:

diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     {{- include "mastodon.labels" . | nindent 4 }}
   annotations:
-    {{- with .Values.deployAnnotations }}
+    {{- with (default .Values.deploymentAnnotations .Values.mastodon.web.deploymentAnnotations) }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:

diff --git a/values.yaml b/values.yaml
@@ -410,7 +410,7 @@ serviceAccount:
 
 # Custom annotations to apply to all created deployment objects. These can be
 # used to help mastodon interact with other services in the cluster.
-deployAnnotations: {}
+deploymentAnnotations: {}
 
 # -- Kubernetes manages pods for jobs and pods for deployments differently, so you might
 # need to apply different annotations to the two different sets of pods. The annotations