Skip to content

Allow for different annotations/labels for job runners and backend pods #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anna-yn merged 1 commit into from
Mar 31, 2022
Merged

Allow for different annotations/labels for job runners and backend pods #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions templates/deployment_backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,17 @@ spec:
annotations:
{{- if .Values.podAnnotations }}
{{ toYaml .Values.podAnnotations | indent 8 }}
{{- end }}
{{- if .Values.backend.annotations }}
{{ toYaml .Values.backend.annotations | indent 8 }}
{{- end }}
labels:
{{- include "retool.selectorLabels" . | nindent 8 }}
{{- if .Values.podLabels }}
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
{{- if .Values.backend.labels }}
{{ toYaml .Values.backend.labels | indent 8 }}
{{- end }}
spec:
serviceAccountName: {{ template "retool.serviceAccountName" . }}
Expand Down
6 changes: 6 additions & 0 deletions templates/deployment_jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,18 @@ spec:
annotations:
{{- if .Values.podAnnotations }}
{{ toYaml .Values.podAnnotations | indent 8 }}
{{- end }}
{{- if .Values.jobRunner.annotations }}
{{ toYaml .Values.jobRunner.annotations | indent 8 }}
{{- end }}
labels:
app.kubernetes.io/name: {{ include "retool.name" . }}-jobs-runner
app.kubernetes.io/instance: {{ .Release.Name }}
{{- if .Values.podLabels }}
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
{{- if .Values.jobRunner.labels }}
{{ toYaml .Values.jobRunner.labels | indent 8 }}
{{- end }}
spec:
serviceAccountName: {{ template "retool.serviceAccountName" . }}
Expand Down
18 changes: 17 additions & 1 deletion values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,9 @@ tolerations: []
# Ref: https://kubernetes.io/docs/user-guide/node-selection/
nodeSelector: {}

# Common annotations for all pods (backend and job runner).
podAnnotations: {}

# Increasing replica count will deploy a separate pod for backend and jobs
# Example: with 3 replicas, you will end up with 3 backends + 1 jobs pod
replicaCount: 1
Expand All @@ -194,9 +196,23 @@ revisionHistoryLimit: 3
# podDisruptionBudget:
# maxUnavailable: 1

# Custom labels for pod assignment
# Common labels for all pods (backend and job runner) for pod assignment
podLabels: {}

jobRunner:
# Annotations for job runner pods
annotations: {}

# Labels for job runner pods
labels: {}

backend:
# Annotations for backendpods
annotations: {}

# Labels for backend pods
labels: {}

persistentVolumeClaim:
# set to true to use pvc
enabled: false
Expand Down