Skip to content

Commit 71428b9

Browse files
authored
Merge pull request kubernetes-sigs#728 from chimanjain/upgr-robfig-cron-v3
chore: upgrade gopkg.in/robfig/cron.v2 to github.com/robfig/cron/v3
2 parents 32fe11a + 5191659 commit 71428b9

6 files changed

Lines changed: 76 additions & 48 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ require (
5050
github.com/prometheus/client_golang v1.22.0
5151
github.com/prometheus/client_model v0.6.2
5252
github.com/prometheus/common v0.62.0
53+
github.com/robfig/cron/v3 v3.0.1
5354
github.com/shurcooL/githubv4 v0.0.0-20210725200734-83ba7b4c9228
5455
github.com/sirupsen/logrus v1.9.3
5556
github.com/spf13/pflag v1.0.6
@@ -73,7 +74,6 @@ require (
7374
google.golang.org/protobuf v1.36.10
7475
gopkg.in/fsnotify.v1 v1.4.7
7576
gopkg.in/ini.v1 v1.67.0
76-
gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5
7777
gopkg.in/yaml.v3 v3.0.1
7878
k8s.io/api v0.33.11
7979
k8s.io/apimachinery v0.33.11

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg
583583
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
584584
github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT1pX2CziuyQR0=
585585
github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI=
586+
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
587+
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
586588
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
587589
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
588590
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
@@ -1116,8 +1118,6 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
11161118
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
11171119
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
11181120
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
1119-
gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 h1:E846t8CnR+lv5nE+VuiKTDG/v1U2stad0QzddfJC7kY=
1120-
gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5/go.mod h1:hiOFpYm0ZJbusNj2ywpbrXowU3G8U6GIQzqn2mw1UIE=
11211121
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
11221122
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
11231123
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=

pkg/config/config.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ import (
4242
gitignore "github.com/denormal/go-gitignore"
4343
"github.com/google/go-cmp/cmp"
4444
"github.com/google/go-cmp/cmp/cmpopts"
45+
"github.com/robfig/cron/v3"
4546
"github.com/sirupsen/logrus"
4647
pipelinev1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
47-
"gopkg.in/robfig/cron.v2"
4848
v1 "k8s.io/api/core/v1"
4949
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5050
"k8s.io/apimachinery/pkg/labels"
@@ -63,6 +63,10 @@ import (
6363
"sigs.k8s.io/prow/pkg/pod-utils/downwardapi"
6464
)
6565

66+
var cronParser = cron.NewParser(
67+
cron.SecondOptional | cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow | cron.Descriptor,
68+
)
69+
6670
const (
6771
// DefaultJobTimeout represents the default deadline for a prow job.
6872
DefaultJobTimeout = 24 * time.Hour
@@ -2435,7 +2439,7 @@ func (c Config) validatePeriodics(periodics []Periodic) error {
24352439
}
24362440

24372441
if p.Cron != "" {
2438-
if _, err := cron.Parse(p.Cron); err != nil {
2442+
if _, err := cronParser.Parse(p.Cron); err != nil {
24392443
errs = append(errs, fmt.Errorf("invalid cron string %s in periodic %s: %w", p.Cron, p.Name, err))
24402444
}
24412445
}

0 commit comments

Comments
 (0)