Merge pull request #3863 from jwcesign/add-validation-cronfhpa

fix: fix bugs about validation of targetMinReplicas<=targetMaxReplicas and CronFederatedHPA status record
karmada-io · Jul 31, 2023 · 9311a25 · 9311a25
2 parents fe0fc02 + 4da22c3
commit 9311a25
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/controllers/cronfederatedhpa/cronfederatedhpa_job.go b/pkg/controllers/cronfederatedhpa/cronfederatedhpa_job.go
@@ -268,7 +268,7 @@ func (c *CronFederatedHPAJob) addFailedExecutionHistory(
 
 func (c *CronFederatedHPAJob) addSuccessExecutionHistory(
 	cronFHPA *autoscalingv1alpha1.CronFederatedHPA,
-	appliedReplicas, appliedMaxReplicas, appliedMinReplicas *int32) error {
+	appliedReplicas, appliedMinReplicas, appliedMaxReplicas *int32) error {
 	_, nextExecutionTime := c.scheduler.NextRun()
 
 	// Add success history record, return false if there is no such rule

diff --git a/pkg/webhook/cronfederatedhpa/validation.go b/pkg/webhook/cronfederatedhpa/validation.go
@@ -16,6 +16,7 @@ package cronfederatedhpa
 import (
 	"context"
 	"fmt"
+	"math"
 	"net/http"
 	"time"
 	_ "time/tzdata"
@@ -140,11 +141,11 @@ func validateCronFederatedHPAScalingReplicas(rule autoscalingv1alpha1.CronFedera
 			errs = append(errs, field.Invalid(fldPath.Child("targetMinReplicas"), "",
 				"targetMinReplicas should be larger than 0"))
 		}
-		if pointer.Int32Deref(rule.TargetMaxReplicas, 1) <= 0 {
+		if pointer.Int32Deref(rule.TargetMaxReplicas, math.MaxInt32) <= 0 {
 			errs = append(errs, field.Invalid(fldPath.Child("targetMaxReplicas"), "",
 				"targetMaxReplicas should be larger than 0"))
 		}
-		if pointer.Int32Deref(rule.TargetMinReplicas, 1) > pointer.Int32Deref(rule.TargetMaxReplicas, 1) {
+		if pointer.Int32Deref(rule.TargetMinReplicas, 1) > pointer.Int32Deref(rule.TargetMaxReplicas, math.MaxInt32) {
 			errs = append(errs, field.Invalid(fldPath.Child("targetMinReplicas"), "",
 				"targetMaxReplicas should be larger than or equal to targetMinReplicas"))
 		}