From f2fc2fa2960aa36ed7834d35c6da3ad3e34efb64 Mon Sep 17 00:00:00 2001 From: knative-automation Date: Fri, 3 Sep 2021 21:04:42 -0400 Subject: [PATCH] upgrade to latest dependencies (#215) bumping knative.dev/hack 93ad912...509255f: > 509255f Do not print debug info when running release.sh (# 71) bumping knative.dev/pkg 4564797...8d4b5e0: > 8d4b5e0 [release-0.23] allow unknown metadata fields (# 2256) > a0d1c92 Drop redundant pointers and decoders (# 2261) bumping knative.dev/serving 35efb31...48178da: > 48178da Update Knative dependency for release-0.23 (# 11465) bumping knative.dev/eventing 200e54c...4e6cde3: > 4e6cde3 [release-0.23] [PingSource] disable @every (# 5591) > a5a8f89 Fix subtest client scope (# 5532) > ecc1c20 Update Knative dependency for release-0.23 (# 5470) > aa5d54e Fix cloudevent adapter panic (# 5425) > e3ad363 Add podAntiAffinity labels to remaining HA control plane pods (# 5413) Signed-off-by: Knative Automation --- go.mod | 8 ++++---- go.sum | 16 +++++++++------- .../eventing/pkg/adapter/v2/cloudevents.go | 3 ++- .../pkg/apis/sources/v1/ping_validation.go | 12 +++++++++++- .../pkg/apis/sources/v1beta2/ping_validation.go | 12 +++++++++++- vendor/knative.dev/hack/release.sh | 3 --- vendor/modules.txt | 8 ++++---- 7 files changed, 41 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index 614e15953..4f62282d3 100644 --- a/go.mod +++ b/go.mod @@ -14,8 +14,8 @@ require ( k8s.io/api v0.19.7 k8s.io/apimachinery v0.19.7 k8s.io/client-go v0.19.7 - knative.dev/eventing v0.23.0 - knative.dev/hack v0.0.0-20210428122153-93ad9129c268 - knative.dev/pkg v0.0.0-20210510175900-4564797bf3b7 - knative.dev/serving v0.23.0 + knative.dev/eventing v0.23.4 + knative.dev/hack v0.0.0-20210602212444-509255f29a24 + knative.dev/pkg v0.0.0-20210902175106-8d4b5e065ebb + knative.dev/serving v0.23.1 ) diff --git a/go.sum b/go.sum index 59f6e14f9..ae3598a78 100644 --- a/go.sum +++ b/go.sum @@ -1279,18 +1279,20 @@ k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 h1:0T5IaWHO3sJTEmCP6mUlBvMukxPKUQWqiI/YuiBNMiQ= k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= knative.dev/caching v0.0.0-20210512050647-922782660f7c/go.mod h1:d+fIY/LkAZAM6HsRJwmfirNDMCc1+hqGlQctLP1CmzE= -knative.dev/eventing v0.23.0 h1:0L1bVpll8kjdZNZ0FgNi4T0pPo4MmmDb6UJ06I9yHoM= -knative.dev/eventing v0.23.0/go.mod h1:vGob3H6BTseZP+/dA5ze89gM+iNHlB2Cez8FFI7A9KM= -knative.dev/hack v0.0.0-20210428122153-93ad9129c268 h1:lBIj9Epd9UQ55NEaHzAdY/UZbuaegCdGPKVC2+Z68Q0= +knative.dev/eventing v0.23.4 h1:/6JABYCHcAnDU8ysggnupvspOP0LSXRTo/QqqJCPT5I= +knative.dev/eventing v0.23.4/go.mod h1:RIUlBsCp/DoISbw7ryUsdWvFkFO8DYtpB4dlXL/o1u4= knative.dev/hack v0.0.0-20210428122153-93ad9129c268/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/hack/schema v0.0.0-20210428122153-93ad9129c268/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0= +knative.dev/hack v0.0.0-20210602212444-509255f29a24 h1:eFcqwqJueFb2yY7tJVhLnDmdZCfaewfj4+MxR1CAWGo= +knative.dev/hack v0.0.0-20210602212444-509255f29a24/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack/schema v0.0.0-20210602212444-509255f29a24/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0= knative.dev/networking v0.0.0-20210512050647-ace2d3306f0b h1:Ea6ym1Jfd/Hci1EGj+uPaE3d6SS1s/Br+6fFAWdJCeM= knative.dev/networking v0.0.0-20210512050647-ace2d3306f0b/go.mod h1:y7RmP2/dHO/DAC1QmpUtgTVF6/Z8whaL+wjgey+HthU= -knative.dev/pkg v0.0.0-20210510175900-4564797bf3b7 h1:i4P8emOPrLctmbaPHp5eRIOqz+XTOkit7KgZeS+onKs= knative.dev/pkg v0.0.0-20210510175900-4564797bf3b7/go.mod h1:fIl4l4OmZodkElyaHoT0LCF5wT+3+P/kinawQ4XlLtE= +knative.dev/pkg v0.0.0-20210902175106-8d4b5e065ebb h1:mo9BNfVGr9Bm+F9BfLaVBHUjThljMJhBXHII5RjuEi0= +knative.dev/pkg v0.0.0-20210902175106-8d4b5e065ebb/go.mod h1:fIl4l4OmZodkElyaHoT0LCF5wT+3+P/kinawQ4XlLtE= knative.dev/reconciler-test v0.0.0-20210512062647-d5adf72546be/go.mod h1:ZHvzjwe5aUnWDx+u5y9EPaZ++5PM9Yapp/IvBDiS+Yk= -knative.dev/serving v0.23.0 h1:7q2MTUOud7kgLPJsVUyZIEG3g+df5yTwQjc+BsomsS8= -knative.dev/serving v0.23.0/go.mod h1:hoGG2F9/qfAL/x0x14hAdciD7YxjdsaDqZ0PRNmj1gs= +knative.dev/serving v0.23.1 h1:5fead16AKU0OjN//2FOhfUamuOHWfnl149BEmwjkPDI= +knative.dev/serving v0.23.1/go.mod h1:1j9Kv89CFB671mXbVRsbbyhlBh7d3BfksOtSy9j8jQ4= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= diff --git a/vendor/knative.dev/eventing/pkg/adapter/v2/cloudevents.go b/vendor/knative.dev/eventing/pkg/adapter/v2/cloudevents.go index e9febad24..e1c07471f 100644 --- a/vendor/knative.dev/eventing/pkg/adapter/v2/cloudevents.go +++ b/vendor/knative.dev/eventing/pkg/adapter/v2/cloudevents.go @@ -181,8 +181,9 @@ func (c *client) reportMetrics(ctx context.Context, event cloudevents.Event, res var res *http.Result if !cloudevents.ResultAs(retryResult, &res) { c.reportError(reportArgs, result) + } else { + c.reporter.ReportRetryEventCount(reportArgs, res.StatusCode) } - c.reporter.ReportRetryEventCount(reportArgs, res.StatusCode) } } } diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/v1/ping_validation.go b/vendor/knative.dev/eventing/pkg/apis/sources/v1/ping_validation.go index d86489747..c60f49a4f 100644 --- a/vendor/knative.dev/eventing/pkg/apis/sources/v1/ping_validation.go +++ b/vendor/knative.dev/eventing/pkg/apis/sources/v1/ping_validation.go @@ -20,6 +20,7 @@ import ( "context" "encoding/base64" "encoding/json" + "errors" "fmt" "strings" @@ -37,8 +38,10 @@ func (c *PingSource) Validate(ctx context.Context) *apis.FieldError { func (cs *PingSourceSpec) Validate(ctx context.Context) *apis.FieldError { var errs *apis.FieldError - schedule := cs.Schedule + + errs = validateDescriptor(schedule) + if cs.Timezone != "" { schedule = "CRON_TZ=" + cs.Timezone + " " + schedule } @@ -98,3 +101,10 @@ func validateJSON(str string) error { var objmap map[string]interface{} return json.Unmarshal([]byte(str), &objmap) } + +func validateDescriptor(spec string) *apis.FieldError { + if strings.Contains(spec, "@every") { + return apis.ErrInvalidValue(errors.New("unsupported descriptor @every"), "schedule") + } + return nil +} diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/v1beta2/ping_validation.go b/vendor/knative.dev/eventing/pkg/apis/sources/v1beta2/ping_validation.go index 5bbd2d7f0..c8fa47a60 100644 --- a/vendor/knative.dev/eventing/pkg/apis/sources/v1beta2/ping_validation.go +++ b/vendor/knative.dev/eventing/pkg/apis/sources/v1beta2/ping_validation.go @@ -20,6 +20,7 @@ import ( "context" "encoding/base64" "encoding/json" + "errors" "fmt" "strings" @@ -37,8 +38,10 @@ func (c *PingSource) Validate(ctx context.Context) *apis.FieldError { func (cs *PingSourceSpec) Validate(ctx context.Context) *apis.FieldError { var errs *apis.FieldError - schedule := cs.Schedule + + errs = validateDescriptor(schedule) + if cs.Timezone != "" { schedule = "CRON_TZ=" + cs.Timezone + " " + schedule } @@ -98,3 +101,10 @@ func validateJSON(str string) error { var objmap map[string]interface{} return json.Unmarshal([]byte(str), &objmap) } + +func validateDescriptor(spec string) *apis.FieldError { + if strings.Contains(spec, "@every") { + return apis.ErrInvalidValue(errors.New("unsupported descriptor @every"), "schedule") + } + return nil +} diff --git a/vendor/knative.dev/hack/release.sh b/vendor/knative.dev/hack/release.sh index ffa5afd44..025fcab14 100644 --- a/vendor/knative.dev/hack/release.sh +++ b/vendor/knative.dev/hack/release.sh @@ -17,9 +17,6 @@ # This is a helper script for Knative release scripts. # See README.md for instructions on how to use it. -# Print commands -set -x - source $(dirname "${BASH_SOURCE[0]}")/library.sh # Organization name in GitHub; defaults to Knative. diff --git a/vendor/modules.txt b/vendor/modules.txt index 2eb0ecf2c..426f4ad43 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -906,7 +906,7 @@ k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/pointer k8s.io/utils/trace -# knative.dev/eventing v0.23.0 +# knative.dev/eventing v0.23.4 ## explicit knative.dev/eventing/pkg/adapter/v2 knative.dev/eventing/pkg/adapter/v2/util/crstatusevent @@ -951,14 +951,14 @@ knative.dev/eventing/test/lib/duck knative.dev/eventing/test/lib/resources knative.dev/eventing/test/lib/sender knative.dev/eventing/test/test_images -# knative.dev/hack v0.0.0-20210428122153-93ad9129c268 +# knative.dev/hack v0.0.0-20210602212444-509255f29a24 ## explicit knative.dev/hack # knative.dev/networking v0.0.0-20210512050647-ace2d3306f0b knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking knative.dev/networking/pkg/apis/networking/v1alpha1 -# knative.dev/pkg v0.0.0-20210510175900-4564797bf3b7 +# knative.dev/pkg v0.0.0-20210902175106-8d4b5e065ebb ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -1020,7 +1020,7 @@ knative.dev/pkg/tracker knative.dev/pkg/version knative.dev/pkg/webhook knative.dev/pkg/webhook/certificates/resources -# knative.dev/serving v0.23.0 +# knative.dev/serving v0.23.1 ## explicit knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1