infra/mastodon-chart
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename deployment annotations var, allow deploy-specific annotations

Browse Source
This commit is contained in:
Tim Campbell 2023-04-20 08:15:48 -07:00 committed by Renaud Chaput
parent 8f612abc72
commit 4b6fd9f7e6
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/deployment-sidekiq.yaml
View File

@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/component: sidekiq-{{ .name }} app.kubernetes.io/component: sidekiq-{{ .name }}
app.kubernetes.io/part-of: rails app.kubernetes.io/part-of: rails
annotations: annotations:
{{- with $context.Values.deployAnnotations }} {{- with $context.Values.deploymentAnnotations }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:

2
templates/deployment-streaming.yaml
View File

@ -5,7 +5,7 @@ metadata:
labels: labels:
{{- include "mastodon.labels" . | nindent 4 }} {{- include "mastodon.labels" . | nindent 4 }}
annotations: annotations:
{{- with .Values.deployAnnotations }} {{- with (default .Values.deploymentAnnotations .Values.mastodon.streaming.deploymentAnnotations) }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:

2
templates/deployment-web.yaml
View File

@ -5,7 +5,7 @@ metadata:
labels: labels:
{{- include "mastodon.labels" . | nindent 4 }} {{- include "mastodon.labels" . | nindent 4 }}
annotations: annotations:
{{- with .Values.deployAnnotations }} {{- with (default .Values.deploymentAnnotations .Values.mastodon.web.deploymentAnnotations) }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:

2
values.yaml
View File

@ -410,7 +410,7 @@ serviceAccount:
# Custom annotations to apply to all created deployment objects. These can be # Custom annotations to apply to all created deployment objects. These can be
# used to help mastodon interact with other services in the cluster. # 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 # -- 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 # need to apply different annotations to the two different sets of pods. The annotations