From 935f5a7fc38ab3f5a3164783fcb17aca65a0f9e9 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Mon, 13 Feb 2023 21:33:08 +0000 Subject: [PATCH 1/2] upgrade to latest dependencies bumping knative.dev/eventing a9151b5...96c9d32: > 96c9d32 [release-1.7] Set transition time initially on sequence statuses (# 6654) > 057ee26 [release-1.7] Rebuild using Go 1.19.4 (to address CVEs) (# 6641) > a4a252f [release-1.7] Fix PingSource adapter metrics (# 6630) > d9552f7 [release-1.7] [Scheduler] Handle permanent pending pods (# 6604) > f17bf2f [release-1.7] Updates for Go 1.19 (# 6594) (# 6607) > 52dc53c Add readiness and liveness probes in controller (# 6570) > 0bf545a [release-1.7] Properly export trace for duplicated "finished" event (# 6540) > 9967e86 [release-1.7] Remove strict check in scorer plugins and respect maxskew, requeue when no pods available rather than fail Scheduler (# 6528) > 6ffef0f Make some broker conformance tests decoratable with broker options (# 6517) > 6822f0d [release-1.7] InMemoryChannel receiver validates received events (# 6512) bumping knative.dev/pkg 4a03844...9d7bd23: > 9d7bd23 [release-1.7] Fix nil pointer deref in drain when it's reset (# 2652) > 5f92031 [release-1.7] gofmt with go1.19 (# 2650) > 3b65316 [release-1.7] Function AllowRestrictedPodSecurityStandard for modifying test pods (# 2636) bumping knative.dev/networking e51df7c...5f25a81: > 5f25a81 [release-1.7] Cherry picks (# 743) bumping knative.dev/serving d79b8bb...55c141f: > 55c141f Leave a comment which will trigger a new dot release (# 13543) > 7e6a272 [release-1.7] Use ubuntu 20.04 for kind e2e tests (# 13541) > eb814ed Ensure probes from the autoscaler are not passed to the user-container (# 13504) > 311dc7c bump knative.dev/pkg to pull in nil pointer fixes (# 13499) > 89fe233 [release-1.7] ran codegen with go1.19 & fix linter warnings (# 13493) > 812f1c8 update kapp module name in e2e tests (# 13317) > 89d4023 update setup-ko action to v0.6 (# 13318) > 9402a71 revision request start timeout should default to revision timeout second (# 13256) Signed-off-by: Knative Automation --- go.mod | 8 +- go.sum | 16 +-- .../pkg/apis/config/zz_generated.deepcopy.go | 2 +- .../pkg/apis/duck/v1/zz_generated.deepcopy.go | 2 +- .../pkg/apis/eventing/v1/trigger_types.go | 2 +- .../apis/eventing/v1/zz_generated.deepcopy.go | 2 +- .../eventing/v1beta1/zz_generated.deepcopy.go | 2 +- .../pkg/apis/flows/v1/sequence_lifecycle.go | 24 +++- .../apis/flows/v1/zz_generated.deepcopy.go | 2 +- .../messaging/config/zz_generated.deepcopy.go | 2 +- .../messaging/v1/zz_generated.deepcopy.go | 2 +- .../apis/sources/v1/zz_generated.deepcopy.go | 2 +- .../sources/v1beta2/zz_generated.deepcopy.go | 2 +- .../client/clientset/versioned/scheme/doc.go | 2 +- .../clientset/versioned/scheme/register.go | 16 +-- .../versioned/typed/eventing/v1/broker.go | 2 +- .../versioned/typed/eventing/v1/doc.go | 2 +- .../typed/eventing/v1/eventing_client.go | 2 +- .../versioned/typed/eventing/v1/fake/doc.go | 2 +- .../typed/eventing/v1/fake/fake_broker.go | 2 +- .../eventing/v1/fake/fake_eventing_client.go | 2 +- .../typed/eventing/v1/fake/fake_trigger.go | 2 +- .../typed/eventing/v1/generated_expansion.go | 2 +- .../versioned/typed/eventing/v1/trigger.go | 2 +- .../versioned/typed/eventing/v1beta1/doc.go | 2 +- .../typed/eventing/v1beta1/eventing_client.go | 2 +- .../typed/eventing/v1beta1/eventtype.go | 2 +- .../typed/eventing/v1beta1/fake/doc.go | 2 +- .../v1beta1/fake/fake_eventing_client.go | 2 +- .../eventing/v1beta1/fake/fake_eventtype.go | 2 +- .../eventing/v1beta1/generated_expansion.go | 2 +- .../versioned/typed/messaging/v1/channel.go | 2 +- .../versioned/typed/messaging/v1/doc.go | 2 +- .../typed/messaging/v1/generated_expansion.go | 2 +- .../typed/messaging/v1/inmemorychannel.go | 2 +- .../typed/messaging/v1/messaging_client.go | 2 +- .../typed/messaging/v1/subscription.go | 2 +- .../typed/sources/v1/apiserversource.go | 2 +- .../typed/sources/v1/containersource.go | 2 +- .../versioned/typed/sources/v1/doc.go | 2 +- .../versioned/typed/sources/v1/fake/doc.go | 2 +- .../sources/v1/fake/fake_apiserversource.go | 2 +- .../sources/v1/fake/fake_containersource.go | 2 +- .../typed/sources/v1/fake/fake_pingsource.go | 2 +- .../typed/sources/v1/fake/fake_sinkbinding.go | 2 +- .../sources/v1/fake/fake_sources_client.go | 2 +- .../typed/sources/v1/generated_expansion.go | 2 +- .../versioned/typed/sources/v1/pingsource.go | 2 +- .../versioned/typed/sources/v1/sinkbinding.go | 2 +- .../typed/sources/v1/sources_client.go | 2 +- .../versioned/typed/sources/v1beta2/doc.go | 2 +- .../typed/sources/v1beta2/fake/doc.go | 2 +- .../sources/v1beta2/fake/fake_pingsource.go | 2 +- .../v1beta2/fake/fake_sources_client.go | 2 +- .../sources/v1beta2/generated_expansion.go | 2 +- .../typed/sources/v1beta2/pingsource.go | 2 +- .../typed/sources/v1beta2/sources_client.go | 2 +- .../clientset/versioned/scheme/register.go | 14 +- .../networking/pkg/config/config.go | 4 +- vendor/knative.dev/pkg/apis/duck/verify.go | 6 +- vendor/knative.dev/pkg/apis/field_error.go | 52 +++---- .../generators/comment_parser.go | 28 ++-- vendor/knative.dev/pkg/configmap/doc.go | 4 +- vendor/knative.dev/pkg/configmap/load.go | 3 +- vendor/knative.dev/pkg/configmap/store.go | 4 +- vendor/knative.dev/pkg/hash/doc.go | 16 +-- vendor/knative.dev/pkg/injection/doc.go | 128 +++++++++--------- vendor/knative.dev/pkg/injection/injection.go | 8 +- .../pkg/logging/object_encoders.go | 3 + .../pkg/metrics/prometheus_exporter.go | 9 +- .../knative.dev/pkg/metrics/resource_view.go | 6 +- .../knative.dev/pkg/network/error_handler.go | 4 +- vendor/knative.dev/pkg/network/h2c.go | 1 + vendor/knative.dev/pkg/profiling/server.go | 1 + vendor/knative.dev/pkg/reconciler/retry.go | 2 +- .../knative.dev/pkg/test/ingress/ingress.go | 6 +- vendor/knative.dev/pkg/test/spoof/spoof.go | 3 +- vendor/knative.dev/pkg/test/zipkin/doc.go | 7 +- vendor/knative.dev/pkg/test/zipkin/util.go | 25 ++-- .../serving/pkg/apis/config/defaults.go | 10 +- .../clientset/versioned/scheme/register.go | 14 +- vendor/knative.dev/serving/test/e2e-common.sh | 2 +- vendor/modules.txt | 8 +- 83 files changed, 290 insertions(+), 248 deletions(-) diff --git a/go.mod b/go.mod index 7e074b22ed..46d6966829 100644 --- a/go.mod +++ b/go.mod @@ -21,11 +21,11 @@ require ( k8s.io/cli-runtime v0.23.4 k8s.io/client-go v0.23.9 k8s.io/code-generator v0.23.9 - knative.dev/eventing v0.34.1 + knative.dev/eventing v0.34.7 knative.dev/hack v0.0.0-20220823140917-8d1e4ccf9dc3 - knative.dev/networking v0.0.0-20220818010248-e51df7cdf571 - knative.dev/pkg v0.0.0-20220818004048-4a03844c0b15 - knative.dev/serving v0.34.0 + knative.dev/networking v0.0.0-20221208211516-5f25a81cd43e + knative.dev/pkg v0.0.0-20221123011941-9d7bd235ceed + knative.dev/serving v0.34.4 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index 989b30ccb4..b63cc527e8 100644 --- a/go.sum +++ b/go.sum @@ -1318,16 +1318,16 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -knative.dev/eventing v0.34.1 h1:r6QuQmDCmmSANdTRLdbKb6YcYaJoeNpEuFfS8Bq0ZgQ= -knative.dev/eventing v0.34.1/go.mod h1:6UnNnPrEUNAM9PfCpf7L8N7G/1vq+HQlpOjzndY6ryw= +knative.dev/eventing v0.34.7 h1:P2YmnDBxpqQatVTZRVHftPv3wuO/+GN83kCXQVgtM20= +knative.dev/eventing v0.34.7/go.mod h1:6UnNnPrEUNAM9PfCpf7L8N7G/1vq+HQlpOjzndY6ryw= knative.dev/hack v0.0.0-20220823140917-8d1e4ccf9dc3 h1:umaeMRecA0g5g48L9tnEAkTBIitr9eKWMyJYo9YttAA= knative.dev/hack v0.0.0-20220823140917-8d1e4ccf9dc3/go.mod h1:t/azP8I/Cygaw+87O7rkAPrNRjCelmtfSzWzu/9TM7I= -knative.dev/networking v0.0.0-20220818010248-e51df7cdf571 h1:Lu/TsJjxg1p+2CMr2LNHEdEFBNHYjDoZv2f1QZoM8jg= -knative.dev/networking v0.0.0-20220818010248-e51df7cdf571/go.mod h1:m3ataWRwmbHjOY9sCFvcDWRNLVITxVl0fH0RxdCa4jE= -knative.dev/pkg v0.0.0-20220818004048-4a03844c0b15 h1:GNmzHVaUo3zoi/wtIN71LPQaWy6DdoYzmb+GIq2s4fw= -knative.dev/pkg v0.0.0-20220818004048-4a03844c0b15/go.mod h1:YLjXbkQLlGHok+u0FLfMbBHFzY9WGu3GHhnrptoAy8I= -knative.dev/serving v0.34.0 h1:x3fS4e0AcNBBlQv5Dd5y30W2gtrxndUEwIEPknZfeVg= -knative.dev/serving v0.34.0/go.mod h1:IyfedOBq3KzcD5dZONjbix2BfS0jOwDq5td8UE9CjCk= +knative.dev/networking v0.0.0-20221208211516-5f25a81cd43e h1:Ys3mJ0wYF+1OvdevtqACQX+HiHpZU4kVEE33/rNNzmI= +knative.dev/networking v0.0.0-20221208211516-5f25a81cd43e/go.mod h1:m3ataWRwmbHjOY9sCFvcDWRNLVITxVl0fH0RxdCa4jE= +knative.dev/pkg v0.0.0-20221123011941-9d7bd235ceed h1:Xk4DRdbRdI7Ky8vOGQK4S3nUHTRRpTjRMsK+9Zif94s= +knative.dev/pkg v0.0.0-20221123011941-9d7bd235ceed/go.mod h1:M+Amt1YZl5Nkl6+5FDFVIPaivsk2o5K/cIzOVq6Nsg0= +knative.dev/serving v0.34.4 h1:3K9uVi2w6i7YmVbWIVC8qvMhn9l+3uTAOMywmjV8WXY= +knative.dev/serving v0.34.4/go.mod h1:FXpXkiRvUJQM4zBgujcLi+oqtwqcBu3WduFdNIB0HrE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/knative.dev/eventing/pkg/apis/config/zz_generated.deepcopy.go b/vendor/knative.dev/eventing/pkg/apis/config/zz_generated.deepcopy.go index cc31958e73..a26083d98d 100644 --- a/vendor/knative.dev/eventing/pkg/apis/config/zz_generated.deepcopy.go +++ b/vendor/knative.dev/eventing/pkg/apis/config/zz_generated.deepcopy.go @@ -8,7 +8,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/apis/duck/v1/zz_generated.deepcopy.go b/vendor/knative.dev/eventing/pkg/apis/duck/v1/zz_generated.deepcopy.go index 8e30ee5cb4..1ba69456ef 100644 --- a/vendor/knative.dev/eventing/pkg/apis/duck/v1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/eventing/pkg/apis/duck/v1/zz_generated.deepcopy.go @@ -8,7 +8,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, 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 e327fff0e0..c217d44e18 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 @@ -177,7 +177,7 @@ type SubscriptionsAPIFilter struct { // TriggerFilterAttributes is a map of context attribute names to values for // filtering by equality. Only exact matches will pass the filter. You can use -// the value '' to indicate all strings match. +// the value ” to indicate all strings match. type TriggerFilterAttributes map[string]string // TriggerStatus represents the current state of a Trigger. 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 e176c766b3..8ffb713c29 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 @@ -8,7 +8,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1beta1/zz_generated.deepcopy.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1beta1/zz_generated.deepcopy.go index e24968fcba..20ea81675b 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1beta1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1beta1/zz_generated.deepcopy.go @@ -8,7 +8,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/apis/flows/v1/sequence_lifecycle.go b/vendor/knative.dev/eventing/pkg/apis/flows/v1/sequence_lifecycle.go index 47401c64b6..bc6559edac 100644 --- a/vendor/knative.dev/eventing/pkg/apis/flows/v1/sequence_lifecycle.go +++ b/vendor/knative.dev/eventing/pkg/apis/flows/v1/sequence_lifecycle.go @@ -17,7 +17,10 @@ limitations under the License. package v1 import ( + "time" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1" messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" @@ -93,13 +96,20 @@ func (ss *SequenceStatus) PropagateSubscriptionStatuses(subscriptions []*messagi Namespace: s.Namespace, }, } - readyCondition := s.Status.GetCondition(messagingv1.SubscriptionConditionReady) - if readyCondition != nil { + + if readyCondition := s.Status.GetCondition(messagingv1.SubscriptionConditionReady); readyCondition != nil { ss.SubscriptionStatuses[i].ReadyCondition = *readyCondition - if readyCondition.Status != corev1.ConditionTrue { + if !readyCondition.IsTrue() { allReady = false } } else { + ss.SubscriptionStatuses[i].ReadyCondition = apis.Condition{ + Type: apis.ConditionReady, + Status: corev1.ConditionUnknown, + Reason: "NoReady", + Message: "Subscription does not have Ready condition", + LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Now())}, + } allReady = false } @@ -142,7 +152,13 @@ func (ss *SequenceStatus) PropagateChannelStatuses(channels []*eventingduckv1.Ch allReady = false } } else { - ss.ChannelStatuses[i].ReadyCondition = apis.Condition{Type: apis.ConditionReady, Status: corev1.ConditionUnknown, Reason: "NoReady", Message: "Channel does not have Ready condition"} + ss.ChannelStatuses[i].ReadyCondition = apis.Condition{ + Type: apis.ConditionReady, + Status: corev1.ConditionUnknown, + Reason: "NoReady", + Message: "Channel does not have Ready condition", + LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Now())}, + } allReady = false } } diff --git a/vendor/knative.dev/eventing/pkg/apis/flows/v1/zz_generated.deepcopy.go b/vendor/knative.dev/eventing/pkg/apis/flows/v1/zz_generated.deepcopy.go index ecc4658592..9120976742 100644 --- a/vendor/knative.dev/eventing/pkg/apis/flows/v1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/eventing/pkg/apis/flows/v1/zz_generated.deepcopy.go @@ -8,7 +8,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/apis/messaging/config/zz_generated.deepcopy.go b/vendor/knative.dev/eventing/pkg/apis/messaging/config/zz_generated.deepcopy.go index 4f9f9c0992..0d2c38a6d2 100644 --- a/vendor/knative.dev/eventing/pkg/apis/messaging/config/zz_generated.deepcopy.go +++ b/vendor/knative.dev/eventing/pkg/apis/messaging/config/zz_generated.deepcopy.go @@ -8,7 +8,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/apis/messaging/v1/zz_generated.deepcopy.go b/vendor/knative.dev/eventing/pkg/apis/messaging/v1/zz_generated.deepcopy.go index 2876f8388a..1481da34b6 100644 --- a/vendor/knative.dev/eventing/pkg/apis/messaging/v1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/eventing/pkg/apis/messaging/v1/zz_generated.deepcopy.go @@ -8,7 +8,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/v1/zz_generated.deepcopy.go b/vendor/knative.dev/eventing/pkg/apis/sources/v1/zz_generated.deepcopy.go index 3d8878ca51..fd7b8b7177 100644 --- a/vendor/knative.dev/eventing/pkg/apis/sources/v1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/eventing/pkg/apis/sources/v1/zz_generated.deepcopy.go @@ -8,7 +8,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/v1beta2/zz_generated.deepcopy.go b/vendor/knative.dev/eventing/pkg/apis/sources/v1beta2/zz_generated.deepcopy.go index 86b4e093aa..e0381d7a41 100644 --- a/vendor/knative.dev/eventing/pkg/apis/sources/v1beta2/zz_generated.deepcopy.go +++ b/vendor/knative.dev/eventing/pkg/apis/sources/v1beta2/zz_generated.deepcopy.go @@ -8,7 +8,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/scheme/doc.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/scheme/doc.go index 5597166bea..5768b36ee3 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/scheme/doc.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/scheme/doc.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/scheme/register.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/scheme/register.go index 7cade49283..710aacfe44 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/scheme/register.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/scheme/register.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -47,14 +47,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/broker.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/broker.go index 39bfcd5838..c6376cbacd 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/broker.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/broker.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/doc.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/doc.go index 8c88ffc0b8..2ce17146a0 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/doc.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/doc.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/eventing_client.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/eventing_client.go index c50a3d4b52..3b3f0dfb3d 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/eventing_client.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/eventing_client.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/doc.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/doc.go index d5a46ef553..40528db3a5 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/doc.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/doc.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/fake_broker.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/fake_broker.go index 850d2dc17d..5c90ef92b7 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/fake_broker.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/fake_broker.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/fake_eventing_client.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/fake_eventing_client.go index 81f5cb36f6..26123fae40 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/fake_eventing_client.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/fake_eventing_client.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/fake_trigger.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/fake_trigger.go index 0a4e9ff5b9..81e8920dd1 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/fake_trigger.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/fake/fake_trigger.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/generated_expansion.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/generated_expansion.go index 028c99e7cd..14d7fe0c0f 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/generated_expansion.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/generated_expansion.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/trigger.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/trigger.go index 1a8749bc41..fca6299406 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/trigger.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1/trigger.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/doc.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/doc.go index 8d5037f077..68b15a55e2 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/doc.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/doc.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/eventing_client.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/eventing_client.go index bc6c22ed15..ab8a0f8578 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/eventing_client.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/eventing_client.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/eventtype.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/eventtype.go index a085376f9d..7005e33006 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/eventtype.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/eventtype.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/fake/doc.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/fake/doc.go index d5a46ef553..40528db3a5 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/fake/doc.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/fake/doc.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/fake/fake_eventing_client.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/fake/fake_eventing_client.go index 0a6b788fcc..aa6fcf6bcb 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/fake/fake_eventing_client.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/fake/fake_eventing_client.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/fake/fake_eventtype.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/fake/fake_eventtype.go index 067922a471..e95e19c9cb 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/fake/fake_eventtype.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/fake/fake_eventtype.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/generated_expansion.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/generated_expansion.go index 245a728f63..cd07c63e1d 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/generated_expansion.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/eventing/v1beta1/generated_expansion.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/channel.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/channel.go index 173f9695c1..5fab4c9bc4 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/channel.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/channel.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/doc.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/doc.go index 8c88ffc0b8..2ce17146a0 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/doc.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/doc.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/generated_expansion.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/generated_expansion.go index e9721fcabb..a847be33a6 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/generated_expansion.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/generated_expansion.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/inmemorychannel.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/inmemorychannel.go index abb1c61401..5c749d3ab3 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/inmemorychannel.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/inmemorychannel.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/messaging_client.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/messaging_client.go index 01aab60f6a..bccf1fb35e 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/messaging_client.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/messaging_client.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/subscription.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/subscription.go index 0d7996d286..abf54a1d5e 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/subscription.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1/subscription.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/apiserversource.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/apiserversource.go index 2541749f61..3798092b89 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/apiserversource.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/apiserversource.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/containersource.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/containersource.go index 4a04bcadc3..61f142c9cd 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/containersource.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/containersource.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/doc.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/doc.go index 8c88ffc0b8..2ce17146a0 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/doc.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/doc.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/doc.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/doc.go index d5a46ef553..40528db3a5 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/doc.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/doc.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_apiserversource.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_apiserversource.go index 6dd7ccca68..5ca73d0e9c 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_apiserversource.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_apiserversource.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_containersource.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_containersource.go index 386d389c8d..9d04ccad0f 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_containersource.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_containersource.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_pingsource.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_pingsource.go index 9853015c6c..1230a4e73b 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_pingsource.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_pingsource.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_sinkbinding.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_sinkbinding.go index 835503c418..434269594c 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_sinkbinding.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_sinkbinding.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_sources_client.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_sources_client.go index f53e0758d3..24c8f8fca5 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_sources_client.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake/fake_sources_client.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/generated_expansion.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/generated_expansion.go index 22bdb65a52..6b63704d3f 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/generated_expansion.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/generated_expansion.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/pingsource.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/pingsource.go index 489b463c29..0e3d23f4c2 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/pingsource.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/pingsource.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/sinkbinding.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/sinkbinding.go index f8836f373a..d3613d31b7 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/sinkbinding.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/sinkbinding.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/sources_client.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/sources_client.go index 44d7a70e17..e7bb800921 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/sources_client.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/sources_client.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/doc.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/doc.go index d8a691686e..07add715ef 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/doc.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/doc.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake/doc.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake/doc.go index d5a46ef553..40528db3a5 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake/doc.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake/doc.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake/fake_pingsource.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake/fake_pingsource.go index 27a0ddeb79..8275dfc1c0 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake/fake_pingsource.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake/fake_pingsource.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake/fake_sources_client.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake/fake_sources_client.go index d22ff0dce5..bc49d7611a 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake/fake_sources_client.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake/fake_sources_client.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/generated_expansion.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/generated_expansion.go index 83102e06d7..3dcc9777db 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/generated_expansion.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/generated_expansion.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/pingsource.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/pingsource.go index cc3b129ce9..f30d025ad1 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/pingsource.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/pingsource.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/sources_client.go b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/sources_client.go index 242b283149..d5df4f545a 100644 --- a/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/sources_client.go +++ b/vendor/knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/sources_client.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/networking/pkg/client/clientset/versioned/scheme/register.go b/vendor/knative.dev/networking/pkg/client/clientset/versioned/scheme/register.go index 1927729369..a853ca0fca 100644 --- a/vendor/knative.dev/networking/pkg/client/clientset/versioned/scheme/register.go +++ b/vendor/knative.dev/networking/pkg/client/clientset/versioned/scheme/register.go @@ -37,14 +37,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/vendor/knative.dev/networking/pkg/config/config.go b/vendor/knative.dev/networking/pkg/config/config.go index 30580161a8..a05e43148d 100644 --- a/vendor/knative.dev/networking/pkg/config/config.go +++ b/vendor/knative.dev/networking/pkg/config/config.go @@ -20,7 +20,7 @@ import ( "bytes" "errors" "fmt" - "io/ioutil" + "io" "net/url" "strings" "text/template" @@ -418,7 +418,7 @@ func checkTagTemplate(t *template.Template) error { Name: "foo", Tag: "v2", } - return t.Execute(ioutil.Discard, data) + return t.Execute(io.Discard, data) } // asLabelSelector returns a LabelSelector extracted from a given configmap key. diff --git a/vendor/knative.dev/pkg/apis/duck/verify.go b/vendor/knative.dev/pkg/apis/duck/verify.go index e3f5abab43..48675f93a4 100644 --- a/vendor/knative.dev/pkg/apis/duck/verify.go +++ b/vendor/knative.dev/pkg/apis/duck/verify.go @@ -31,10 +31,10 @@ type Populatable = ducktypes.Populatable // the provided Implementable duck type. It is expected that under the resource // definition implementing a particular "Fooable" that one would write: // -// type ConcreteResource struct { ... } +// type ConcreteResource struct { ... } // -// // Check that ConcreteResource properly implement Fooable. -// err := duck.VerifyType(&ConcreteResource{}, &something.Fooable{}) +// // Check that ConcreteResource properly implement Fooable. +// err := duck.VerifyType(&ConcreteResource{}, &something.Fooable{}) // // This will return an error if the duck typing is not satisfied. func VerifyType(instance interface{}, iface Implementable) error { diff --git a/vendor/knative.dev/pkg/apis/field_error.go b/vendor/knative.dev/pkg/apis/field_error.go index ddd4838af2..d4773d4aa9 100644 --- a/vendor/knative.dev/pkg/apis/field_error.go +++ b/vendor/knative.dev/pkg/apis/field_error.go @@ -83,11 +83,12 @@ var _ error = (*FieldError)(nil) // ViaField is used to propagate a validation error along a field access. // For example, if a type recursively validates its "spec" via: -// if err := foo.Spec.Validate(); err != nil { -// // Augment any field paths with the context that they were accessed -// // via "spec". -// return err.ViaField("spec") -// } +// +// if err := foo.Spec.Validate(); err != nil { +// // Augment any field paths with the context that they were accessed +// // via "spec". +// return err.ViaField("spec") +// } func (fe *FieldError) ViaField(prefix ...string) *FieldError { if fe == nil { return nil @@ -114,11 +115,12 @@ func (fe *FieldError) ViaField(prefix ...string) *FieldError { // ViaIndex is used to attach an index to the next ViaField provided. // For example, if a type recursively validates a parameter that has a collection: -// for i, c := range spec.Collection { -// if err := doValidation(c); err != nil { -// return err.ViaIndex(i).ViaField("collection") -// } -// } +// +// for i, c := range spec.Collection { +// if err := doValidation(c); err != nil { +// return err.ViaIndex(i).ViaField("collection") +// } +// } func (fe *FieldError) ViaIndex(index int) *FieldError { return fe.ViaField(asIndex(index)) } @@ -130,11 +132,12 @@ func (fe *FieldError) ViaFieldIndex(field string, index int) *FieldError { // ViaKey is used to attach a key to the next ViaField provided. // For example, if a type recursively validates a parameter that has a collection: -// for k, v := range spec.Bag { -// if err := doValidation(v); err != nil { -// return err.ViaKey(k).ViaField("bag") -// } -// } +// +// for k, v := range spec.Bag { +// if err := doValidation(v); err != nil { +// return err.ViaKey(k).ViaField("bag") +// } +// } func (fe *FieldError) ViaKey(key string) *FieldError { return fe.ViaField(asKey(key)) } @@ -145,7 +148,8 @@ func (fe *FieldError) ViaFieldKey(field, key string) *FieldError { } // At is a way to alter the level of the diagnostics held in this FieldError. -// ErrMissingField("foo").At(WarningLevel) +// +// ErrMissingField("foo").At(WarningLevel) func (fe *FieldError) At(l DiagnosticLevel) *FieldError { if fe == nil { return nil @@ -166,9 +170,10 @@ func (fe *FieldError) At(l DiagnosticLevel) *FieldError { } // Filter is a way to access the set of diagnostics having a particular level. -// if err := x.Validate(ctx).Filter(ErrorLevel); err != nil { -// return err -// } +// +// if err := x.Validate(ctx).Filter(ErrorLevel); err != nil { +// return err +// } func (fe *FieldError) Filter(l DiagnosticLevel) *FieldError { if fe == nil { return nil @@ -282,10 +287,11 @@ func asKey(key string) string { // flatten takes in a array of path components and looks for chances to flatten // objects that have index prefixes, examples: -// err([0]).ViaField(bar).ViaField(foo) -> foo.bar.[0] converts to foo.bar[0] -// err(bar).ViaIndex(0).ViaField(foo) -> foo.[0].bar converts to foo[0].bar -// err(bar).ViaField(foo).ViaIndex(0) -> [0].foo.bar converts to [0].foo.bar -// err(bar).ViaIndex(0).ViaIndex(1).ViaField(foo) -> foo.[1].[0].bar converts to foo[1][0].bar +// +// err([0]).ViaField(bar).ViaField(foo) -> foo.bar.[0] converts to foo.bar[0] +// err(bar).ViaIndex(0).ViaField(foo) -> foo.[0].bar converts to foo[0].bar +// err(bar).ViaField(foo).ViaIndex(0) -> [0].foo.bar converts to [0].foo.bar +// err(bar).ViaIndex(0).ViaIndex(1).ViaField(foo) -> foo.[1].[0].bar converts to foo[1][0].bar func flatten(path []string) string { var newPath []string for _, part := range path { diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/comment_parser.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/comment_parser.go index 68ac8b4cba..4051e6a862 100644 --- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/comment_parser.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/comment_parser.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -27,10 +27,10 @@ type CommentTag map[string][]string // ExtractCommentTags parses comments for lines of the form: // -// "marker" + "prefix" + ':' + "key=value,key2=value2". +// "marker" + "prefix" + ':' + "key=value,key2=value2". // -// In the following example the marker is '+' and the prefix is 'foo': -// +foo:key=value1,key2=value2,key=value3 +// In the following example the marker is '+' and the prefix is 'foo': +// +foo:key=value1,key2=value2,key=value3 // // Values are optional; empty map is the default. A tag can be specified more than // one time and all values are returned. If the resulting map has an entry for @@ -38,17 +38,19 @@ type CommentTag map[string][]string // // Example: if you pass "+" for 'marker', and the following lines are in // the comments: -// +foo:key=value1,key2=value2,key=value3 -// +bar +// +// +foo:key=value1,key2=value2,key=value3 +// +bar // // Then this function will return: -// map[string]map[string]string{ -// "foo":{ -// "key": []string{"value1", "value3"}, -// "key2": []string{"value2"} -// }, -// "bar": {}, -// } +// +// map[string]map[string]string{ +// "foo":{ +// "key": []string{"value1", "value3"}, +// "key2": []string{"value2"} +// }, +// "bar": {}, +// } // // Users are not expected to repeat values. func ExtractCommentTags(marker string, lines []string) CommentTags { diff --git a/vendor/knative.dev/pkg/configmap/doc.go b/vendor/knative.dev/pkg/configmap/doc.go index d861a3801f..5e9ab8990c 100644 --- a/vendor/knative.dev/pkg/configmap/doc.go +++ b/vendor/knative.dev/pkg/configmap/doc.go @@ -16,6 +16,6 @@ limitations under the License. // Package configmap exists to facilitate consuming Kubernetes ConfigMap // resources in various ways, including: -// - Watching them for changes over time, and -// - Loading them from a VolumeMount. +// - Watching them for changes over time, and +// - Loading them from a VolumeMount. package configmap diff --git a/vendor/knative.dev/pkg/configmap/load.go b/vendor/knative.dev/pkg/configmap/load.go index ee40fbf0cc..56ad1e4ab4 100644 --- a/vendor/knative.dev/pkg/configmap/load.go +++ b/vendor/knative.dev/pkg/configmap/load.go @@ -17,7 +17,6 @@ limitations under the License. package configmap import ( - "io/ioutil" "os" "path" "path/filepath" @@ -47,7 +46,7 @@ func Load(p string) (map[string]string, error) { if info.IsDir() { return nil } - b, err := ioutil.ReadFile(p) + b, err := os.ReadFile(p) if err != nil { return err } diff --git a/vendor/knative.dev/pkg/configmap/store.go b/vendor/knative.dev/pkg/configmap/store.go index ffe9ad8c68..375a474c26 100644 --- a/vendor/knative.dev/pkg/configmap/store.go +++ b/vendor/knative.dev/pkg/configmap/store.go @@ -35,7 +35,7 @@ type Logger interface { // Constructors is a map for specifying configmap names to // their function constructors // -// The values of this map must be functions with the definition +// # The values of this map must be functions with the definition // // func(*k8s.io/api/core/v1.ConfigMap) (... , error) // @@ -60,7 +60,7 @@ type UntypedStore struct { // NewUntypedStore creates an UntypedStore with given name, // Logger and Constructors // -// The Logger must not be nil +// # The Logger must not be nil // // The values in the Constructors map must be functions with // the definition diff --git a/vendor/knative.dev/pkg/hash/doc.go b/vendor/knative.dev/pkg/hash/doc.go index 8b849cd3e1..5595336ad6 100644 --- a/vendor/knative.dev/pkg/hash/doc.go +++ b/vendor/knative.dev/pkg/hash/doc.go @@ -16,12 +16,12 @@ limitations under the License. // Package hash contains various Knative specific hashing utilities. // -// - ChooseSubset is a consistent hashing/mapping function providing -// a consistent selection of N keys from M (N<=M) keys for a given -// target. -// - BucketSet is a bucketer library which uses ChooseSubset under the -// the hood in order to implement consistent mapping between keys and -// set of buckets, identified by unique names. Compared to basic bucket -// implementation which just does hash%num_buckets, when the number of -// buckets change only a small subset of keys are supposed to migrate. +// - ChooseSubset is a consistent hashing/mapping function providing +// a consistent selection of N keys from M (N<=M) keys for a given +// target. +// - BucketSet is a bucketer library which uses ChooseSubset under the +// the hood in order to implement consistent mapping between keys and +// set of buckets, identified by unique names. Compared to basic bucket +// implementation which just does hash%num_buckets, when the number of +// buckets change only a small subset of keys are supposed to migrate. package hash diff --git a/vendor/knative.dev/pkg/injection/doc.go b/vendor/knative.dev/pkg/injection/doc.go index db5495d815..960674dead 100644 --- a/vendor/knative.dev/pkg/injection/doc.go +++ b/vendor/knative.dev/pkg/injection/doc.go @@ -22,84 +22,84 @@ limitations under the License. // interesting. The first is in the context of implementations of // `controller.Reconciler` being wrapped in a `*controller.Impl`: // -// import ( -// // Simply linking this triggers the injection of the informer, which links -// // the factory triggering its injection, and which links the client, -// // triggering its injection. All you need to know is that it works :) -// deployinformer "knative.dev/pkg/injection/informers/kubeinformers/appsv1/deployment" -// "knative.dev/pkg/injection" -// ) +// import ( +// // Simply linking this triggers the injection of the informer, which links +// // the factory triggering its injection, and which links the client, +// // triggering its injection. All you need to know is that it works :) +// deployinformer "knative.dev/pkg/injection/informers/kubeinformers/appsv1/deployment" +// "knative.dev/pkg/injection" +// ) // -// func NewController(ctx context.Context) *controller.Impl { -// deploymentInformer := deployinformer.Get(ctx) -// // Pass deploymentInformer.Lister() to Reconciler -// ... -// // Set up events on deploymentInformer.Informer() -// ... -// } +// func NewController(ctx context.Context) *controller.Impl { +// deploymentInformer := deployinformer.Get(ctx) +// // Pass deploymentInformer.Lister() to Reconciler +// ... +// // Set up events on deploymentInformer.Informer() +// ... +// } // // Then in `package main` the entire controller process can be set up via: // -// package main +// package main // -// import ( -// // The set of controllers this controller process runs. -// // Linking these will register their transitive dependencies, after -// // which the shared main can set up the rest. -// "github.com/knative/foo/pkg/reconciler/matt" -// "github.com/knative/foo/pkg/reconciler/scott" -// "github.com/knative/foo/pkg/reconciler/ville" -// "github.com/knative/foo/pkg/reconciler/dave" +// import ( +// // The set of controllers this controller process runs. +// // Linking these will register their transitive dependencies, after +// // which the shared main can set up the rest. +// "github.com/knative/foo/pkg/reconciler/matt" +// "github.com/knative/foo/pkg/reconciler/scott" +// "github.com/knative/foo/pkg/reconciler/ville" +// "github.com/knative/foo/pkg/reconciler/dave" // -// // This defines the shared main for injected controllers. -// "knative.dev/pkg/injection/sharedmain" -// ) +// // This defines the shared main for injected controllers. +// "knative.dev/pkg/injection/sharedmain" +// ) // -// func main() { -// sharedmain.Main("mycomponent", -// // We pass in the list of controllers to construct, and that's it! -// // If we forget to add this, go will complain about the unused import. -// matt.NewController, -// scott.NewController, -// ville.NewController, -// dave.NewController, -// ) -// } +// func main() { +// sharedmain.Main("mycomponent", +// // We pass in the list of controllers to construct, and that's it! +// // If we forget to add this, go will complain about the unused import. +// matt.NewController, +// scott.NewController, +// ville.NewController, +// dave.NewController, +// ) +// } // // If you want to adapt the above to run the controller within a single // namespace, you can instead do something like: // -// package main +// package main // -// import ( -// // The set of controllers this controller process runs. -// // Linking these will register their transitive dependencies, after -// // which the shared main can set up the rest. -// "github.com/knative/foo/pkg/reconciler/matt" -// "github.com/knative/foo/pkg/reconciler/scott" -// "github.com/knative/foo/pkg/reconciler/ville" -// "github.com/knative/foo/pkg/reconciler/dave" +// import ( +// // The set of controllers this controller process runs. +// // Linking these will register their transitive dependencies, after +// // which the shared main can set up the rest. +// "github.com/knative/foo/pkg/reconciler/matt" +// "github.com/knative/foo/pkg/reconciler/scott" +// "github.com/knative/foo/pkg/reconciler/ville" +// "github.com/knative/foo/pkg/reconciler/dave" // -// // This defines the shared main for injected controllers. -// "knative.dev/pkg/injection/sharedmain" +// // This defines the shared main for injected controllers. +// "knative.dev/pkg/injection/sharedmain" // -// // These are used to set up the context. -// "knative.dev/pkg/injection" -// "knative.dev/pkg/signals" -// ) +// // These are used to set up the context. +// "knative.dev/pkg/injection" +// "knative.dev/pkg/signals" +// ) // -// func main() { -// // Scope the shared informer factories to the provided namespace. -// ctx := injection.WithNamespace(signals.NewContext(), "the-namespace") +// func main() { +// // Scope the shared informer factories to the provided namespace. +// ctx := injection.WithNamespace(signals.NewContext(), "the-namespace") // -// // Use our initial context when setting up the controllers. -// sharedmain.MainWithContext(ctx, "mycomponent", -// // We pass in the list of controllers to construct, and that's it! -// // If we forget to add this, go will complain about the unused import. -// matt.NewController, -// scott.NewController, -// ville.NewController, -// dave.NewController, -// ) -// } +// // Use our initial context when setting up the controllers. +// sharedmain.MainWithContext(ctx, "mycomponent", +// // We pass in the list of controllers to construct, and that's it! +// // If we forget to add this, go will complain about the unused import. +// matt.NewController, +// scott.NewController, +// ville.NewController, +// dave.NewController, +// ) +// } package injection diff --git a/vendor/knative.dev/pkg/injection/injection.go b/vendor/knative.dev/pkg/injection/injection.go index d8cefc9fbe..f06e06f179 100644 --- a/vendor/knative.dev/pkg/injection/injection.go +++ b/vendor/knative.dev/pkg/injection/injection.go @@ -34,9 +34,11 @@ import ( // // Typical integration: // ```go -// ctx, startInformers := injection.EnableInjectionOrDie(signals.NewContext(), nil) -// ... start watches with informers, if required ... -// startInformers() +// +// ctx, startInformers := injection.EnableInjectionOrDie(signals.NewContext(), nil) +// ... start watches with informers, if required ... +// startInformers() +// // ``` func EnableInjectionOrDie(ctx context.Context, cfg *rest.Config) (context.Context, func()) { if ctx == nil { diff --git a/vendor/knative.dev/pkg/logging/object_encoders.go b/vendor/knative.dev/pkg/logging/object_encoders.go index ee14737cee..9a30f8aab1 100644 --- a/vendor/knative.dev/pkg/logging/object_encoders.go +++ b/vendor/knative.dev/pkg/logging/object_encoders.go @@ -29,9 +29,12 @@ import ( // StringSet returns a marshaler for the set of strings. // To use this in sugared logger do: +// // logger.Infow("Revision State", zap.Object("healthy", logging.StringSet(healthySet)), // zap.Object("unhealthy", logging.StringSet(unhealthySet))) +// // To use with non-sugared logger do: +// // logger.Info("Revision State", zap.Object("healthy", logging.StringSet(healthySet)), // zap.Object("unhealthy", logging.StringSet(unhealthySet))) func StringSet(s sets.String) zapcore.ObjectMarshalerFunc { diff --git a/vendor/knative.dev/pkg/metrics/prometheus_exporter.go b/vendor/knative.dev/pkg/metrics/prometheus_exporter.go index b5b39d9fce..621ffcbea3 100644 --- a/vendor/knative.dev/pkg/metrics/prometheus_exporter.go +++ b/vendor/knative.dev/pkg/metrics/prometheus_exporter.go @@ -20,6 +20,7 @@ import ( "net/http" "strconv" "sync" + "time" prom "contrib.go.opencensus.io/exporter/prometheus" "go.opencensus.io/resource" @@ -41,7 +42,7 @@ func (emptyPromExporter) ExportView(viewData *view.Data) { // a signal to enrich the internal Meters with Resource information. } -//nolint: unparam // False positive of flagging the second result of this function unused. +// nolint: unparam // False positive of flagging the second result of this function unused. func newPrometheusExporter(config *metricsConfig, logger *zap.SugaredLogger) (view.Exporter, ResourceExporterFactory, error) { e, err := prom.NewExporter(prom.Options{Namespace: config.component}) if err != nil { @@ -82,9 +83,11 @@ func startNewPromSrv(e *prom.Exporter, host string, port int) *http.Server { if curPromSrv != nil { curPromSrv.Close() } + //nolint:gosec curPromSrv = &http.Server{ - Addr: host + ":" + strconv.Itoa(port), - Handler: sm, + Addr: host + ":" + strconv.Itoa(port), + Handler: sm, + ReadHeaderTimeout: 60 * time.Second, } return curPromSrv } diff --git a/vendor/knative.dev/pkg/metrics/resource_view.go b/vendor/knative.dev/pkg/metrics/resource_view.go index 236fd588ba..69e4ab435d 100644 --- a/vendor/knative.dev/pkg/metrics/resource_view.go +++ b/vendor/knative.dev/pkg/metrics/resource_view.go @@ -29,7 +29,7 @@ import ( "go.opencensus.io/stats" "go.opencensus.io/stats/view" "go.opencensus.io/tag" - "k8s.io/apimachinery/pkg/util/clock" + "k8s.io/utils/clock" ) type storedViews struct { @@ -53,7 +53,7 @@ type meters struct { meters map[string]*meterExporter factory ResourceExporterFactory lock sync.Mutex - clock clock.Clock + clock clock.WithTicker ticker clock.Ticker tickerStopChan chan struct{} } @@ -65,7 +65,7 @@ var ( resourceViews = storedViews{} allMeters = meters{ meters: map[string]*meterExporter{"": &defaultMeter}, - clock: clock.Clock(clock.RealClock{}), + clock: clock.RealClock{}, } cleanupOnce = new(sync.Once) diff --git a/vendor/knative.dev/pkg/network/error_handler.go b/vendor/knative.dev/pkg/network/error_handler.go index 7637664893..d0b6beedc6 100644 --- a/vendor/knative.dev/pkg/network/error_handler.go +++ b/vendor/knative.dev/pkg/network/error_handler.go @@ -17,8 +17,8 @@ limitations under the License. package network import ( - "io/ioutil" "net/http" + "os" "go.uber.org/zap" ) @@ -36,7 +36,7 @@ func ErrorHandler(logger *zap.SugaredLogger) func(http.ResponseWriter, *http.Req } func readSockStat(logger *zap.SugaredLogger) string { - b, err := ioutil.ReadFile("/proc/net/sockstat") + b, err := os.ReadFile("/proc/net/sockstat") if err != nil { logger.Errorw("Unable to read sockstat", zap.Error(err)) return "" diff --git a/vendor/knative.dev/pkg/network/h2c.go b/vendor/knative.dev/pkg/network/h2c.go index 6cc0fa733d..b8f2d8c266 100644 --- a/vendor/knative.dev/pkg/network/h2c.go +++ b/vendor/knative.dev/pkg/network/h2c.go @@ -28,6 +28,7 @@ import ( // NewServer returns a new HTTP Server with HTTP2 handler. func NewServer(addr string, h http.Handler) *http.Server { + //nolint:gosec // https://github.com/knative/pkg/issues/2632 h1s := &http.Server{ Addr: addr, Handler: h2c.NewHandler(h, &http2.Server{}), diff --git a/vendor/knative.dev/pkg/profiling/server.go b/vendor/knative.dev/pkg/profiling/server.go index 9d61c0981f..526385f05e 100644 --- a/vendor/knative.dev/pkg/profiling/server.go +++ b/vendor/knative.dev/pkg/profiling/server.go @@ -110,6 +110,7 @@ func NewServer(handler http.Handler) *http.Server { port = strconv.Itoa(ProfilingPort) } + //nolint:gosec // https://github.com/knative/pkg/issues/2632 return &http.Server{ Addr: ":" + port, Handler: handler, diff --git a/vendor/knative.dev/pkg/reconciler/retry.go b/vendor/knative.dev/pkg/reconciler/retry.go index 1a50406b1e..2c6cfd612e 100644 --- a/vendor/knative.dev/pkg/reconciler/retry.go +++ b/vendor/knative.dev/pkg/reconciler/retry.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Veroute.on 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vendor/knative.dev/pkg/test/ingress/ingress.go b/vendor/knative.dev/pkg/test/ingress/ingress.go index fc9f9a19c8..8de4052c75 100644 --- a/vendor/knative.dev/pkg/test/ingress/ingress.go +++ b/vendor/knative.dev/pkg/test/ingress/ingress.go @@ -35,8 +35,10 @@ const ( // GetIngressEndpoint gets the ingress public IP or hostname. // address - is the endpoint to which we should actually connect. // portMap - translates the request's port to the port on address to which the caller -// should connect. This is used when the resolution to address goes through some -// sort of port-mapping, e.g. Kubernetes node ports. +// +// should connect. This is used when the resolution to address goes through some +// sort of port-mapping, e.g. Kubernetes node ports. +// // err - an error when address/portMap cannot be established. func GetIngressEndpoint(ctx context.Context, kubeClientset kubernetes.Interface, endpointOverride string) (address string, portMap func(string) string, err error) { ingressName := istioIngressName diff --git a/vendor/knative.dev/pkg/test/spoof/spoof.go b/vendor/knative.dev/pkg/test/spoof/spoof.go index 147a64adc7..789d4bd68b 100644 --- a/vendor/knative.dev/pkg/test/spoof/spoof.go +++ b/vendor/knative.dev/pkg/test/spoof/spoof.go @@ -23,7 +23,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net" "net/http" "net/url" @@ -188,7 +187,7 @@ func (sc *SpoofingClient) Poll(req *http.Request, inState ResponseChecker, check } defer rawResp.Body.Close() - body, err := ioutil.ReadAll(rawResp.Body) + body, err := io.ReadAll(rawResp.Body) if err != nil { return true, err } diff --git a/vendor/knative.dev/pkg/test/zipkin/doc.go b/vendor/knative.dev/pkg/test/zipkin/doc.go index c4464f4596..81c15343f6 100644 --- a/vendor/knative.dev/pkg/test/zipkin/doc.go +++ b/vendor/knative.dev/pkg/test/zipkin/doc.go @@ -33,9 +33,8 @@ This package exposes following methods: A general flow for a Test Suite to use Zipkin Tracing support is as follows: - 1. Call SetupZipkinTracing(kubernetes.Interface) in TestMain. - 2. Use SpoofingClient to make HTTP requests. - 3. Call CleanupZipkinTracingSetup on cleanup after tests are executed. - + 1. Call SetupZipkinTracing(kubernetes.Interface) in TestMain. + 2. Use SpoofingClient to make HTTP requests. + 3. Call CleanupZipkinTracingSetup on cleanup after tests are executed. */ package zipkin diff --git a/vendor/knative.dev/pkg/test/zipkin/util.go b/vendor/knative.dev/pkg/test/zipkin/util.go index 5e9cb5feb4..f22efa4418 100644 --- a/vendor/knative.dev/pkg/test/zipkin/util.go +++ b/vendor/knative.dev/pkg/test/zipkin/util.go @@ -22,7 +22,7 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "net/url" "strconv" @@ -110,9 +110,10 @@ func SetupZipkinTracingFromConfigTracingOrFail(ctx context.Context, t testing.TB } // SetupZipkinTracing sets up zipkin tracing which involves: -// 1. Setting up port-forwarding from localhost to zipkin pod on the cluster -// (pid of the process doing Port-Forward is stored in a global variable). -// 2. Enable AlwaysSample config for tracing for the SpoofingClient. +// 1. Setting up port-forwarding from localhost to zipkin pod on the cluster +// (pid of the process doing Port-Forward is stored in a global variable). +// 2. Enable AlwaysSample config for tracing for the SpoofingClient. +// // The zipkin deployment must have the label app=zipkin func SetupZipkinTracing(ctx context.Context, kubeClientset kubernetes.Interface, logf logging.FormatLogger, zipkinRemotePort int, zipkinNamespace string) (err error) { setupOnce.Do(func() { @@ -152,13 +153,13 @@ func SetupZipkinTracingOrFail(ctx context.Context, t testing.TB, kubeClientset k // CleanupZipkinTracingSetup cleans up the Zipkin tracing setup on the machine. This involves killing the process performing port-forward. // This should be called exactly once in TestMain. Likely in the form: // -// func TestMain(m *testing.M) { -// os.Exit(func() int { -// // Any setup required for the tests. -// defer zipkin.CleanupZipkinTracingSetup(logger) -// return m.Run() -// }()) -// } +// func TestMain(m *testing.M) { +// os.Exit(func() int { +// // Any setup required for the tests. +// defer zipkin.CleanupZipkinTracingSetup(logger) +// return m.Run() +// }()) +// } func CleanupZipkinTracingSetup(logf logging.FormatLogger) { teardownOnce.Do(func() { // Because CleanupZipkinTracingSetup only runs once, make sure that now that it has been @@ -226,7 +227,7 @@ func jsonTrace(traceID string) ([]model.SpanModel, error) { } defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { return empty, err } diff --git a/vendor/knative.dev/serving/pkg/apis/config/defaults.go b/vendor/knative.dev/serving/pkg/apis/config/defaults.go index 3168d210cb..3b9c18c9ec 100644 --- a/vendor/knative.dev/serving/pkg/apis/config/defaults.go +++ b/vendor/knative.dev/serving/pkg/apis/config/defaults.go @@ -121,7 +121,6 @@ func NewDefaultsConfigFromMap(data map[string]string) (*Defaults, error) { cm.AsInt64("revision-timeout-seconds", &nc.RevisionTimeoutSeconds), cm.AsInt64("max-revision-timeout-seconds", &nc.MaxRevisionTimeoutSeconds), - cm.AsInt64("revision-response-start-timeout-seconds", &nc.RevisionRequestStartTimeoutSeconds), cm.AsInt64("revision-idle-timeout-seconds", &nc.RevisionIdleTimeoutSeconds), cm.AsInt64("container-concurrency", &nc.ContainerConcurrency), @@ -137,6 +136,15 @@ func NewDefaultsConfigFromMap(data map[string]string) (*Defaults, error) { return nil, err } + // We default this to what the user has specified + nc.RevisionRequestStartTimeoutSeconds = nc.RevisionTimeoutSeconds + + if err := cm.Parse(data, + cm.AsInt64("revision-response-start-timeout-seconds", &nc.RevisionRequestStartTimeoutSeconds), + ); err != nil { + return nil, err + } + if nc.RevisionTimeoutSeconds > nc.MaxRevisionTimeoutSeconds { return nil, fmt.Errorf("revision-timeout-seconds (%d) cannot be greater than max-revision-timeout-seconds (%d)", nc.RevisionTimeoutSeconds, nc.MaxRevisionTimeoutSeconds) } diff --git a/vendor/knative.dev/serving/pkg/client/clientset/versioned/scheme/register.go b/vendor/knative.dev/serving/pkg/client/clientset/versioned/scheme/register.go index bff6a2188f..3b52ce4a75 100644 --- a/vendor/knative.dev/serving/pkg/client/clientset/versioned/scheme/register.go +++ b/vendor/knative.dev/serving/pkg/client/clientset/versioned/scheme/register.go @@ -43,14 +43,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/vendor/knative.dev/serving/test/e2e-common.sh b/vendor/knative.dev/serving/test/e2e-common.sh index d0c6927c33..82821416a0 100644 --- a/vendor/knative.dev/serving/test/e2e-common.sh +++ b/vendor/knative.dev/serving/test/e2e-common.sh @@ -589,5 +589,5 @@ function run_ytt() { function run_kapp() { - run_go_tool github.com/k14s/kapp/cmd/kapp kapp "$@" + run_go_tool github.com/vmware-tanzu/carvel-kapp/cmd/kapp kapp "$@" } diff --git a/vendor/modules.txt b/vendor/modules.txt index 429cd7559b..83c38a1701 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -902,7 +902,7 @@ k8s.io/utils/lru k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/trace -# knative.dev/eventing v0.34.1 +# knative.dev/eventing v0.34.7 ## explicit; go 1.18 knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/duck @@ -933,7 +933,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake # knative.dev/hack v0.0.0-20220823140917-8d1e4ccf9dc3 ## explicit; go 1.17 knative.dev/hack -# knative.dev/networking v0.0.0-20220818010248-e51df7cdf571 +# knative.dev/networking v0.0.0-20221208211516-5f25a81cd43e ## explicit; go 1.18 knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking @@ -948,7 +948,7 @@ knative.dev/networking/pkg/http/probe knative.dev/networking/pkg/http/proxy knative.dev/networking/pkg/http/stats knative.dev/networking/pkg/k8s -# knative.dev/pkg v0.0.0-20220818004048-4a03844c0b15 +# knative.dev/pkg v0.0.0-20221123011941-9d7bd235ceed ## explicit; go 1.18 knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -998,7 +998,7 @@ knative.dev/pkg/tracing/config knative.dev/pkg/tracing/propagation knative.dev/pkg/tracing/propagation/tracecontextb3 knative.dev/pkg/tracker -# knative.dev/serving v0.34.0 +# knative.dev/serving v0.34.4 ## explicit; go 1.18 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1 From af0cfeb6420d64754206ef654e0a932161e52a55 Mon Sep 17 00:00:00 2001 From: David Simansky Date: Tue, 7 Mar 2023 09:48:16 +0100 Subject: [PATCH 2/2] Reformat code --- lib/test/channel.go | 2 +- pkg/errors/factory.go | 4 ++-- pkg/eventing/v1/client.go | 6 +++--- pkg/kn/commands/broker/broker_test.go | 2 +- pkg/kn/commands/revision/delete_mock_test.go | 2 +- pkg/kn/commands/service/update_test.go | 4 ++-- pkg/kn/commands/source/apiserver/flags.go | 4 ++-- pkg/kn/commands/source/ping/update_test.go | 2 +- pkg/kn/commands/trigger/update_flags.go | 2 +- pkg/kn/config/testing_test.go | 1 - pkg/kn/flags/podspec.go | 6 +++--- pkg/printers/tablegenerator.go | 4 +++- pkg/sources/v1/apiserver_client.go | 8 ++++---- pkg/sources/v1/binding_client.go | 8 ++++---- pkg/sources/v1/container_client.go | 8 ++++---- 15 files changed, 32 insertions(+), 31 deletions(-) diff --git a/lib/test/channel.go b/lib/test/channel.go index 8cd6f0671e..dae8f3545f 100644 --- a/lib/test/channel.go +++ b/lib/test/channel.go @@ -54,7 +54,7 @@ func ChannelDelete(r *KnRunResultCollector, cname string) { assert.Check(r.T(), util.ContainsAllIgnoreCase(out.Stdout, "channel", cname, "deleted")) } -//ChannelListTypes return available channel types +// ChannelListTypes return available channel types func ChannelListTypes(r *KnRunResultCollector, args ...string) string { cmd := []string{"channel", "list-types"} cmd = append(cmd, args...) diff --git a/pkg/errors/factory.go b/pkg/errors/factory.go index 279e1912f4..9d8f51612a 100644 --- a/pkg/errors/factory.go +++ b/pkg/errors/factory.go @@ -61,8 +61,8 @@ func newStatusError(err error) error { return err } -//Retrieves a custom error struct based on the original error APIStatus struct -//Returns the original error struct in case it can't identify the kind of APIStatus error +// Retrieves a custom error struct based on the original error APIStatus struct +// Returns the original error struct in case it can't identify the kind of APIStatus error func GetError(err error) error { if err == nil { return nil diff --git a/pkg/eventing/v1/client.go b/pkg/eventing/v1/client.go index ec2e06ba08..decc443e15 100644 --- a/pkg/eventing/v1/client.go +++ b/pkg/eventing/v1/client.go @@ -86,7 +86,7 @@ func NewKnEventingClient(client clientv1.EventingV1Interface, namespace string) } } -//CreateTrigger is used to create an instance of trigger +// CreateTrigger is used to create an instance of trigger func (c *knEventingClient) CreateTrigger(ctx context.Context, trigger *eventingv1.Trigger) error { _, err := c.client.Triggers(c.namespace).Create(ctx, trigger, meta_v1.CreateOptions{}) if err != nil { @@ -95,7 +95,7 @@ func (c *knEventingClient) CreateTrigger(ctx context.Context, trigger *eventingv return nil } -//DeleteTrigger is used to delete an instance of trigger +// DeleteTrigger is used to delete an instance of trigger func (c *knEventingClient) DeleteTrigger(ctx context.Context, name string) error { err := c.client.Triggers(c.namespace).Delete(ctx, name, apis_v1.DeleteOptions{}) if err != nil { @@ -104,7 +104,7 @@ func (c *knEventingClient) DeleteTrigger(ctx context.Context, name string) error return nil } -//GetTrigger is used to get an instance of trigger +// GetTrigger is used to get an instance of trigger func (c *knEventingClient) GetTrigger(ctx context.Context, name string) (*eventingv1.Trigger, error) { trigger, err := c.client.Triggers(c.namespace).Get(ctx, name, apis_v1.GetOptions{}) if err != nil { diff --git a/pkg/kn/commands/broker/broker_test.go b/pkg/kn/commands/broker/broker_test.go index dbcc015073..aaae5aa44e 100644 --- a/pkg/kn/commands/broker/broker_test.go +++ b/pkg/kn/commands/broker/broker_test.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/pkg/kn/commands/revision/delete_mock_test.go b/pkg/kn/commands/revision/delete_mock_test.go index 01e6828c30..c70753a89d 100644 --- a/pkg/kn/commands/revision/delete_mock_test.go +++ b/pkg/kn/commands/revision/delete_mock_test.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/pkg/kn/commands/service/update_test.go b/pkg/kn/commands/service/update_test.go index 09c5c85fce..4a695fd693 100644 --- a/pkg/kn/commands/service/update_test.go +++ b/pkg/kn/commands/service/update_test.go @@ -981,7 +981,7 @@ func TestServiceUpdateNoClusterLocal(t *testing.T) { assert.DeepEqual(t, expected, actual) } -//TODO: add check for template name not changing when issue #646 solution is merged +// TODO: add check for template name not changing when issue #646 solution is merged func TestServiceUpdateNoClusterLocalOnPublicService(t *testing.T) { original := newEmptyService() original.ObjectMeta.Labels = map[string]string{} @@ -1000,7 +1000,7 @@ func TestServiceUpdateNoClusterLocalOnPublicService(t *testing.T) { assert.DeepEqual(t, expected, actual) } -//TODO: add check for template name not changing when issue #646 solution is merged +// TODO: add check for template name not changing when issue #646 solution is merged func TestServiceUpdateNoClusterLocalOnPrivateService(t *testing.T) { original := newEmptyService() original.ObjectMeta.Labels = map[string]string{network.VisibilityLabelKey: serving.VisibilityClusterLocal} diff --git a/pkg/kn/commands/source/apiserver/flags.go b/pkg/kn/commands/source/apiserver/flags.go index bd1e729484..f891d36ba7 100644 --- a/pkg/kn/commands/source/apiserver/flags.go +++ b/pkg/kn/commands/source/apiserver/flags.go @@ -123,7 +123,7 @@ func constructAPIVersionKindSelector(s []string) ([]sourcesv1.APIVersionKindSele return array, nil } -//getValidAPIVersionKindSelector is to parse resource spec from a string +// getValidAPIVersionKindSelector is to parse resource spec from a string func getValidAPIVersionKindSelector(resource string) (*sourcesv1.APIVersionKindSelector, error) { var err error @@ -145,7 +145,7 @@ func getValidAPIVersionKindSelector(resource string) (*sourcesv1.APIVersionKindS return &sourcesv1.APIVersionKindSelector{Kind: kind, APIVersion: version, LabelSelector: labelSelector}, nil } -//Add is to set parameters +// Add is to set parameters func (f *APIServerSourceUpdateFlags) Add(cmd *cobra.Command) { cmd.Flags().StringVar(&f.ServiceAccountName, "service-account", diff --git a/pkg/kn/commands/source/ping/update_test.go b/pkg/kn/commands/source/ping/update_test.go index 443000b9ad..4b87e53099 100644 --- a/pkg/kn/commands/source/ping/update_test.go +++ b/pkg/kn/commands/source/ping/update_test.go @@ -68,7 +68,7 @@ func TestSimplePingUpdate(t *testing.T) { pingRecorder.Validate() } -//TestSimplePingUpdateCEOverrides updates ce override, schedule, data and sink +// TestSimplePingUpdateCEOverrides updates ce override, schedule, data and sink func TestSimplePingUpdateCEOverrides(t *testing.T) { pingSourceClient := sourcesv1beta2.NewMockKnPingSourceClient(t) pingRecorder := pingSourceClient.Recorder() diff --git a/pkg/kn/commands/trigger/update_flags.go b/pkg/kn/commands/trigger/update_flags.go index 14b5de74c0..80467b8cd2 100644 --- a/pkg/kn/commands/trigger/update_flags.go +++ b/pkg/kn/commands/trigger/update_flags.go @@ -48,7 +48,7 @@ func (f *TriggerUpdateFlags) GetUpdateFilters() (map[string]string, []string, er return filters, removes, nil } -//Add is to set parameters +// Add is to set parameters func (f *TriggerUpdateFlags) Add(cmd *cobra.Command) { cmd.Flags().StringVar(&f.Broker, "broker", "default", "Name of the Broker which the trigger associates with.") // The Sugar controller was integrated into main Eventing controller. With that the default behavior was changed as well. diff --git a/pkg/kn/config/testing_test.go b/pkg/kn/config/testing_test.go index 9b93eca549..093ee7edbe 100644 --- a/pkg/kn/config/testing_test.go +++ b/pkg/kn/config/testing_test.go @@ -21,7 +21,6 @@ import ( ) // Test to keep code coverage quality gate happy. -// func TestTestConfig(t *testing.T) { cfg := TestConfig{ TestPluginsDir: "pluginsDir", diff --git a/pkg/kn/flags/podspec.go b/pkg/kn/flags/podspec.go index 760941486b..553e403529 100644 --- a/pkg/kn/flags/podspec.go +++ b/pkg/kn/flags/podspec.go @@ -78,7 +78,7 @@ func (s *uniqueStringArg) Type() string { func (s *uniqueStringArg) String() string { return string(*s) } -//AddUpdateFlags will add PodSpec flags related to environment variable to FlagSet of update command +// AddUpdateFlags will add PodSpec flags related to environment variable to FlagSet of update command func (p *PodSpecFlags) AddUpdateFlags(flagset *pflag.FlagSet) []string { flagNames := []string{} flagset.StringArrayVarP(&p.Env, "env", "e", []string{}, @@ -104,7 +104,7 @@ func (p *PodSpecFlags) AddUpdateFlags(flagset *pflag.FlagSet) []string { return flagNames } -//AddCreateFlags will add PodSpec flags related to environment variable to FlagSet of create command +// AddCreateFlags will add PodSpec flags related to environment variable to FlagSet of create command func (p *PodSpecFlags) AddCreateFlags(flagset *pflag.FlagSet) []string { flagNames := []string{} flagset.StringArrayVarP(&p.Env, "env", "e", []string{}, @@ -127,7 +127,7 @@ func (p *PodSpecFlags) AddCreateFlags(flagset *pflag.FlagSet) []string { return flagNames } -//AddFlags will add PodSpec related flags to FlagSet +// AddFlags will add PodSpec related flags to FlagSet func (p *PodSpecFlags) AddFlags(flagset *pflag.FlagSet) []string { flagNames := []string{} diff --git a/pkg/printers/tablegenerator.go b/pkg/printers/tablegenerator.go index 58ddf82b43..eec2ffd936 100644 --- a/pkg/printers/tablegenerator.go +++ b/pkg/printers/tablegenerator.go @@ -124,7 +124,9 @@ func (h *HumanReadablePrinter) TableHandler(columnDefinitions []metav1beta1.Tabl // ValidateRowPrintHandlerFunc validates print handler signature. // printFunc is the function that will be called to print an object. // It must be of the following type: -// func printFunc(object ObjectType, options PrintOptions) ([]metav1beta1.TableRow, error) +// +// func printFunc(object ObjectType, options PrintOptions) ([]metav1beta1.TableRow, error) +// // where ObjectType is the type of the object that will be printed, and the first // return value is an array of rows, with each row containing a number of cells that // match the number of columns defined for that printer function. diff --git a/pkg/sources/v1/apiserver_client.go b/pkg/sources/v1/apiserver_client.go index 972a3c4b7b..09a59d0855 100644 --- a/pkg/sources/v1/apiserver_client.go +++ b/pkg/sources/v1/apiserver_client.go @@ -68,7 +68,7 @@ func newKnAPIServerSourcesClient(client clientv1.ApiServerSourceInterface, names } } -//GetAPIServerSource returns apiSource object if present +// GetAPIServerSource returns apiSource object if present func (c *apiServerSourcesClient) GetAPIServerSource(ctx context.Context, name string) (*v1.ApiServerSource, error) { apiSource, err := c.client.Get(ctx, name, metav1.GetOptions{}) if err != nil { @@ -81,7 +81,7 @@ func (c *apiServerSourcesClient) GetAPIServerSource(ctx context.Context, name st return apiSource, nil } -//CreateAPIServerSource is used to create an instance of ApiServerSource +// CreateAPIServerSource is used to create an instance of ApiServerSource func (c *apiServerSourcesClient) CreateAPIServerSource(ctx context.Context, apiSource *v1.ApiServerSource) error { _, err := c.client.Create(ctx, apiSource, metav1.CreateOptions{}) if err != nil { @@ -91,7 +91,7 @@ func (c *apiServerSourcesClient) CreateAPIServerSource(ctx context.Context, apiS return nil } -//UpdateAPIServerSource is used to update an instance of ApiServerSource +// UpdateAPIServerSource is used to update an instance of ApiServerSource func (c *apiServerSourcesClient) UpdateAPIServerSource(ctx context.Context, apiSource *v1.ApiServerSource) error { _, err := c.client.Update(ctx, apiSource, metav1.UpdateOptions{}) if err != nil { @@ -101,7 +101,7 @@ func (c *apiServerSourcesClient) UpdateAPIServerSource(ctx context.Context, apiS return nil } -//DeleteAPIServerSource is used to create an instance of ApiServerSource +// DeleteAPIServerSource is used to create an instance of ApiServerSource func (c *apiServerSourcesClient) DeleteAPIServerSource(ctx context.Context, name string) error { err := c.client.Delete(ctx, name, metav1.DeleteOptions{}) if err != nil { diff --git a/pkg/sources/v1/binding_client.go b/pkg/sources/v1/binding_client.go index 2f889841e4..0a23cd1b3f 100644 --- a/pkg/sources/v1/binding_client.go +++ b/pkg/sources/v1/binding_client.go @@ -65,7 +65,7 @@ func newKnSinkBindingClient(client clientv1.SinkBindingInterface, namespace stri } } -//CreateSinkBinding is used to create an instance of binding +// CreateSinkBinding is used to create an instance of binding func (c *knBindingClient) CreateSinkBinding(ctx context.Context, binding *v1.SinkBinding) error { _, err := c.client.Create(ctx, binding, metav1.CreateOptions{}) if err != nil { @@ -74,7 +74,7 @@ func (c *knBindingClient) CreateSinkBinding(ctx context.Context, binding *v1.Sin return nil } -//DeleteSinkBinding is used to delete an instance of binding +// DeleteSinkBinding is used to delete an instance of binding func (c *knBindingClient) DeleteSinkBinding(ctx context.Context, name string) error { err := c.client.Delete(ctx, name, apisv1.DeleteOptions{}) if err != nil { @@ -83,7 +83,7 @@ func (c *knBindingClient) DeleteSinkBinding(ctx context.Context, name string) er return nil } -//GetSinkBinding is used to get an instance of binding +// GetSinkBinding is used to get an instance of binding func (c *knBindingClient) GetSinkBinding(ctx context.Context, name string) (*v1.SinkBinding, error) { binding, err := c.client.Get(ctx, name, apisv1.GetOptions{}) if err != nil { @@ -119,7 +119,7 @@ func (c *knBindingClient) ListSinkBindings(ctx context.Context) (*v1.SinkBinding return bindingListNew, nil } -//CreateSinkBinding is used to create an instance of binding +// CreateSinkBinding is used to create an instance of binding func (c *knBindingClient) UpdateSinkBinding(ctx context.Context, binding *v1.SinkBinding) error { _, err := c.client.Update(ctx, binding, metav1.UpdateOptions{}) if err != nil { diff --git a/pkg/sources/v1/container_client.go b/pkg/sources/v1/container_client.go index 59057280d2..7e9e408154 100644 --- a/pkg/sources/v1/container_client.go +++ b/pkg/sources/v1/container_client.go @@ -107,7 +107,7 @@ func newKnContainerSourcesClient(client clientv1.ContainerSourceInterface, names } } -//GetContainerSource returns containerSrc object if present +// GetContainerSource returns containerSrc object if present func (c *containerSourcesClient) GetContainerSource(ctx context.Context, name string) (*v1.ContainerSource, error) { containerSrc, err := c.client.Get(ctx, name, metav1.GetOptions{}) if err != nil { @@ -117,7 +117,7 @@ func (c *containerSourcesClient) GetContainerSource(ctx context.Context, name st return containerSrc, nil } -//CreateContainerSource is used to create an instance of ContainerSource +// CreateContainerSource is used to create an instance of ContainerSource func (c *containerSourcesClient) CreateContainerSource(ctx context.Context, containerSrc *v1.ContainerSource) error { _, err := c.client.Create(ctx, containerSrc, metav1.CreateOptions{}) if err != nil { @@ -127,7 +127,7 @@ func (c *containerSourcesClient) CreateContainerSource(ctx context.Context, cont return nil } -//UpdateContainerSource is used to update an instance of ContainerSource +// UpdateContainerSource is used to update an instance of ContainerSource func (c *containerSourcesClient) UpdateContainerSource(ctx context.Context, containerSrc *v1.ContainerSource) error { _, err := c.client.Update(ctx, containerSrc, metav1.UpdateOptions{}) if err != nil { @@ -137,7 +137,7 @@ func (c *containerSourcesClient) UpdateContainerSource(ctx context.Context, cont return nil } -//DeleteContainerSource is used to create an instance of ContainerSource +// DeleteContainerSource is used to create an instance of ContainerSource func (c *containerSourcesClient) DeleteContainerSource(name string, ctx context.Context) error { return c.client.Delete(ctx, name, metav1.DeleteOptions{}) }