Rename deployment annotations var, allow deploy-specific annotations
This commit is contained in:
parent
8f612abc72
commit
4b6fd9f7e6
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user