Add pod priority class to helm chart and icon (#1594)

SeleniumHQ · Jul 1, 2022 · e35f3aa · e35f3aa
1 parent 6023b65
commit e35f3aa
Show file tree

Hide file tree

Showing 13 changed files with 115 additions and 45 deletions.
diff --git a/charts/selenium-grid/CHANGELOG.md b/charts/selenium-grid/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to this helm chart will be documented in this file.
 
+## :heavy_check_mark: 0.6.2
+
+### Added
+- Pod PriorityClasses
+
 ## :heavy_check_mark: 0.6.1
 
 ### Changed

diff --git a/charts/selenium-grid/Chart.yaml b/charts/selenium-grid/Chart.yaml
@@ -2,5 +2,6 @@ apiVersion: v2
 name: selenium-grid
 description: A Helm chart for creating a Selenium Grid Server in Kubernetes
 type: application
-version: 0.6.1
+version: 0.6.2
 appVersion: 4.3.0-20220628
+icon: https://github.com/SeleniumHQ/docker-selenium/raw/trunk/logo.png
diff --git a/charts/selenium-grid/README.md b/charts/selenium-grid/README.md
diff --git a/charts/selenium-grid/templates/chrome-node-deployment.yaml b/charts/selenium-grid/templates/chrome-node-deployment.yaml
@@ -67,6 +67,9 @@ spec:
     {{- with .Values.chromeNode.tolerations }}
       tolerations:
         {{ toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.chromeNode.priorityClassName }}
+      priorityClassName: {{ . }}
     {{- end }}
       volumes:
         - name: dshm

diff --git a/charts/selenium-grid/templates/distributor-deployment.yaml b/charts/selenium-grid/templates/distributor-deployment.yaml
@@ -59,4 +59,7 @@ spec:
       tolerations:
         {{ toYaml . | nindent 6 }}
     {{- end }}
+    {{- with .Values.components.distributor.priorityClassName }}
+      priorityClassName: {{ . }}
+    {{- end }}
 {{- end }}
diff --git a/charts/selenium-grid/templates/edge-node-deployment.yaml b/charts/selenium-grid/templates/edge-node-deployment.yaml
@@ -67,6 +67,9 @@ spec:
     {{- with .Values.edgeNode.tolerations }}
       tolerations:
         {{ toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.edgeNode.priorityClassName }}
+      priorityClassName: {{ . }}
     {{- end }}
       volumes:
         - name: dshm

diff --git a/charts/selenium-grid/templates/event-bus-deployment.yaml b/charts/selenium-grid/templates/event-bus-deployment.yaml
@@ -38,10 +38,10 @@ spec:
         {{- with .Values.components.extraEnvironmentVariables }}
           env: {{- tpl (toYaml .) $ | nindent 12 }}
         {{- end }}
+        {{- with .Values.components.extraEnvFrom }}
           envFrom:
-            {{- with .Values.components.extraEnvFrom }}
               {{- toYaml . | nindent 12 }}
-            {{- end }}
+        {{- end }}
         {{- with .Values.components.eventBus.resources }}
           resources: {{- toYaml . | nindent 12 }}
         {{- end }}
@@ -52,4 +52,7 @@ spec:
       tolerations:
         {{ toYaml . | nindent 6 }}
     {{- end }}
+    {{- with .Values.components.eventBus.priorityClassName }}
+      priorityClassName: {{ . }}
+    {{- end }}
 {{- end }}
diff --git a/charts/selenium-grid/templates/firefox-node-deployment.yaml b/charts/selenium-grid/templates/firefox-node-deployment.yaml
@@ -67,6 +67,9 @@ spec:
     {{- with .Values.firefoxNode.tolerations }}
       tolerations:
         {{ toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.firefoxNode.priorityClassName }}
+      priorityClassName: {{ . }}
     {{- end }}
       volumes:
         - name: dshm

diff --git a/charts/selenium-grid/templates/hub-deployment.yaml b/charts/selenium-grid/templates/hub-deployment.yaml
@@ -63,10 +63,10 @@ spec:
         {{- with .Values.hub.extraEnvironmentVariables }}
           env: {{- tpl (toYaml .) $ | nindent 12 }}
         {{- end }}
+        {{- with .Values.hub.extraEnvFrom }}
           envFrom:
-            {{- with .Values.hub.extraEnvFrom }}
               {{- toYaml . | nindent 12 }}
-            {{- end }}
+        {{- end }}
         {{- with .Values.hub.resources }}
           resources: {{- toYaml . | nindent 12 }}
         {{- end }}
@@ -77,4 +77,7 @@ spec:
       tolerations:
         {{ toYaml . | nindent 6 }}
     {{- end }}
+    {{- with .Values.hub.priorityClassName }}
+      priorityClassName: {{ . }}
+    {{- end }}
 {{- end }}
diff --git a/charts/selenium-grid/templates/router-deployment.yaml b/charts/selenium-grid/templates/router-deployment.yaml
@@ -44,10 +44,10 @@ spec:
           {{- with .Values.components.extraEnvironmentVariables }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
+          {{- with .Values.components.extraEnvFrom }}
           envFrom:
-            {{- with .Values.components.extraEnvFrom }}
               {{- toYaml . | nindent 12 }}
-            {{- end }}
+          {{- end }}
           ports:
             - containerPort: {{ .Values.components.router.port }}
               protocol: TCP
@@ -83,4 +83,7 @@ spec:
       tolerations:
         {{ toYaml . | nindent 6 }}
     {{- end }}
+    {{- with .Values.components.router.priorityClassName }}
+      priorityClassName: {{ . }}
+    {{- end }}
 {{- end }}
diff --git a/charts/selenium-grid/templates/session-map-deployment.yaml b/charts/selenium-grid/templates/session-map-deployment.yaml
@@ -50,4 +50,7 @@ spec:
       tolerations:
         {{ toYaml . | nindent 6 }}
     {{- end }}
+    {{- with .Values.components.sessionMap.priorityClassName }}
+      priorityClassName: {{ . }}
+    {{- end }}
 {{- end }}
diff --git a/charts/selenium-grid/templates/session-queuer-deployment.yaml b/charts/selenium-grid/templates/session-queuer-deployment.yaml
@@ -50,4 +50,7 @@ spec:
       tolerations:
         {{ toYaml . | nindent 6 }}
     {{- end }}
+    {{- with .Values.components.sessionQueue.priorityClassName }}
+      priorityClassName: {{ . }}
+    {{- end }}
 {{- end }}
diff --git a/charts/selenium-grid/values.yaml b/charts/selenium-grid/values.yaml
@@ -40,7 +40,7 @@ components:
 
     # Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images)
     imagePullPolicy: IfNotPresent
-    # Custom annotations for router pod
+    # Custom annotations for router pods
     annotations: {}
     # Router port
     port: 4444
@@ -68,10 +68,12 @@ components:
     serviceType: ClusterIP
     # Custom annotations for router service
     serviceAnnotations: {}
-    # Tolerations for router container
+    # Tolerations for router pods
     tolerations: []
-    # Node selector for router container
+    # Node selector for router pods
     nodeSelector: {}
+    # Priority class name for router pods
+    priorityClassName: ""
 
   # Configuration for distributor component
   distributor:
@@ -82,7 +84,7 @@ components:
 
     # Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images)
     imagePullPolicy: IfNotPresent
-    # Custom annotations for Distributor pod
+    # Custom annotations for Distributor pods
     annotations: {}
     # Distributor port
     port: 5553
@@ -92,10 +94,12 @@ components:
     serviceType: ClusterIP
     # Custom annotations for Distributor service
     serviceAnnotations: {}
-    # Tolerations for Distributor container
+    # Tolerations for Distributor pods
     tolerations: []
-    # Node selector for Distributor container
+    # Node selector for Distributor pods
     nodeSelector: {}
+    # Priority class name for Distributor pods
+    priorityClassName: ""
 
   # Configuration for Event Bus component
   eventBus:
@@ -106,7 +110,7 @@ components:
 
     # Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images)
     imagePullPolicy: IfNotPresent
-    # Custom annotations for Event Bus pod
+    # Custom annotations for Event Bus pods
     annotations: {}
     # Event Bus port
     port: 5557
@@ -120,10 +124,12 @@ components:
     serviceType: ClusterIP
     # Custom annotations for Event Bus service
     serviceAnnotations: {}
-    # Tolerations for Event Bus container
+    # Tolerations for Event Bus pods
     tolerations: []
-    # Node selector for Event Bus container
+    # Node selector for Event Bus pods
     nodeSelector: {}
+    # Priority class name for Event Bus pods
+    priorityClassName: ""
 
   # Configuration for Session Map component
   sessionMap:
@@ -134,7 +140,7 @@ components:
 
     # Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images)
     imagePullPolicy: IfNotPresent
-    # Custom annotations for Session Map pod
+    # Custom annotations for Session Map pods
     annotations: {}
     port: 5556
     # Resources for Session Map container
@@ -143,10 +149,12 @@ components:
     serviceType: ClusterIP
     # Custom annotations for Session Map service
     serviceAnnotations: {}
-    # Tolerations for Session Map container
+    # Tolerations for Session Map pods
     tolerations: []
-    # Node selector for Session Map container
+    # Node selector for Session Map pods
     nodeSelector: {}
+    # Priority class name for Session Map pods
+    priorityClassName: ""
 
   # Configuration for Session Queue component
   sessionQueue:
@@ -157,7 +165,7 @@ components:
 
     # Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images)
     imagePullPolicy: IfNotPresent
-    # Custom annotations for Session Queue pod
+    # Custom annotations for Session Queue pods
     annotations: {}
     port: 5559
     # Resources for Session Queue container
@@ -166,10 +174,12 @@ components:
     serviceType: ClusterIP
     # Custom annotations for Session Queue service
     serviceAnnotations: {}
-    # Tolerations for Session Queue container
+    # Tolerations for Session Queue pods
     tolerations: []
-    # Node selector for Session Queue container
+    # Node selector for Session Queue pods
     nodeSelector: {}
+    # Priority class name for Session Queue pods
+    priorityClassName: ""
 
   # Custom environment variables for all components
   extraEnvironmentVariables:
@@ -196,9 +206,9 @@ hub:
   imageTag: 4.3.0-20220628
   # Image pull policy (see https://kubernetes.io/docs/concepts/containers/images/#updating-images)
   imagePullPolicy: IfNotPresent
-  # Custom annotations for Selenium Hub pod
+  # Custom annotations for Selenium Hub pods
   annotations: {}
-  # Custom labels for Selenium Hub pod
+  # Custom labels for Selenium Hub pods
   labels: {}
   # Port where events are published
   publishPort: 4442
@@ -245,10 +255,12 @@ hub:
   serviceType: ClusterIP
   # Custom annotations for Selenium Hub service
   serviceAnnotations: {}
-  # Tolerations for selenium-hub container
+  # Tolerations for selenium-hub pods
   tolerations: []
-  # Node selector for selenium-hub container
+  # Node selector for selenium-hub pods
   nodeSelector: {}
+  # Priority class name for selenium-hub pods
+  priorityClassName: ""
 
 # Configuration for chrome nodes
 chromeNode:
@@ -281,9 +293,9 @@ chromeNode:
     limits:
       memory: "1Gi"
       cpu: "1"
-  # Tolerations for chrome-node container
+  # Tolerations for chrome-node pods
   tolerations: []
-  # Node selector for chrome-node container
+  # Node selector for chrome-node pods
   nodeSelector: {}
   # Custom host aliases for chrome nodes
   hostAliases:
@@ -319,6 +331,8 @@ chromeNode:
     annotations: {}
   # Size limit for DSH volume mounted in container (if not set, default is "1Gi")
   dshmVolumeSizeLimit: 1Gi
+  # Priority class name for chrome-node pods
+  priorityClassName: ""
 
   extraVolumeMounts: []
   # - name: my-extra-volume
@@ -354,9 +368,9 @@ firefoxNode:
   annotations: {}
   # Labels for firefox-node pods
   labels: {}
-  # Tolerations for firefox-node container
+  # Tolerations for firefox-node pods
   tolerations: []
-  # Node selector for firefox-node container
+  # Node selector for firefox-node pods
   nodeSelector: {}
   # Resources for firefox-node container
   resources:
@@ -400,6 +414,8 @@ firefoxNode:
     annotations: {}
   # Size limit for DSH volume mounted in container (if not set, default is "1Gi")
   dshmVolumeSizeLimit: 1Gi
+  # Priority class name for firefox-node pods
+  priorityClassName: ""
 
   extraVolumeMounts: []
   # - name: my-extra-volume
@@ -434,9 +450,9 @@ edgeNode:
   annotations: {}
   # Labels for edge-node pods
   labels: {}
-  # Tolerations for edge-node container
+  # Tolerations for edge-node pods
   tolerations: []
-  # Node selector for edge-node container
+  # Node selector for edge-node pods
   nodeSelector: {}
   # Resources for edge-node container
   resources:
@@ -481,6 +497,8 @@ edgeNode:
       hello: world
   # Size limit for DSH volume mounted in container (if not set, default is "1Gi")
   dshmVolumeSizeLimit: 1Gi
+  # Priority class name for edge-node pods
+  priorityClassName: ""
 
   extraVolumeMounts: []
   # - name: my-extra-volume