Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cron scaler: Fix unexpected instance count change #3838

Merged
merged 4 commits into from
Dec 8, 2022
Merged

Cron scaler: Fix unexpected instance count change #3838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70e8ae5
Update cron_scaler.go
zou2699 Nov 10, 2022
b1972db
fix static check
zou2699 Dec 8, 2022
8f26166
Merge branch 'main' into zou2699-patch-1
zou2699 Dec 8, 2022
f3db720
sort CHANGELOG
zou2699 Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio
- **AWS Scalers**: Add setting AWS endpoint url. ([#3337](https://github.com/kedacore/keda/issues/3337))
- **Azure Service Bus Scaler**: Add support for Shared Access Signature (SAS) tokens for authentication. ([#2920](https://github.com/kedacore/keda/issues/2920))
- **Azure Service Bus Scaler:** Support regex usage in queueName / subscriptionName parameters. ([#1624](https://github.com/kedacore/keda/issues/1624))
- **Cron Scaler**: Fix unexpected instance count change. ([#3838](https://github.com/kedacore/keda/pull/3838))
zroubalik marked this conversation as resolved.
Show resolved Hide resolved
- **ElasticSearch Scaler**: Support for ElasticSearch Service on Elastic Cloud ([#3785]https://github.com/kedacore/keda/issues/3785)
- **Selenium Grid Scaler:** Allow setting url trigger parameter from TriggerAuthentication/ClusterTriggerAuthentication ([#3752](https://github.com/kedacore/keda/pull/3752))

Expand Down
5 changes: 3 additions & 2 deletions pkg/scalers/cron_scaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ func (s *cronScaler) IsActive(ctx context.Context) (bool, error) {
return false, fmt.Errorf("unable to load timezone. Error: %s", err)
}

// 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 false, fmt.Errorf("error initializing start cron: %s", startTimecronErr)
Expand All @@ -131,8 +134,6 @@ func (s *cronScaler) IsActive(ctx context.Context) (bool, error) {
return false, fmt.Errorf("error intializing end cron: %s", endTimecronErr)
}

// Since we are considering the timestamp here and not the exact time, timezone does matter.
currentTime := time.Now().Unix()
switch {
case nextStartTime < nextEndTime && currentTime < nextStartTime:
return false, nil
Expand Down