resolve convos

Signed-off-by: gauron99 <fridrich.david19@gmail.com>

Author: gauron99

.golangci.yml

@@ -108,7 +108,7 @@ issues:
       linters:
         - dupl
   # Exclude gci check for //+kubebuilder:scaffold:imports comments. Waiting to
-  # resolve https://github.com/kedacore/keda/issues/4379 (#4379)
+  # resolve https://github.com/kedacore/keda/issues/4379
     - path: cmd/operator/main.go
       linters:
         - gci

CHANGELOG.md

@@ -42,9 +42,10 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio
 - [v1.0.0](#v100)
 
 ## Unreleased
-- **cpu/mem scaler**: Add option to scale to zero with cpu/mem scaler([#4269](https://github.com/kedacore/keda/issues/4269))
+
 ### New
 
+- **CPU/Memory scaler**: Add support for scale to zero if there are multiple triggers([#4269](https://github.com/kedacore/keda/issues/4269))
 - TODO ([#XXX](https://github.com/kedacore/keda/issue/XXX))
 
 ### Improvements

apis/keda/v1alpha1/scaledobject_webhook.go

@@ -141,7 +141,6 @@ func verifyHpas(incomingSo *ScaledObject, action string) error {
 	return nil
 }
 
-// TODO
 func verifyScaledObjects(incomingSo *ScaledObject, action string) error {
 	soList := &ScaledObjectList{}
 	opt := &client.ListOptions{
@@ -255,7 +254,7 @@ func verifyCPUMemoryScalers(incomingSo *ScaledObject, action string) error {
 			}
 
 			if (scaleToZeroErr && incomingSo.Spec.MinReplicaCount == nil) || (scaleToZeroErr && *incomingSo.Spec.MinReplicaCount == 0) {
-				err := fmt.Errorf("scaledobject has no external triggers AND minReplica is 0 (it can never scale down to 0)")
+				err := fmt.Errorf("scaledobject has only cpu/memory triggers AND minReplica is 0 (scale to zero doesn't work in this case)")
 				scaledobjectlog.Error(err, "validation error")
 				prommetrics.RecordScaledObjectValidatingErrors(incomingSo.Namespace, action, "scale-to-zero-requirements-not-met")
 				return err

pkg/scaling/scale_handler.go

@@ -566,7 +566,7 @@ func (h *scaleHandler) getScaledObjectState(ctx context.Context, scaledObject *k
 		}
 
 		for _, spec := range metricSpecs {
-			// if cpu/memory resource scaler has minReplicas==0 & atleast one external
+			// if cpu/memory resource scaler has minReplicas==0 & at least one external
 			// trigger exists -> object can be scaled to zero
 			//
 			if spec.External == nil {