Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions internal/store/cronjob.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ import (
"k8s.io/client-go/tools/cache"
basemetrics "k8s.io/component-base/metrics"

"k8s.io/klog/v2"

"k8s.io/kube-state-metrics/v2/pkg/metric"
generator "k8s.io/kube-state-metrics/v2/pkg/metric_generator"
)
Expand Down Expand Up @@ -251,8 +253,10 @@ func cronJobMetricFamilies(allowAnnotationsList, allowLabelsList []string) []gen
// If the cron job is suspended, don't track the next scheduled time
nextScheduledTime, err := getNextScheduledTime(j.Spec.Schedule, j.Status.LastScheduleTime, j.CreationTimestamp, j.Spec.TimeZone)
if err != nil {
panic(err)
} else if j.Spec.Suspend == nil || !*j.Spec.Suspend {
klog.ErrorS(err, "Failed to compute next schedule time for cronjob", "namespace", j.Namespace, "cronjob", j.Name, "schedule", j.Spec.Schedule, "timezone", j.Spec.TimeZone)
return &metric.Family{Metrics: ms}
}
Comment thread
aryanputta marked this conversation as resolved.
if j.Spec.Suspend == nil || !*j.Spec.Suspend {
ms = append(ms, &metric.Metric{
Comment thread
aryanputta marked this conversation as resolved.
LabelKeys: []string{},
LabelValues: []string{},
Expand Down
37 changes: 35 additions & 2 deletions internal/store/cronjob_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -533,32 +533,65 @@ func TestCronJobStore(t *testing.T) {
func TestGetNextScheduledTime(t *testing.T) {

testCases := []struct {
Desc string
schedule string
lastScheduleTime metav1.Time
createdTime metav1.Time
timeZone string
expected time.Time
expectErr bool
}{
{
Desc: "valid schedule with UTC timezone",
schedule: "0 */6 * * *",
lastScheduleTime: metav1.Time{Time: ActiveRunningCronJob1LastScheduleTime},
createdTime: metav1.Time{Time: ActiveRunningCronJob1LastScheduleTime},
timeZone: "UTC",
expected: ActiveRunningCronJob1LastScheduleTime.Add(time.Second*4 + time.Minute*25 + time.Hour),
},
{
Desc: "valid schedule with named timezone",
schedule: "0 */6 * * *",
lastScheduleTime: metav1.Time{Time: ActiveRunningCronJob1LastScheduleTime},
createdTime: metav1.Time{Time: ActiveRunningCronJob1LastScheduleTime},
timeZone: TimeZone,
expected: ActiveRunningCronJob1LastScheduleTime.Add(time.Second*4 + time.Minute*25 + time.Hour*5),
},
{
Desc: "invalid timezone returns error",
schedule: "0 */6 * * *",
lastScheduleTime: metav1.Time{Time: ActiveRunningCronJob1LastScheduleTime},
createdTime: metav1.Time{Time: ActiveRunningCronJob1LastScheduleTime},
timeZone: "Not/A_Real_Zone",
expectErr: true,
},
{
Desc: "invalid schedule expression returns error",
schedule: "not a cron expression",
lastScheduleTime: metav1.Time{Time: ActiveRunningCronJob1LastScheduleTime},
createdTime: metav1.Time{Time: ActiveRunningCronJob1LastScheduleTime},
timeZone: "UTC",
expectErr: true,
},
}

for _, test := range testCases {
actual, _ := getNextScheduledTime(test.schedule, &test.lastScheduleTime, test.createdTime, &test.timeZone) // #nosec G601
actual, err := getNextScheduledTime(test.schedule, &test.lastScheduleTime, test.createdTime, &test.timeZone) // #nosec G601
if test.expectErr {
if err == nil {
t.Errorf("%s: expected error, got nil (actual=%v)", test.Desc, actual)
}
if !actual.IsZero() {
t.Errorf("%s: expected zero time on error, got %v", test.Desc, actual)
}
continue
}
if err != nil {
t.Errorf("%s: unexpected error: %v", test.Desc, err)
continue
}
if !actual.Equal(test.expected) {
t.Fatalf("%v: expected %v, actual %v", test.schedule, test.expected, actual)
t.Fatalf("%s: expected %v, actual %v", test.Desc, test.expected, actual)
}
}

Expand Down