From 7b7453ab95100fb4c70e6a380871e99f418e19d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Kalemba?= <5924586+pkalemba@users.noreply.github.com> Date: Tue, 30 Aug 2022 08:06:20 +0200 Subject: [PATCH] feat(chart): Add priorityClassName (#159) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(chart): Add priorityClassName Allow users to use priorityClassName * make linter happy Co-authored-by: Paweł Kalemba --- charts/sorry-cypress/Chart.yaml | 2 +- charts/sorry-cypress/README.md | 4 ++++ charts/sorry-cypress/changelog.md | 3 +++ charts/sorry-cypress/templates/cronjob-run-cleaner.yml | 3 +++ charts/sorry-cypress/templates/deployment-api.yml | 3 +++ charts/sorry-cypress/templates/deployment-dashboard.yml | 3 +++ charts/sorry-cypress/templates/deployment-director.yml | 3 +++ charts/sorry-cypress/values.yaml | 9 +++++++++ 8 files changed, 29 insertions(+), 1 deletion(-) diff --git a/charts/sorry-cypress/Chart.yaml b/charts/sorry-cypress/Chart.yaml index a29290c..596ce4e 100644 --- a/charts/sorry-cypress/Chart.yaml +++ b/charts/sorry-cypress/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: sorry-cypress description: A Helm chart for Sorry Cypress type: application -version: 1.7.2 +version: 1.7.3 appVersion: 2.3.1 home: https://sorry-cypress.dev/ sources: diff --git a/charts/sorry-cypress/README.md b/charts/sorry-cypress/README.md index 63566d9..a6377f6 100644 --- a/charts/sorry-cypress/README.md +++ b/charts/sorry-cypress/README.md @@ -72,6 +72,7 @@ https://sorry-cypress.dev/api#configuration | `api.enabled` | Whether to deploy the API service | `true` | | `api.resources` | Resources to initialize the container | `{}` | | `api.podAnnotations` | Set annotations for pods | `{}` | +| `api.priorityClassName` | Name of the existing priority class to be used by api pod(s) | `""` | | `api.podLabels` | Set additional labels for pods | `{}` | | `api.affinity` | Set affinity for pods | `{}` | | `api.nodeSelector` | Set node selector for pods | `{}` | @@ -105,6 +106,7 @@ https://sorry-cypress.dev/dashboard#configuration | `dashboard.environmentVariables.graphQlClientCredentials` | Set the `GRAPHQL_CLIENT_CREDENTIALS` environment variable to configure the API service client credentials. | `""` | | `dashboard.environmentVariables.graphQlSchemaUrl` | Set the `GRAPHQL_SCHEMA_URL` environment variable to configure the URL of API service. | `""` | | `dashboard.podAnnotations` | Set annotations for pods | `{}` | +| `dashboard.priorityClassName` | Name of the existing priority class to be used by dashboard pod(s) | `""` | | `dashboard.podLabels` | Set additional labels for pods | `{}` | | `dashboard.affinity` | Set affinity for pods | `{}` | | `dashboard.nodeSelector` | Set node selector for pods | `{}` | @@ -138,6 +140,7 @@ https://sorry-cypress.dev/director/configuration | `director.environmentVariables.screenshotsDriver` | Set the screenshots driver. Valid options are `"../screenshots/dummy.driver"`, `"../screenshots/s3.driver"`, `"../screenshots/minio.driver"` or `"../screenshots/azure-blob-storage.driver"` | `"../screenshots/dummy.driver"` | | `director.environmentVariables.inactivityTimeoutSeconds` | Set the timeout of all test runs under your projects. | `180s` | | `director.podAnnotations` | Set annotations for pods | `{}` | +| `director.priorityClassName` | Name of the existing priority class to be used by director pod(s) | `""` | | `director.podLabels` | Set additional labels for pods | `{}` | | `director.affinity` | Set affinity for pods | `{}` | | `director.nodeSelector` | Set node selector for pods | `{}` | @@ -255,3 +258,4 @@ For more information, refer to https://github.com/sendible-labs/sorry-cypress-ru | `runCleaner.daysToKeep` | How many days worth of run data to keep in the database. Anything older is deleted. If omitted and `runCleaner.enabled` is true, it will default to 100d. | `200` | | `runCleaner.schedule` | The cron schedule to run the runCleaner task | `'0 1 * * *'` | | `runCleaner.clusterDomain` | Cluster domain, necessary to resolve api host | `'cluster.local'` | +| `runCleaner.priorityClassName`| Name of the existing priority class to be used by runCleaner pod(s) | `""` | diff --git a/charts/sorry-cypress/changelog.md b/charts/sorry-cypress/changelog.md index f3cc8d2..28a0496 100644 --- a/charts/sorry-cypress/changelog.md +++ b/charts/sorry-cypress/changelog.md @@ -1,3 +1,6 @@ + +# 1.7.3 +Allows to use `priorityClassName` in all services. # 1.7.2 [Sorry Cypress 2.3.1](https://github.com/sorry-cypress/sorry-cypress/releases/tag/v2.3.1) diff --git a/charts/sorry-cypress/templates/cronjob-run-cleaner.yml b/charts/sorry-cypress/templates/cronjob-run-cleaner.yml index 589a9b7..de59fe2 100644 --- a/charts/sorry-cypress/templates/cronjob-run-cleaner.yml +++ b/charts/sorry-cypress/templates/cronjob-run-cleaner.yml @@ -17,6 +17,9 @@ spec: labels: app: sorry-cypress-run-cleaner spec: + {{- if .Values.runCleaner.priorityClassName }} + priorityClassName: {{ .Values.runCleaner.priorityClassName }} + {{- end }} containers: - name: sorry-cypress-run-cleaner image: "{{ .Values.runCleaner.image.repository }}:{{ .Values.runCleaner.image.tag }}" diff --git a/charts/sorry-cypress/templates/deployment-api.yml b/charts/sorry-cypress/templates/deployment-api.yml index 3271a8b..e8df9dd 100644 --- a/charts/sorry-cypress/templates/deployment-api.yml +++ b/charts/sorry-cypress/templates/deployment-api.yml @@ -36,6 +36,9 @@ spec: affinity: {{- tpl . $ | nindent 8 }} {{- end }} + {{- if .Values.api.priorityClassName }} + priorityClassName: {{ .Values.api.priorityClassName }} + {{- end }} containers: - env: {{- if or (.Values.mongodb.internal_db.enabled) (.Values.mongodb.external_db.enabled) }} diff --git a/charts/sorry-cypress/templates/deployment-dashboard.yml b/charts/sorry-cypress/templates/deployment-dashboard.yml index e59fc7a..2eecd6d 100644 --- a/charts/sorry-cypress/templates/deployment-dashboard.yml +++ b/charts/sorry-cypress/templates/deployment-dashboard.yml @@ -36,6 +36,9 @@ spec: affinity: {{- tpl . $ | nindent 8 }} {{- end }} + {{- if .Values.dashboard.priorityClassName }} + priorityClassName: {{ .Values.dashboard.priorityClassName }} + {{- end }} containers: - env: {{- with .Values.dashboard.environmentVariables }} diff --git a/charts/sorry-cypress/templates/deployment-director.yml b/charts/sorry-cypress/templates/deployment-director.yml index 75730a8..40d7cce 100644 --- a/charts/sorry-cypress/templates/deployment-director.yml +++ b/charts/sorry-cypress/templates/deployment-director.yml @@ -33,6 +33,9 @@ spec: affinity: {{- tpl . $ | nindent 8 }} {{- end }} + {{- if .Values.director.priorityClassName }} + priorityClassName: {{ .Values.director.priorityClassName }} + {{- end }} containers: - env: - name: DASHBOARD_URL diff --git a/charts/sorry-cypress/values.yaml b/charts/sorry-cypress/values.yaml index 3752ef1..c60b142 100644 --- a/charts/sorry-cypress/values.yaml +++ b/charts/sorry-cypress/values.yaml @@ -78,6 +78,9 @@ api: # Set annotations for pods podAnnotations: {} + # Name of the existing priority class to be used by pod(s) + priorityClassName: "" + # Additional pod labels podLabels: {} @@ -158,6 +161,9 @@ dashboard: # Set annotations for pods podAnnotations: {} + # Name of the existing priority class to be used by pod(s) + priorityClassName: "" + # Additional pod labels podLabels: {} @@ -402,6 +408,9 @@ runCleaner: # Cluster domain to resolve api host correctly clusterDomain: 'cluster.local' + # Name of the existing priority class to be used by pod(s) + priorityClassName: "" + imagePullSecrets: [] # An optional array of imagePullSecrets that are used to download images from a private registry # https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/