From 0c231e2b6c01eca7d616e07740c9161640ce2982 Mon Sep 17 00:00:00 2001 From: knative-automation Date: Thu, 8 Jul 2021 22:32:19 -0700 Subject: [PATCH] upgrade to latest dependencies (#1366) bumping knative.dev/pkg 30f9568...4a3e56d: > 4a3e56d Update actions (# 2182) > fe90576 Retry 'no route to host' errors by default (# 2181) bumping knative.dev/serving d207fa3...7a3e9d0: > 7a3e9d0 Update net-contour nightly (# 11630) > 05e8a56 Update net-certmanager nightly (# 11639) > c9ede02 Update actions (# 11637) > f096587 Update net-kourier nightly (# 11633) > da26d28 Allow setting runAsNotRoot without the feature flag (# 11606) > 2a217e7 Update net-istio nightly (# 11632) > a147d72 upgrade to latest dependencies (# 11631) bumping knative.dev/networking ca0a601...4e655b7: > 4e655b7 Update actions (# 459) > 2a685f4 upgrade to latest dependencies (# 458) bumping knative.dev/eventing 90932eb...221dfdf: > 221dfdf add retries for apiServerSource (# 5457) > 262b70e Update actions (# 5575) > e1db1d3 upgrade to latest dependencies (# 5569) > 9ced574 Update actions (# 5557) > 9bc39bd Add DeadLetterURI to trigger status (# 5551) > cc883dc Make apiserversource test watch for update events (# 5568) Signed-off-by: Knative Automation --- go.mod | 8 ++++---- go.sum | 18 ++++++++++-------- .../pkg/apis/eventing/v1/trigger_lifecycle.go | 16 +++++++++++++++- .../pkg/apis/eventing/v1/trigger_types.go | 4 ++++ .../apis/eventing/v1/zz_generated.deepcopy.go | 5 +++++ .../knative.dev/pkg/test/spoof/error_checks.go | 4 ++++ vendor/knative.dev/pkg/test/spoof/spoof.go | 5 +++++ .../serving/pkg/apis/serving/fieldmask.go | 3 +++ vendor/modules.txt | 8 ++++---- 9 files changed, 54 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index d98f95dfb..0eade4a86 100644 --- a/go.mod +++ b/go.mod @@ -22,11 +22,11 @@ require ( k8s.io/cli-runtime v0.20.7 k8s.io/client-go v0.20.7 k8s.io/code-generator v0.20.7 - knative.dev/eventing v0.24.1-0.20210702080639-90932eb671e0 + knative.dev/eventing v0.24.1-0.20210708130023-221dfdfced62 knative.dev/hack v0.0.0-20210622141627-e28525d8d260 - knative.dev/networking v0.0.0-20210705111547-ca0a601fc900 - knative.dev/pkg v0.0.0-20210701025203-30f9568e894e - knative.dev/serving v0.24.1-0.20210705154247-d207fa3a92ac + knative.dev/networking v0.0.0-20210708015022-4e655b7fa1c3 + knative.dev/pkg v0.0.0-20210708145023-4a3e56dc13b2 + knative.dev/serving v0.24.1-0.20210708194119-7a3e9d03b0e4 sigs.k8s.io/yaml v1.2.0 ) diff --git a/go.sum b/go.sum index 3076e3140..746a344f8 100644 --- a/go.sum +++ b/go.sum @@ -1594,20 +1594,22 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/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-20210701025702-e6e703d9557b/go.mod h1:RZs6mvIaZendqv7O0ewst35K8o13Wqy5J7oMDjAdiu4= -knative.dev/eventing v0.24.1-0.20210702080639-90932eb671e0 h1:A3/G1uDuRLTU2vYAb8Po9F3CKZ1Svmqk5hfr5/dxTJ8= -knative.dev/eventing v0.24.1-0.20210702080639-90932eb671e0/go.mod h1:93VHah2XghrfrDFr4jSN4KdZS7RtoZuv4qR2Jn2B6x8= +knative.dev/eventing v0.24.1-0.20210708130023-221dfdfced62 h1:UiWAQRr1xifUbK7znIJSLQmnx6hnUIhpJQ1coMO6S9U= +knative.dev/eventing v0.24.1-0.20210708130023-221dfdfced62/go.mod h1:vrmE0f+CSunMBBCvb1lyO5OTsBN72bipJOsC0WoJvj4= knative.dev/hack v0.0.0-20210622141627-e28525d8d260 h1:f2eMtOubAOc/Q7JlvFPDKXiPlJVK+VpX2Cot8hRzCgQ= knative.dev/hack v0.0.0-20210622141627-e28525d8d260/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack/schema v0.0.0-20210622141627-e28525d8d260/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0= -knative.dev/networking v0.0.0-20210705111547-ca0a601fc900 h1:pjC4YxKR0mH5/GTORkdyN2U2oNoCwICGrX6AReUG0LE= knative.dev/networking v0.0.0-20210705111547-ca0a601fc900/go.mod h1:lT2n243XZb7K59q4FLtCuAeuboOjoJeLYvTxxfO5rIY= +knative.dev/networking v0.0.0-20210708015022-4e655b7fa1c3 h1:8WM46YeGCGLP2k67+0CdsrJQUI+Qd1e81LSJwdc5HMU= +knative.dev/networking v0.0.0-20210708015022-4e655b7fa1c3/go.mod h1:ljfndmG90nC/0NpzCMsrvru2uf1IUx4HFPLgRgqzMys= knative.dev/pkg v0.0.0-20210622173328-dd0db4b05c80/go.mod h1:kGegTnbZ+ljFjAE3E1+8wgaH2LMv8qYi+72o3F3cbdc= knative.dev/pkg v0.0.0-20210628225612-51cfaabbcdf6/go.mod h1:kGegTnbZ+ljFjAE3E1+8wgaH2LMv8qYi+72o3F3cbdc= -knative.dev/pkg v0.0.0-20210701025203-30f9568e894e h1:2TofgD72tjBuWN3a4Rg3uzrMu1OWOlh2KY2m0fsjwqQ= -knative.dev/pkg v0.0.0-20210701025203-30f9568e894e/go.mod h1:kGegTnbZ+ljFjAE3E1+8wgaH2LMv8qYi+72o3F3cbdc= -knative.dev/reconciler-test v0.0.0-20210630182710-2a6d91dfee1e/go.mod h1:4wqv2WyWUC5yhTesRUVwgjv/fHTHny1RYBfdB6tVDok= -knative.dev/serving v0.24.1-0.20210705154247-d207fa3a92ac h1:z9xRHZxze66dnlNunH7BwKpBQq4eyyeBJcVvrFRrDAI= -knative.dev/serving v0.24.1-0.20210705154247-d207fa3a92ac/go.mod h1:ktSG08SjDYoGEIPw9GzzS6njQjr6bpWXQuViOOtmLkg= +knative.dev/pkg v0.0.0-20210706174620-fe90576475ca/go.mod h1:kGegTnbZ+ljFjAE3E1+8wgaH2LMv8qYi+72o3F3cbdc= +knative.dev/pkg v0.0.0-20210708145023-4a3e56dc13b2 h1:6lgSvpw4pTuI1MZqBFXA0yksVrMo39aSrrfk/6rBMBs= +knative.dev/pkg v0.0.0-20210708145023-4a3e56dc13b2/go.mod h1:kGegTnbZ+ljFjAE3E1+8wgaH2LMv8qYi+72o3F3cbdc= +knative.dev/reconciler-test v0.0.0-20210707164418-32f0df0c7399/go.mod h1:4wqv2WyWUC5yhTesRUVwgjv/fHTHny1RYBfdB6tVDok= +knative.dev/serving v0.24.1-0.20210708194119-7a3e9d03b0e4 h1:hAa3awl4yC8sSdtrfYe/vr5DZAKttqfhbq1JFfodARE= +knative.dev/serving v0.24.1-0.20210708194119-7a3e9d03b0e4/go.mod h1:pgnNgnmY1BCfFnTd9zA04Vys6Ssc7M5eh3GHgj+qEqg= 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/apis/eventing/v1/trigger_lifecycle.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/trigger_lifecycle.go index 5dceb767a..c2ebce95c 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/trigger_lifecycle.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/trigger_lifecycle.go @@ -23,7 +23,7 @@ import ( duckv1 "knative.dev/pkg/apis/duck/v1" ) -var triggerCondSet = apis.NewLivingConditionSet(TriggerConditionBroker, TriggerConditionSubscribed, TriggerConditionDependency, TriggerConditionSubscriberResolved) +var triggerCondSet = apis.NewLivingConditionSet(TriggerConditionBroker, TriggerConditionSubscribed, TriggerConditionDependency, TriggerConditionSubscriberResolved, TriggerConditionDeadLetterSinkResolved) const ( // TriggerConditionReady has status True when all subconditions below have been set to True. @@ -37,6 +37,8 @@ const ( TriggerConditionSubscriberResolved apis.ConditionType = "SubscriberResolved" + TriggerConditionDeadLetterSinkResolved apis.ConditionType = "DeadLetterSinkResolved" + // TriggerAnyFilter Constant to represent that we should allow anything. TriggerAnyFilter = "" ) @@ -150,6 +152,18 @@ func (ts *TriggerStatus) MarkSubscriberResolvedUnknown(reason, messageFormat str triggerCondSet.Manage(ts).MarkUnknown(TriggerConditionSubscriberResolved, reason, messageFormat, messageA...) } +func (ts *TriggerStatus) MarkDeadLetterSinkResolvedSucceeded() { + triggerCondSet.Manage(ts).MarkTrue(TriggerConditionDeadLetterSinkResolved) +} + +func (ts *TriggerStatus) MarkDeadLetterSinkNotConfigured() { + triggerCondSet.Manage(ts).MarkTrueWithReason(TriggerConditionDeadLetterSinkResolved, "DeadLetterSinkNotConfigured", "No dead letter sink is configured.") +} + +func (ts *TriggerStatus) MarkDeadLetterSinkResolvedFailed(reason, messageFormat string, messageA ...interface{}) { + triggerCondSet.Manage(ts).MarkFalse(TriggerConditionDeadLetterSinkResolved, reason, messageFormat, messageA...) +} + func (ts *TriggerStatus) MarkDependencySucceeded() { triggerCondSet.Manage(ts).MarkTrue(TriggerConditionDependency) } diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/trigger_types.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/trigger_types.go index f40e80292..97ffc8759 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/trigger_types.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/trigger_types.go @@ -119,6 +119,10 @@ type TriggerStatus struct { // SubscriberURI is the resolved URI of the receiver for this Trigger. // +optional SubscriberURI *apis.URL `json:"subscriberUri,omitempty"` + + // DeadLetterURI is the resolved URI of the dead letter sink for this Trigger. + // +optional + DeadLetterURI *apis.URL `json:"deadLetterUri,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/zz_generated.deepcopy.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/zz_generated.deepcopy.go index c1f4be248..7be79a4ee 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/zz_generated.deepcopy.go @@ -274,6 +274,11 @@ func (in *TriggerStatus) DeepCopyInto(out *TriggerStatus) { *out = new(apis.URL) (*in).DeepCopyInto(*out) } + if in.DeadLetterURI != nil { + in, out := &in.DeadLetterURI, &out.DeadLetterURI + *out = new(apis.URL) + (*in).DeepCopyInto(*out) + } return } diff --git a/vendor/knative.dev/pkg/test/spoof/error_checks.go b/vendor/knative.dev/pkg/test/spoof/error_checks.go index e152e11d7..378bf5824 100644 --- a/vendor/knative.dev/pkg/test/spoof/error_checks.go +++ b/vendor/knative.dev/pkg/test/spoof/error_checks.go @@ -58,3 +58,7 @@ func isConnectionRefused(err error) bool { func isConnectionReset(err error) bool { return err != nil && strings.Contains(err.Error(), "connection reset by peer") } + +func isNoRouteToHostError(err error) bool { + return err != nil && strings.Contains(err.Error(), "connect: no route to host") +} diff --git a/vendor/knative.dev/pkg/test/spoof/spoof.go b/vendor/knative.dev/pkg/test/spoof/spoof.go index 0513f7e0f..74e735623 100644 --- a/vendor/knative.dev/pkg/test/spoof/spoof.go +++ b/vendor/knative.dev/pkg/test/spoof/spoof.go @@ -223,6 +223,11 @@ func DefaultErrorRetryChecker(err error) (bool, error) { if errors.Is(err, io.EOF) { return true, fmt.Errorf("retrying for: %w", err) } + // No route to host errors are in the same category as connection refused errors and + // are usually transient. + if isNoRouteToHostError(err) { + return true, fmt.Errorf("retrying for 'no route to host' error: %w", err) + } return false, err } diff --git a/vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go b/vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go index 42e3f7c18..d0729f6d0 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go @@ -596,6 +596,9 @@ func SecurityContextMask(ctx context.Context, in *corev1.SecurityContext) *corev // Allowed fields out.RunAsUser = in.RunAsUser + if in.RunAsNonRoot != nil && *in.RunAsNonRoot { + out.RunAsNonRoot = in.RunAsNonRoot + } out.ReadOnlyRootFilesystem = in.ReadOnlyRootFilesystem out.Capabilities = in.Capabilities diff --git a/vendor/modules.txt b/vendor/modules.txt index c0a68035a..e66746db7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -776,7 +776,7 @@ k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/pointer k8s.io/utils/trace -# knative.dev/eventing v0.24.1-0.20210702080639-90932eb671e0 +# knative.dev/eventing v0.24.1-0.20210708130023-221dfdfced62 ## explicit knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/duck @@ -805,12 +805,12 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake # knative.dev/hack v0.0.0-20210622141627-e28525d8d260 ## explicit knative.dev/hack -# knative.dev/networking v0.0.0-20210705111547-ca0a601fc900 +# knative.dev/networking v0.0.0-20210708015022-4e655b7fa1c3 ## explicit knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking knative.dev/networking/pkg/apis/networking/v1alpha1 -# knative.dev/pkg v0.0.0-20210701025203-30f9568e894e +# knative.dev/pkg v0.0.0-20210708145023-4a3e56dc13b2 ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -856,7 +856,7 @@ knative.dev/pkg/tracing/propagation knative.dev/pkg/tracing/propagation/tracecontextb3 knative.dev/pkg/tracker knative.dev/pkg/unstructured -# knative.dev/serving v0.24.1-0.20210705154247-d207fa3a92ac +# knative.dev/serving v0.24.1-0.20210708194119-7a3e9d03b0e4 ## explicit knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1