Skip to content

Commit c7f78ab

Browse files
marcleblanc2marcleblanc2
committed
Move priorityClassName to a helper function
1 parent b533f0e commit c7f78ab

22 files changed

+42
-64
lines changed

‎charts/sourcegraph/templates/_helpers/_priorityClassName.tpl‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{{/*
2+
3+
Allow customers to assign a priorityClassName to all resources which create pods (ex. DaemonSets, Deployments, StatefulSets)
4+
5+
Customers can configure an instance-wide default priorty class name at .Values.sourcegraph.priorityClassName,
6+
and can override it for individual services, if needed, at .Values.<service>.priorityClassName
7+
8+
*/}}
9+
10+
{{- define "sourcegraph.priorityClassName" -}}
11+
{{- $top := index . 0 }}
12+
{{- $service := index . 1 }}
13+
{{- $globalPriorityClassName := (index $top.Values "sourcegraph" "priorityClassName") }}
14+
{{- $servicePriorityClassName := (index $top.Values $service "priorityClassName") }}
15+
{{- if $servicePriorityClassName }}
16+
priorityClassName: {{- $servicePriorityClassName | toYaml | trim }}
17+
{{- else if $globalPriorityClassName }}
18+
priorityClassName: {{- $globalPriorityClassName | toYaml | trim }}
19+
{{- end }}
20+
{{- end }}

‎charts/sourcegraph/templates/_worker.tpl‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,7 @@ spec:
131131
{{- if $top.Values.worker.extraContainers }}
132132
{{- toYaml $top.Values.worker.extraContainers | nindent 6 }}
133133
{{- end }}
134-
{{- if or $top.Values.worker.priorityClassName $top.Values.sourcegraph.priorityClassName }}
135-
priorityClassName: {{ coalesce $top.Values.worker.priorityClassName $top.Values.sourcegraph.priorityClassName }}
136-
{{- end }}
134+
{{- include "sourcegraph.priorityClassName" (list . "worker" ) | trim | nindent 6 }}
137135
securityContext:
138136
{{- toYaml $top.Values.worker.podSecurityContext | nindent 8 }}
139137
{{- include "sourcegraph.nodeSelector" (list $top "worker" ) | trim | nindent 6 }}

‎charts/sourcegraph/templates/blobstore/blobstore.Deployment.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,11 @@ spec:
8888
{{- if .Values.blobstore.extraContainers }}
8989
{{- toYaml .Values.blobstore.extraContainers | nindent 6 }}
9090
{{- end }}
91-
{{- if or .Values.blobstore.priorityClassName .Values.sourcegraph.priorityClassName }}
92-
priorityClassName: {{ coalesce .Values.blobstore.priorityClassName .Values.sourcegraph.priorityClassName }}
93-
{{- end }}
9491
securityContext:
9592
{{- toYaml .Values.blobstore.podSecurityContext | nindent 8 }}
9693
{{- include "sourcegraph.nodeSelector" (list . "blobstore" ) | trim | nindent 6 }}
9794
{{- include "sourcegraph.affinity" (list . "blobstore" ) | trim | nindent 6 }}
95+
{{- include "sourcegraph.priorityClassName" (list . "blobstore" ) | trim | nindent 6 }}
9896
{{- include "sourcegraph.tolerations" (list . "blobstore" ) | trim | nindent 6 }}
9997
{{- with .Values.sourcegraph.imagePullSecrets }}
10098
imagePullSecrets:

‎charts/sourcegraph/templates/cadvisor/cadvisor.DaemonSet.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,12 @@ spec:
9898
{{- toYaml .Values.cadvisor.extraContainers | nindent 6 }}
9999
{{- end }}
100100
automountServiceAccountToken: false
101-
{{- if or .Values.cadvisor.priorityClassName .Values.sourcegraph.priorityClassName }}
102-
priorityClassName: {{ coalesce .Values.cadvisor.priorityClassName .Values.sourcegraph.priorityClassName }}
103-
{{- end }}
104101
terminationGracePeriodSeconds: 30
105102
securityContext:
106103
{{- toYaml .Values.cadvisor.podSecurityContext | nindent 8 }}
107104
{{- include "sourcegraph.nodeSelector" (list . "cadvisor" ) | trim | nindent 6 }}
108105
{{- include "sourcegraph.affinity" (list . "cadvisor" ) | trim | nindent 6 }}
106+
{{- include "sourcegraph.priorityClassName" (list . "cadvisor" ) | trim | nindent 6 }}
109107
{{- include "sourcegraph.tolerations" (list . "cadvisor" ) | trim | nindent 6 }}
110108
{{- with .Values.sourcegraph.imagePullSecrets }}
111109
imagePullSecrets:

‎charts/sourcegraph/templates/codeinsights-db/codeinsights-db.StatefulSet.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,11 @@ spec:
120120
{{- if .Values.codeInsightsDB.extraContainers }}
121121
{{- toYaml .Values.codeInsightsDB.extraContainers | nindent 6 }}
122122
{{- end }}
123-
{{- if or .Values.codeInsightsDB.priorityClassName .Values.sourcegraph.priorityClassName }}
124-
priorityClassName: {{ coalesce .Values.codeInsightsDB.priorityClassName .Values.sourcegraph.priorityClassName }}
125-
{{- end }}
126123
securityContext:
127124
{{- toYaml .Values.codeInsightsDB.podSecurityContext | nindent 8 }}
128125
{{- include "sourcegraph.nodeSelector" (list . "codeInsightsDB" ) | trim | nindent 6 }}
129126
{{- include "sourcegraph.affinity" (list . "codeInsightsDB" ) | trim | nindent 6 }}
127+
{{- include "sourcegraph.priorityClassName" (list . "codeInsightsDB" ) | trim | nindent 6 }}
130128
{{- include "sourcegraph.tolerations" (list . "codeInsightsDB" ) | trim | nindent 6 }}
131129
{{- with .Values.sourcegraph.imagePullSecrets }}
132130
imagePullSecrets:

‎charts/sourcegraph/templates/codeintel-db/codeintel-db.StatefulSet.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,12 @@ spec:
131131
{{- if .Values.codeIntelDB.extraContainers }}
132132
{{- toYaml .Values.codeIntelDB.extraContainers | nindent 6 }}
133133
{{- end }}
134-
{{- if or .Values.codeIntelDB.priorityClassName .Values.sourcegraph.priorityClassName }}
135-
priorityClassName: {{ coalesce .Values.codeIntelDB.priorityClassName .Values.sourcegraph.priorityClassName }}
136-
{{- end }}
137134
terminationGracePeriodSeconds: 120
138135
securityContext:
139136
{{- toYaml .Values.codeIntelDB.podSecurityContext | nindent 8 }}
140137
{{- include "sourcegraph.nodeSelector" (list . "codeIntelDB" ) | trim | nindent 6 }}
141138
{{- include "sourcegraph.affinity" (list . "codeIntelDB" ) | trim | nindent 6 }}
139+
{{- include "sourcegraph.priorityClassName" (list . "codeIntelDB" ) | trim | nindent 6 }}
142140
{{- include "sourcegraph.tolerations" (list . "codeIntelDB" ) | trim | nindent 6 }}
143141
{{- with .Values.sourcegraph.imagePullSecrets }}
144142
imagePullSecrets:

‎charts/sourcegraph/templates/frontend/sourcegraph-frontend.Deployment.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ spec:
6565
{{- range $name, $item := .Values.migrator.env }}
6666
- name: {{ $name }}
6767
{{- $item | toYaml | nindent 10 }}
68-
{{- end }}
68+
{{- end }}
6969
{{- if not .Values.sourcegraph.localDevMode}}
7070
resources:
7171
{{- toYaml .Values.migrator.resources | nindent 10 }}
@@ -140,13 +140,11 @@ spec:
140140
{{- if .Values.frontend.extraContainers }}
141141
{{- toYaml .Values.frontend.extraContainers | nindent 6 }}
142142
{{- end }}
143-
{{- if or .Values.frontend.priorityClassName .Values.sourcegraph.priorityClassName }}
144-
priorityClassName: {{ coalesce .Values.frontend.priorityClassName .Values.sourcegraph.priorityClassName }}
145-
{{- end }}
146143
securityContext:
147144
{{- toYaml .Values.frontend.podSecurityContext | nindent 8 }}
148145
{{- include "sourcegraph.nodeSelector" (list . "frontend" ) | trim | nindent 6 }}
149146
{{- include "sourcegraph.affinity" (list . "frontend" ) | trim | nindent 6 }}
147+
{{- include "sourcegraph.priorityClassName" (list . "frontend" ) | trim | nindent 6 }}
150148
{{- include "sourcegraph.tolerations" (list . "frontend" ) | trim | nindent 6 }}
151149
{{- with .Values.sourcegraph.imagePullSecrets }}
152150
imagePullSecrets:

‎charts/sourcegraph/templates/gitserver/gitserver.StatefulSet.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ spec:
9999
{{- toYaml .Values.gitserver.podSecurityContext | nindent 8 }}
100100
{{- include "sourcegraph.nodeSelector" (list . "gitserver" ) | trim | nindent 6 }}
101101
{{- include "sourcegraph.affinity" (list . "gitserver" ) | trim | nindent 6 }}
102+
{{- include "sourcegraph.priorityClassName" (list . "gitserver" ) | trim | nindent 6 }}
102103
{{- include "sourcegraph.tolerations" (list . "gitserver" ) | trim | nindent 6 }}
103104
{{- with .Values.sourcegraph.imagePullSecrets }}
104105
imagePullSecrets:
@@ -118,9 +119,6 @@ spec:
118119
{{- if .Values.gitserver.extraVolumes }}
119120
{{- toYaml .Values.gitserver.extraVolumes | nindent 6 }}
120121
{{- end }}
121-
{{- if or .Values.gitserver.priorityClassName .Values.sourcegraph.priorityClassName }}
122-
priorityClassName: {{ coalesce .Values.gitserver.priorityClassName .Values.sourcegraph.priorityClassName }}
123-
{{- end }}
124122
updateStrategy:
125123
type: RollingUpdate
126124
volumeClaimTemplates:

‎charts/sourcegraph/templates/grafana/grafana.StatefulSet.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,11 @@ spec:
8484
{{- if .Values.grafana.extraContainers }}
8585
{{- toYaml .Values.grafana.extraContainers | nindent 6 }}
8686
{{- end }}
87-
{{- if or .Values.grafana.priorityClassName .Values.sourcegraph.priorityClassName }}
88-
priorityClassName: {{ coalesce .Values.grafana.priorityClassName .Values.sourcegraph.priorityClassName }}
89-
{{- end }}
9087
securityContext:
9188
{{- toYaml .Values.grafana.podSecurityContext | nindent 8 }}
9289
{{- include "sourcegraph.nodeSelector" (list . "grafana" ) | trim | nindent 6 }}
9390
{{- include "sourcegraph.affinity" (list . "grafana" ) | trim | nindent 6 }}
91+
{{- include "sourcegraph.priorityClassName" (list . "grafana" ) | trim | nindent 6 }}
9492
{{- include "sourcegraph.tolerations" (list . "grafana" ) | trim | nindent 6 }}
9593
{{- with .Values.sourcegraph.imagePullSecrets }}
9694
imagePullSecrets:

‎charts/sourcegraph/templates/indexed-search/indexed-search.StatefulSet.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,11 @@ spec:
115115
{{- if .Values.indexedSearch.extraContainers }}
116116
{{- toYaml .Values.indexedSearch.extraContainers | nindent 6 }}
117117
{{- end }}
118-
{{- if or .Values.indexedSearch.priorityClassName .Values.sourcegraph.priorityClassName }}
119-
priorityClassName: {{ coalesce .Values.indexedSearch.priorityClassName .Values.sourcegraph.priorityClassName }}
120-
{{- end }}
121118
securityContext:
122119
{{- toYaml .Values.indexedSearch.podSecurityContext | nindent 8 }}
123120
{{- include "sourcegraph.nodeSelector" (list . "indexedSearch" ) | trim | nindent 6 }}
124121
{{- include "sourcegraph.affinity" (list . "indexedSearch" ) | trim | nindent 6 }}
122+
{{- include "sourcegraph.priorityClassName" (list . "indexedSearch" ) | trim | nindent 6 }}
125123
{{- include "sourcegraph.tolerations" (list . "indexedSearch" ) | trim | nindent 6 }}
126124
{{- with .Values.sourcegraph.imagePullSecrets }}
127125
imagePullSecrets:

0 commit comments

Comments
 (0)