K8s: Update ScaledJob scaling strategy to eager as default

Signed-off-by: Viet Nguyen Duc <[email protected]>

Author: VietND96

charts/selenium-grid/templates/_helpers.tpl

@@ -249,7 +249,9 @@ triggers:
     authenticationRef:
       name: {{ template "seleniumGrid.autoscaling.authenticationRef.fullname" $ }}
     useCachedMetrics: {{ $.Values.autoscaling.useCachedMetrics }}
+  {{- if eq $.Values.autoscaling.scalingType "deployment" -}}
     metricType: {{ $.Values.autoscaling.metricType }}
+  {{- end -}}
 {{- end }}
 {{- end -}}
 

charts/selenium-grid/templates/patch-keda/patch-keda-objects-job.yaml

@@ -35,8 +35,8 @@ spec:
             - |
               echo "Cleaning up ScaledObjects, ScaledJobs and HPAs for {{ .Release.Name }} when upgrading or disabling autoscaling."
               kubectl get ScaledObjects,ScaledJobs,TriggerAuthentication -n {{ .Release.Namespace }} -l component.autoscaling={{ .Release.Name }} -o=json | jq '.metadata.finalizers = null' | kubectl apply -f - || true ;
-              kubectl delete ScaledObjects,ScaledJobs,TriggerAuthentication -n {{ .Release.Namespace }} -l component.autoscaling={{ .Release.Name }} --wait || true ;
-              kubectl delete hpa -n {{ .Release.Namespace }} -l component.autoscaling={{ .Release.Name }} --wait || true ;
+              kubectl delete ScaledObjects,ScaledJobs,TriggerAuthentication -n {{ .Release.Namespace }} -l component.autoscaling={{ .Release.Name }} --wait false || true ;
+              kubectl delete hpa -n {{ .Release.Namespace }} -l component.autoscaling={{ .Release.Name }} --wait false || true ;
         {{- with $.Values.autoscaling.patchObjectFinalizers.resources }}
           resources: {{ toYaml . | nindent 12 }}
         {{- end }}

charts/selenium-grid/values.yaml

@@ -156,7 +156,7 @@ rbacRole:
     - apiGroups:
         - keda.sh
       resources:
-        - triggerauthentication
+        - triggerauthentications
       verbs: [get, list, patch, update, delete]
     - apiGroups:
         - autoscaling
@@ -835,15 +835,17 @@ autoscaling:
     name: ""
     annotations:
       "helm.sh/hook": post-install,post-upgrade,post-rollback
-      "helm.sh/hook-weight": "-2"
+      # TriggerAuthentication is used by ScaledObject/ScaledJob, hence weight should be less than those hooks
+      "helm.sh/hook-weight": "0"
   # Configuration for ScaledObject triggers https://keda.sh/docs/latest/reference/scaledobject-spec/#triggers
   # -- Enables caching of metric values during polling interval (as specified in .spec.pollingInterval).
-  useCachedMetrics: true
+  useCachedMetrics: false
   # -- The type of metric that should be used (Override the default: AverageValue in KEDA)
   metricType: Value
   # -- Annotations for KEDA resources: ScaledObject and ScaledJob
   annotations:
     "helm.sh/hook": post-install,post-upgrade,post-rollback
+    # Ensure the weight should be higher than TriggerAuthentication hook
     "helm.sh/hook-weight": "1"
   patchObjectFinalizers:
     # -- Override the name of the patch job
@@ -856,6 +858,7 @@ autoscaling:
     annotations:
       "helm.sh/hook": post-install,post-upgrade,post-rollback,pre-delete
       "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
+      # This should be run before all other hooks (since delete action is called), so use a negative weight
       "helm.sh/hook-weight": "-1"
     # -- Define an external service account name contains permissions to patch KEDA scaled resources
     serviceAccount: ""
@@ -882,9 +885,9 @@ autoscaling:
   # Options for KEDA ScaledJobs (only used when scalingType is set to "job"). See https://keda.sh/docs/latest/concepts/scaling-jobs/#scaledjob-spec
   scaledJobOptions:
     scalingStrategy:
-      # Offer the strategy default with scaler calculation updated in https://github.com/SeleniumHQ/docker-selenium/tree/trunk/.keda/README.md
-      # -- Scaling strategy for KEDA ScaledJob
-      strategy: accurate
+      # Use `eager` strategy for utilizing all available slots up to the maxReplicaCount, ensuring that waiting request are processed as quickly as possible.
+      # -- Scaling strategy for KEDA ScaledJob - https://keda.sh/docs/latest/reference/scaledjob-spec/#scalingstrategy
+      strategy: eager
     # -- Number of Completed jobs should be kept
     successfulJobsHistoryLimit: 0
     # -- Number of Failed jobs should be kept (for troubleshooting purposes)