Fix priorityClassName for migrator and executors charts

Author: marcleblanc2

TEST.md

@@ -23,7 +23,7 @@ helm plugin install https://github.com/helm-unittest/helm-unittest
 Once the plugin is installed, you can run the unit tests using the following:
 
 ```bash
-helm unittest ./charts/sourcegraph/.
+helm unittest ./charts/sourcegraph
 ```
 
 We currently do not have testing best practices or require unit tests for new changes, so add test cases at your best judgement if possible.

charts/sourcegraph-executor/dind/templates/_helpers/_priorityClassName.tpl

@@ -0,0 +1,20 @@
+{{/*
+
+Allow customers to assign a priorityClassName to all resources which create pods (ex. DaemonSets, Deployments, StatefulSets)
+
+Customers can configure an instance-wide default priorty class name at .Values.sourcegraph.priorityClassName,
+and can override it for individual services, if needed, at .Values.<service>.priorityClassName
+
+*/}}
+
+{{- define "sourcegraph.priorityClassName" -}}
+{{- $top := index . 0 }}
+{{- $service := index . 1 }}
+{{- $globalPriorityClassName := (index $top.Values "sourcegraph" "priorityClassName") }}
+{{- $servicePriorityClassName := (index $top.Values $service "priorityClassName") }}
+{{- if $servicePriorityClassName }}
+priorityClassName: {{ $servicePriorityClassName | toYaml | trim }}
+{{- else if $globalPriorityClassName }}
+priorityClassName: {{ $globalPriorityClassName | toYaml | trim }}
+{{- end }}
+{{- end }}

charts/sourcegraph-executor/dind/templates/executor/executor.Deployment.yaml

@@ -130,10 +130,8 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with include "sourcegraph.priorityClassName" (list . "executor") | trim }}{{ . | nindent 6 }}{{- end }}
       {{- with .Values.sourcegraph.tolerations }}
-      {{- if or .Values.executor.priorityClassName .Values.sourcegraph.priorityClassName }}
-      priorityClassName: {{ coalesce .Values.executor.priorityClassName .Values.sourcegraph.priorityClassName }}
-      {{- end }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}

charts/sourcegraph-executor/dind/templates/private-docker-registry/private-docker-registry.Deployment.yaml

@@ -74,10 +74,8 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with include "sourcegraph.priorityClassName" (list . "privateDockerRegistry") | trim }}{{ . | nindent 6 }}{{- end }}
       {{- with .Values.sourcegraph.tolerations }}
-      {{- if or .Values.privateDockerRegistry.priorityClassName .Values.sourcegraph.priorityClassName }}
-      priorityClassName: {{ coalesce .Values.privateDockerRegistry.priorityClassName .Values.sourcegraph.priorityClassName }}
-      {{- end }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}

charts/sourcegraph-executor/k8s/templates/executor.Deployment.yaml

@@ -99,10 +99,8 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with include "sourcegraph.priorityClassName" (list . "executor") | trim }}{{ . | nindent 6 }}{{- end }}
       {{- with .Values.executor.tolerations }}
-      {{- if or .Values.executor.priorityClassName .Values.sourcegraph.priorityClassName }}
-      priorityClassName: {{ coalesce .Values.executor.priorityClassName .Values.sourcegraph.priorityClassName }}
-      {{- end }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}

charts/sourcegraph-migrator/_helpers/_priorityClassName.tpl

@@ -0,0 +1,20 @@
+{{/*
+
+Allow customers to assign a priorityClassName to all resources which create pods (ex. DaemonSets, Deployments, StatefulSets)
+
+Customers can configure an instance-wide default priorty class name at .Values.sourcegraph.priorityClassName,
+and can override it for individual services, if needed, at .Values.<service>.priorityClassName
+
+*/}}
+
+{{- define "sourcegraph.priorityClassName" -}}
+{{- $top := index . 0 }}
+{{- $service := index . 1 }}
+{{- $globalPriorityClassName := (index $top.Values "sourcegraph" "priorityClassName") }}
+{{- $servicePriorityClassName := (index $top.Values $service "priorityClassName") }}
+{{- if $servicePriorityClassName }}
+priorityClassName: {{ $servicePriorityClassName | toYaml | trim }}
+{{- else if $globalPriorityClassName }}
+priorityClassName: {{ $globalPriorityClassName | toYaml | trim }}
+{{- end }}
+{{- end }}

charts/sourcegraph-migrator/templates/migrator/sourcegraph-migrator.Job.yaml

@@ -68,10 +68,8 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with include "sourcegraph.priorityClassName" (list . "migrator") | trim }}{{ . | nindent 6 }}{{- end }}
       {{- with .Values.sourcegraph.tolerations }}
-      {{- if or .Values.migrator.priorityClassName .Values.sourcegraph.priorityClassName }}
-      priorityClassName: {{ coalesce .Values.migrator.priorityClassName .Values.sourcegraph.priorityClassName }}
-      {{- end }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}