Skip to content

fix switchover schedule tests #2995

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

Open
berler wants to merge 4 commits into
base: master
Choose a base branch
from
+7 −3
Open

fix switchover schedule tests #2995

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
446c134
fix switchover schedule tests
berler Nov 19, 2025
1954925
Merge branch 'master' into improve-switchover-tests
FxKu Dec 6, 2025
1d8ab8b
Merge branch 'master' into improve-switchover-tests
FxKu Dec 10, 2025
53ee08d
Merge branch 'master' into improve-switchover-tests
FxKu Dec 10, 2025
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
6 changes: 5 additions & 1 deletion pkg/cluster/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1767,9 +1767,13 @@ func (c *Cluster) GetStatus() *ClusterStatus {
}

func (c *Cluster) GetSwitchoverSchedule() string {
now := time.Now().UTC()
return c.GetSwitchoverScheduleAtTime(now)
Copy link
Member

@FxKu FxKu Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return c.GetSwitchoverScheduleAtTime(now)
return c.getSwitchoverScheduleAtTime(now)

see below

}

func (c *Cluster) GetSwitchoverScheduleAtTime(now time.Time) string {
Copy link
Member

@mikkeloscar mikkeloscar Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
func (c *Cluster) GetSwitchoverScheduleAtTime(now time.Time) string {
func (c *Cluster) getSwitchoverScheduleAtTime(now time.Time) string {

This method doesn't need to be exported

var possibleSwitchover, schedule time.Time

now := time.Now().UTC()
for _, window := range c.Spec.MaintenanceWindows {
// in the best case it is possible today
possibleSwitchover = time.Date(now.Year(), now.Month(), now.Day(), window.StartTime.Hour(), window.StartTime.Minute(), 0, 0, time.UTC)
Expand Down
4 changes: 2 additions & 2 deletions pkg/cluster/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2116,7 +2116,7 @@ func TestCompareVolumeMounts(t *testing.T) {
}

func TestGetSwitchoverSchedule(t *testing.T) {
now := time.Now()
now, _ := time.Parse(time.RFC3339, "2025-11-11T12:35:00Z")
Copy link
Author

@berler berler Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note that you can reproduce the test failures I had when running locally by passing in some other times here like

  • 2025-11-11T20:35:00-08:00
  • 2025-11-11T23:35:00Z

Copy link
Member

@FxKu FxKu Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jup, could reproduce. Thanks for the pointer


futureTimeStart := now.Add(1 * time.Hour)
futureWindowTimeStart := futureTimeStart.Format("15:04")
Expand Down Expand Up @@ -2195,7 +2195,7 @@ func TestGetSwitchoverSchedule(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
cluster.Spec.MaintenanceWindows = tt.windows
schedule := cluster.GetSwitchoverSchedule()
schedule := cluster.GetSwitchoverScheduleAtTime(now)
Copy link
Member

@FxKu FxKu Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
schedule := cluster.GetSwitchoverScheduleAtTime(now)
schedule := cluster.getSwitchoverScheduleAtTime(now)

see Mikkel's comment

if schedule != tt.expected {
t.Errorf("Expected GetSwitchoverSchedule to return %s, returned: %s", tt.expected, schedule)
}
Expand Down