File tree Expand file tree Collapse file tree
knative.dev/eventing/pkg/apis/sources Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -14,8 +14,8 @@ require (
1414 k8s.io/api v0.20.7
1515 k8s.io/apimachinery v0.20.7
1616 k8s.io/client-go v0.20.7
17- knative.dev/eventing v0.24.0
17+ knative.dev/eventing v0.24.2
1818 knative.dev/hack v0.0.0-20210622141627-e28525d8d260
19- knative.dev/pkg v0.0.0-20210622173328-dd0db4b05c80
19+ knative.dev/pkg v0.0.0-20210902173607-953af0138c75
2020 knative.dev/serving v0.24.0
2121)
Original file line number Diff line number Diff line change @@ -1583,15 +1583,16 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
15831583k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 h1:0T5IaWHO3sJTEmCP6mUlBvMukxPKUQWqiI/YuiBNMiQ =
15841584k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 /go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA =
15851585knative.dev/caching v0.0.0-20210622183028-95f67e075071 /go.mod h1:9gwZcCBtmo9pi1oTgchXcdMNAXAYWklwDmO9uhDsIJE =
1586- knative.dev/eventing v0.24.0 h1:CoaQwZBizxZyOFJUvFcyb7vYSvpYBmfb4IYRNWUdTPE =
1587- knative.dev/eventing v0.24.0 /go.mod h1:9xo0SWkIfpXrx0lvGQO7MUlPF8cu+QCMd2gGxj6wxrU =
1586+ knative.dev/eventing v0.24.2 h1:yW3pOUKm/PixfH/lGsDVX9UdHahR2uzMoewV4PkRbK8 =
1587+ knative.dev/eventing v0.24.2 /go.mod h1:9xo0SWkIfpXrx0lvGQO7MUlPF8cu+QCMd2gGxj6wxrU =
15881588knative.dev/hack v0.0.0-20210622141627-e28525d8d260 h1:f2eMtOubAOc/Q7JlvFPDKXiPlJVK+VpX2Cot8hRzCgQ =
15891589knative.dev/hack v0.0.0-20210622141627-e28525d8d260 /go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI =
15901590knative.dev/hack/schema v0.0.0-20210622141627-e28525d8d260 /go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0 =
15911591knative.dev/networking v0.0.0-20210622182128-53f45d6d2cfa h1:MprAGBX3eRaBZFRXC3ZjsnhnjttfprRVXdxmTeEzC2o =
15921592knative.dev/networking v0.0.0-20210622182128-53f45d6d2cfa /go.mod h1:vwPACNE712tyoEG4fjyUIgfL4xkbXFugx8bxW+QrKn4 =
1593- knative.dev/pkg v0.0.0-20210622173328-dd0db4b05c80 h1:GHJ3lglE0/YHfBMMJqluqUNLOmsNXh7s7DBnfrkpRMM =
15941593knative.dev/pkg v0.0.0-20210622173328-dd0db4b05c80 /go.mod h1:kGegTnbZ+ljFjAE3E1+8wgaH2LMv8qYi+72o3F3cbdc =
1594+ knative.dev/pkg v0.0.0-20210902173607-953af0138c75 h1:U9Im5Wp0oKV2ZWP+V9RZSDgRqv4IhfnzObMrgzWdDRQ =
1595+ knative.dev/pkg v0.0.0-20210902173607-953af0138c75 /go.mod h1:kGegTnbZ+ljFjAE3E1+8wgaH2LMv8qYi+72o3F3cbdc =
15951596knative.dev/reconciler-test v0.0.0-20210623134345-88c84739abd9 /go.mod h1:4wqv2WyWUC5yhTesRUVwgjv/fHTHny1RYBfdB6tVDok =
15961597knative.dev/serving v0.24.0 h1:MZIXR0r2FCXlTuQQXwLuM9+tV6pl2K6YUtK6tEtDB58 =
15971598knative.dev/serving v0.24.0 /go.mod h1:l/dhsWs+Y8PAssBxaS/hN4HRQQGy4zxfVHD1xYjl3ns =
Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ import (
2020 "context"
2121 "encoding/base64"
2222 "encoding/json"
23+ "errors"
2324 "fmt"
2425 "strings"
2526
@@ -37,8 +38,10 @@ func (c *PingSource) Validate(ctx context.Context) *apis.FieldError {
3738
3839func (cs * PingSourceSpec ) Validate (ctx context.Context ) * apis.FieldError {
3940 var errs * apis.FieldError
40-
4141 schedule := cs .Schedule
42+
43+ errs = validateDescriptor (schedule )
44+
4245 if cs .Timezone != "" {
4346 schedule = "CRON_TZ=" + cs .Timezone + " " + schedule
4447 }
@@ -98,3 +101,10 @@ func validateJSON(str string) error {
98101 var objmap map [string ]interface {}
99102 return json .Unmarshal ([]byte (str ), & objmap )
100103}
104+
105+ func validateDescriptor (spec string ) * apis.FieldError {
106+ if strings .Contains (spec , "@every" ) {
107+ return apis .ErrInvalidValue (errors .New ("unsupported descriptor @every" ), "schedule" )
108+ }
109+ return nil
110+ }
Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ import (
2020 "context"
2121 "encoding/base64"
2222 "encoding/json"
23+ "errors"
2324 "fmt"
2425 "strings"
2526
@@ -37,8 +38,10 @@ func (c *PingSource) Validate(ctx context.Context) *apis.FieldError {
3738
3839func (cs * PingSourceSpec ) Validate (ctx context.Context ) * apis.FieldError {
3940 var errs * apis.FieldError
40-
4141 schedule := cs .Schedule
42+
43+ errs = validateDescriptor (schedule )
44+
4245 if cs .Timezone != "" {
4346 schedule = "CRON_TZ=" + cs .Timezone + " " + schedule
4447 }
@@ -98,3 +101,10 @@ func validateJSON(str string) error {
98101 var objmap map [string ]interface {}
99102 return json .Unmarshal ([]byte (str ), & objmap )
100103}
104+
105+ func validateDescriptor (spec string ) * apis.FieldError {
106+ if strings .Contains (spec , "@every" ) {
107+ return apis .ErrInvalidValue (errors .New ("unsupported descriptor @every" ), "schedule" )
108+ }
109+ return nil
110+ }
Original file line number Diff line number Diff line change @@ -914,7 +914,7 @@ k8s.io/utils/buffer
914914k8s.io/utils/integer
915915k8s.io/utils/pointer
916916k8s.io/utils/trace
917- # knative.dev/eventing v0.24.0
917+ # knative.dev/eventing v0.24.2
918918## explicit
919919knative.dev/eventing/pkg/adapter/v2
920920knative.dev/eventing/pkg/adapter/v2/util/crstatusevent
@@ -967,7 +967,7 @@ knative.dev/hack
967967knative.dev/networking/pkg
968968knative.dev/networking/pkg/apis/networking
969969knative.dev/networking/pkg/apis/networking/v1alpha1
970- # knative.dev/pkg v0.0.0-20210622173328-dd0db4b05c80
970+ # knative.dev/pkg v0.0.0-20210902173607-953af0138c75
971971## explicit
972972knative.dev/pkg/apis
973973knative.dev/pkg/apis/duck
You can’t perform that action at this time.
0 commit comments