From d8660f7dea2e472f6aad86aa89c71cf14ef4f685 Mon Sep 17 00:00:00 2001 From: amardeep2006 Date: Wed, 29 Jan 2025 21:28:22 +0530 Subject: [PATCH 1/4] feat: added nodeSelector for keda patch pods --- charts/selenium-grid/CONFIGURATION.md | 1 + .../templates/patch-keda/patch-keda-objects-job.yaml | 2 ++ charts/selenium-grid/values.yaml | 2 ++ 3 files changed, 5 insertions(+) diff --git a/charts/selenium-grid/CONFIGURATION.md b/charts/selenium-grid/CONFIGURATION.md index 7cd1935a44..a4840f4028 100644 --- a/charts/selenium-grid/CONFIGURATION.md +++ b/charts/selenium-grid/CONFIGURATION.md @@ -395,6 +395,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes | autoscaling.patchObjectFinalizers.serviceAccount | string | `""` | Define an external service account name contains permissions to patch KEDA scaled resources | | autoscaling.patchObjectFinalizers.imagePullSecret | string | `""` | Custom pull secret for container in patch job | | autoscaling.patchObjectFinalizers.resources | object | `{"limits":{"cpu":"200m","memory":"500Mi"},"requests":{"cpu":"100m","memory":"200Mi"}}` | Define resources for container in patch job | +| autoscaling.patchObjectFinalizers.nodeSelector | object | `{}` | Node selector for patch job pods| | autoscaling.scaledOptions | object | `{"maxReplicaCount":24,"minReplicaCount":0,"pollingInterval":20}` | Options for KEDA scaled resources (keep only common options used for both ScaledJob and ScaledObject) | | autoscaling.scaledOptions.minReplicaCount | int | `0` | Minimum number of replicas | | autoscaling.scaledOptions.maxReplicaCount | int | `24` | Maximum number of replicas | diff --git a/charts/selenium-grid/templates/patch-keda/patch-keda-objects-job.yaml b/charts/selenium-grid/templates/patch-keda/patch-keda-objects-job.yaml index 9d0de5c319..6400be3931 100644 --- a/charts/selenium-grid/templates/patch-keda/patch-keda-objects-job.yaml +++ b/charts/selenium-grid/templates/patch-keda/patch-keda-objects-job.yaml @@ -45,4 +45,6 @@ spec: - name: {{ default $.Values.global.seleniumGrid.imagePullSecret $.Values.autoscaling.patchObjectFinalizers.imagePullSecret }} {{- end }} restartPolicy: Never + nodeSelector: + {{- toYaml $.Values.autoscaling.patchObjectFinalizers.nodeSelector | nindent 8 }} {{- end }} diff --git a/charts/selenium-grid/values.yaml b/charts/selenium-grid/values.yaml index cdaf6fee10..c145e79c6c 100644 --- a/charts/selenium-grid/values.yaml +++ b/charts/selenium-grid/values.yaml @@ -1043,6 +1043,8 @@ autoscaling: limits: cpu: 200m memory: 500Mi + # -- Node selector for the patch job + nodeSelector: {} # -- Options for KEDA scaled resources (keep only common options used for both ScaledJob and ScaledObject) scaledOptions: # -- Minimum number of replicas From 3518167ec73ead71560b88a8d1b99ad462d44bed Mon Sep 17 00:00:00 2001 From: amardeep2006 Date: Wed, 29 Jan 2025 21:50:55 +0530 Subject: [PATCH 2/4] chore: added changes as per AI review suggestion --- .../templates/patch-keda/patch-keda-objects-job.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/selenium-grid/templates/patch-keda/patch-keda-objects-job.yaml b/charts/selenium-grid/templates/patch-keda/patch-keda-objects-job.yaml index 6400be3931..0f9d06b7a9 100644 --- a/charts/selenium-grid/templates/patch-keda/patch-keda-objects-job.yaml +++ b/charts/selenium-grid/templates/patch-keda/patch-keda-objects-job.yaml @@ -45,6 +45,7 @@ spec: - name: {{ default $.Values.global.seleniumGrid.imagePullSecret $.Values.autoscaling.patchObjectFinalizers.imagePullSecret }} {{- end }} restartPolicy: Never - nodeSelector: - {{- toYaml $.Values.autoscaling.patchObjectFinalizers.nodeSelector | nindent 8 }} + {{- with .Values.autoscaling.patchObjectFinalizers.nodeSelector }} + nodeSelector: {{- toYaml . | nindent 8 }} + {{- end }} {{- end }} From b29d929ef0256fcf212e2162dadca309fb4a91eb Mon Sep 17 00:00:00 2001 From: Viet Nguyen Duc Date: Thu, 30 Jan 2025 06:59:04 +0700 Subject: [PATCH 3/4] Correct configuration table Signed-off-by: Viet Nguyen Duc --- charts/selenium-grid/CONFIGURATION.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/selenium-grid/CONFIGURATION.md b/charts/selenium-grid/CONFIGURATION.md index a4840f4028..558a406be2 100644 --- a/charts/selenium-grid/CONFIGURATION.md +++ b/charts/selenium-grid/CONFIGURATION.md @@ -395,7 +395,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes | autoscaling.patchObjectFinalizers.serviceAccount | string | `""` | Define an external service account name contains permissions to patch KEDA scaled resources | | autoscaling.patchObjectFinalizers.imagePullSecret | string | `""` | Custom pull secret for container in patch job | | autoscaling.patchObjectFinalizers.resources | object | `{"limits":{"cpu":"200m","memory":"500Mi"},"requests":{"cpu":"100m","memory":"200Mi"}}` | Define resources for container in patch job | -| autoscaling.patchObjectFinalizers.nodeSelector | object | `{}` | Node selector for patch job pods| +| autoscaling.patchObjectFinalizers.nodeSelector | object | `{}` | Node selector for the patch job | | autoscaling.scaledOptions | object | `{"maxReplicaCount":24,"minReplicaCount":0,"pollingInterval":20}` | Options for KEDA scaled resources (keep only common options used for both ScaledJob and ScaledObject) | | autoscaling.scaledOptions.minReplicaCount | int | `0` | Minimum number of replicas | | autoscaling.scaledOptions.maxReplicaCount | int | `24` | Maximum number of replicas | From 1ea164e42fe4544d21aaf345709d719596d50dde Mon Sep 17 00:00:00 2001 From: Viet Nguyen Duc Date: Thu, 30 Jan 2025 08:29:39 +0700 Subject: [PATCH 4/4] Remove trailing spaces Signed-off-by: Viet Nguyen Duc --- charts/selenium-grid/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/selenium-grid/values.yaml b/charts/selenium-grid/values.yaml index c145e79c6c..87826148d0 100644 --- a/charts/selenium-grid/values.yaml +++ b/charts/selenium-grid/values.yaml @@ -1044,7 +1044,7 @@ autoscaling: cpu: 200m memory: 500Mi # -- Node selector for the patch job - nodeSelector: {} + nodeSelector: {} # -- Options for KEDA scaled resources (keep only common options used for both ScaledJob and ScaledObject) scaledOptions: # -- Minimum number of replicas