From b9b62b9d3a1147a86f26aa35792c0753b4323390 Mon Sep 17 00:00:00 2001
From: Joel Smith <joelsmith@redhat.com>
Date: Thu, 8 Aug 2024 19:42:36 -0600
Subject: [PATCH 1/2] Simplify cron scaler code

Signed-off-by: Joel Smith <joelsmith@redhat.com>
---
 CHANGELOG.md               |  2 +-
 pkg/scalers/cron_scaler.go | 31 +++++++++----------------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e7d28889e2..3eaeb43efcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,7 +87,7 @@ New deprecation(s):
 
 ### Other
 
-- TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX))
+- **Cron Scaler**: Simplify code to determine next start and stop times ([#6056](https://github.com/kedacore/keda/pull/6056))
 
 ## v2.15.1
 
diff --git a/pkg/scalers/cron_scaler.go b/pkg/scalers/cron_scaler.go
index 782082c0098..bc22db80011 100644
--- a/pkg/scalers/cron_scaler.go
+++ b/pkg/scalers/cron_scaler.go
@@ -30,6 +30,8 @@ type cronScaler struct {
 type cronMetadata struct {
 	start           string
 	end             string
+	startSched      cron.Schedule
+	endSched        cron.Schedule
 	timezone        string
 	desiredReplicas int64
 	triggerIndex    int
@@ -54,21 +56,12 @@ func NewCronScaler(config *scalersconfig.ScalerConfig) (Scaler, error) {
 	}, nil
 }
 
-func getCronTime(location *time.Location, spec string) (int64, error) {
-	c := cron.New(cron.WithLocation(location))
-	_, err := c.AddFunc(spec, func() { _ = fmt.Sprintf("Cron initialized for location %s", location.String()) })
-	if err != nil {
-		return 0, err
-	}
-
-	c.Start()
-	cronTime := c.Entries()[0].Next.Unix()
-	c.Stop()
-
-	return cronTime, nil
+func getCronTime(location *time.Location, sched cron.Schedule) int64 {
+	return sched.Next(time.Now().In(location)).Unix()
 }
 
 func parseCronMetadata(config *scalersconfig.ScalerConfig) (*cronMetadata, error) {
+	var err error
 	if len(config.TriggerMetadata) == 0 {
 		return nil, fmt.Errorf("invalid Input Metadata. %s", config.TriggerMetadata)
 	}
@@ -81,7 +74,7 @@ func parseCronMetadata(config *scalersconfig.ScalerConfig) (*cronMetadata, error
 	}
 	parser := cron.NewParser(cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow)
 	if val, ok := config.TriggerMetadata["start"]; ok && val != "" {
-		_, err := parser.Parse(val)
+		meta.startSched, err = parser.Parse(val)
 		if err != nil {
 			return nil, fmt.Errorf("error parsing start schedule: %w", err)
 		}
@@ -90,7 +83,7 @@ func parseCronMetadata(config *scalersconfig.ScalerConfig) (*cronMetadata, error
 		return nil, fmt.Errorf("no start schedule specified. %s", config.TriggerMetadata)
 	}
 	if val, ok := config.TriggerMetadata["end"]; ok && val != "" {
-		_, err := parser.Parse(val)
+		meta.endSched, err = parser.Parse(val)
 		if err != nil {
 			return nil, fmt.Errorf("error parsing end schedule: %w", err)
 		}
@@ -152,15 +145,9 @@ func (s *cronScaler) GetMetricsAndActivity(_ context.Context, metricName string)
 	// Since we are considering the timestamp here and not the exact time, timezone does matter.
 	currentTime := time.Now().Unix()
 
-	nextStartTime, startTimecronErr := getCronTime(location, s.metadata.start)
-	if startTimecronErr != nil {
-		return []external_metrics.ExternalMetricValue{}, false, fmt.Errorf("error initializing start cron: %w", startTimecronErr)
-	}
+	nextStartTime := getCronTime(location, s.metadata.startSched)
 
-	nextEndTime, endTimecronErr := getCronTime(location, s.metadata.end)
-	if endTimecronErr != nil {
-		return []external_metrics.ExternalMetricValue{}, false, fmt.Errorf("error intializing end cron: %w", endTimecronErr)
-	}
+	nextEndTime := getCronTime(location, s.metadata.endSched)
 
 	switch {
 	case nextStartTime < nextEndTime && currentTime < nextStartTime:

From 56aa0def2fc002edf0bc3c4aa10c5c1a660f56db Mon Sep 17 00:00:00 2001
From: Joel Smith <joelsmith@redhat.com>
Date: Mon, 12 Aug 2024 09:23:25 -0600
Subject: [PATCH 2/2] Rebuild controller-gen before creating manifests to make
 sure it's the right version

---
 .github/workflows/pr-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
index 4928cd0f565..ceb3658ea04 100644
--- a/.github/workflows/pr-validation.yml
+++ b/.github/workflows/pr-validation.yml
@@ -60,7 +60,7 @@ jobs:
         run: make clientset-verify
 
       - name: Verify generated Manifests are up to date
-        run: make verify-manifests
+        run: rm -f bin/controller-gen && make verify-manifests
 
       - name: Build
         run: make build