diff --git a/go.mod b/go.mod index d68dfa16ed..0feb7a377c 100644 --- a/go.mod +++ b/go.mod @@ -17,16 +17,16 @@ require ( golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 gopkg.in/ini.v1 v1.56.0 // indirect gotest.tools v2.2.0+incompatible - k8s.io/api v0.18.12 - k8s.io/apimachinery v0.18.12 + k8s.io/api v0.19.7 + k8s.io/apimachinery v0.19.7 k8s.io/cli-runtime v0.18.12 k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible - k8s.io/code-generator v0.18.12 - knative.dev/eventing v0.20.1-0.20210121081853-26a3bfa203e8 + k8s.io/code-generator v0.19.7 + knative.dev/eventing v0.20.1-0.20210122193254-ff327f0343c6 knative.dev/hack v0.0.0-20210120165453-8d623a0af457 - knative.dev/networking v0.0.0-20210121025453-4db00b8ae77a - knative.dev/pkg v0.0.0-20210121051653-32a3248a7121 - knative.dev/serving v0.20.1-0.20210122011153-d0a0e3827242 + knative.dev/networking v0.0.0-20210123150554-8b522a9049a1 + knative.dev/pkg v0.0.0-20210124203454-7101e9d4f6c6 + knative.dev/serving v0.20.1-0.20210123202654-e61294b2ca32 sigs.k8s.io/yaml v1.2.0 ) diff --git a/go.sum b/go.sum index 647692022b..306fc1adb3 100644 --- a/go.sum +++ b/go.sum @@ -1242,6 +1242,8 @@ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8 k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200205140755-e0e292d8aa12 h1:pZzawYyz6VRNPVYpqGv61LWCimQv1BihyeqFrp50/G4= k8s.io/gengo v0.0.0-20200205140755-e0e292d8aa12/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw= +k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= @@ -1256,8 +1258,8 @@ k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 h1:v8ud2Up6QK1lNOKFgiIVrZdMg7MpmSnvtrOieolJKoE= k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= knative.dev/caching v0.0.0-20210120064853-cc4d11bd4274/go.mod h1:hh1afUwgK0slx19FdxznoIMYn41mYQZTPiFY7zny8oc= -knative.dev/eventing v0.20.1-0.20210121081853-26a3bfa203e8 h1:EXcW0XEHTgFlDOlbicxe0sycAswjlRlqpGwXf4S8CfQ= -knative.dev/eventing v0.20.1-0.20210121081853-26a3bfa203e8/go.mod h1:/i3WwcwRV9BGZkdmWChKSRQO71dgHmzzWdn1OktlyMg= +knative.dev/eventing v0.20.1-0.20210122193254-ff327f0343c6 h1:wufJ5UtknzldZNCyCjKKCVJX5tNqZdjXEvNhyMlbImo= +knative.dev/eventing v0.20.1-0.20210122193254-ff327f0343c6/go.mod h1:/i3WwcwRV9BGZkdmWChKSRQO71dgHmzzWdn1OktlyMg= knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24 h1:kIztWfvnIFV8Lhlea02K3YO2mIzcDyQNzrBLn0Oq9sA= knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack v0.0.0-20210114150620-4422dcadb3c8 h1:N/Kt6C5zZzTtFcTntRThB+vEJ7WcLKaZ5Q2Jm7b23vw= @@ -1266,18 +1268,18 @@ knative.dev/hack v0.0.0-20210120165453-8d623a0af457 h1:jEBITgx/lQydGncM0uetpv/Zq knative.dev/hack v0.0.0-20210120165453-8d623a0af457/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/networking v0.0.0-20210120054853-b17f43505630 h1:nw8ius50Qp4cyqJGEGfGsmwRM23qF6Ssoa46AZllcks= knative.dev/networking v0.0.0-20210120054853-b17f43505630/go.mod h1:clj5nwP53Dd+nI1Z/JiLY5gJkPZpV2CNM+VtGkSQsYM= -knative.dev/networking v0.0.0-20210121025453-4db00b8ae77a h1:pG+3VxQLfn2lxc3irtXlTOhsoQYRSq16Q27+13R4QW4= -knative.dev/networking v0.0.0-20210121025453-4db00b8ae77a/go.mod h1:hVzeezXBzGbhKxNpG66/wNjDRiLwlWrVilunogWaKlo= +knative.dev/networking v0.0.0-20210123150554-8b522a9049a1 h1:l5oOSQUa8fFa0LjazjZToiTwfA/WO3YB7biB9m1CEWg= +knative.dev/networking v0.0.0-20210123150554-8b522a9049a1/go.mod h1:hVzeezXBzGbhKxNpG66/wNjDRiLwlWrVilunogWaKlo= knative.dev/pkg v0.0.0-20210114223020-f0ea5e6b9c4e h1:3k5tzvlM9VGZFiXRj8UKc3CUpMGpqBlEbIY0Dp3F3NU= knative.dev/pkg v0.0.0-20210114223020-f0ea5e6b9c4e/go.mod h1:hckgW978SdzPA2H5EDvRPY8xsnPuDZLJLbPf8Jte7Q0= knative.dev/pkg v0.0.0-20210119162123-1bbf0a6436c3 h1:kvBQKadSBqhTMveExPsvlkTWNS8yQcvxes6PS5RxDQs= knative.dev/pkg v0.0.0-20210119162123-1bbf0a6436c3/go.mod h1:cZdMjcJE6JGSNaEypgbUigX1TjteMIwQsW2woNBPVCA= knative.dev/pkg v0.0.0-20210120200253-8cd47b5af35d/go.mod h1:cZdMjcJE6JGSNaEypgbUigX1TjteMIwQsW2woNBPVCA= -knative.dev/pkg v0.0.0-20210121051653-32a3248a7121 h1:Q+mBsG9gH9Q7wcUXswllBXOLICEPQCfpSpWu+t1ctiU= -knative.dev/pkg v0.0.0-20210121051653-32a3248a7121/go.mod h1:gLxtKir8BJ57os/J88y0zYZ8P15a6nnuP5yGUaG2hDQ= +knative.dev/pkg v0.0.0-20210124203454-7101e9d4f6c6 h1:jMwOlw2AZx9KlfIExLCFjcpM5jxL4huwfhHvRPqrTSI= +knative.dev/pkg v0.0.0-20210124203454-7101e9d4f6c6/go.mod h1:X4NPrCo8NK3hbDVan9Vm7mf5io3ZoINakAdrpSXVB08= knative.dev/reconciler-test v0.0.0-20210115075620-6fe6ef693370/go.mod h1:A5ZaQo+1lWGw2OoSc06wSyReX6huzBPJ2ra/R48s1yo= -knative.dev/serving v0.20.1-0.20210122011153-d0a0e3827242 h1:tuV8VZ2FCYAKbdNuJveNrWFYsKnk3BeCJpAd1VVw3so= -knative.dev/serving v0.20.1-0.20210122011153-d0a0e3827242/go.mod h1:PvcTcrNFpIlC1s5+IT4SXUTmsMnHLkLbL2K/rE9h8+k= +knative.dev/serving v0.20.1-0.20210123202654-e61294b2ca32 h1:mebiDXqLlnGh2IgU+aR6v8slPnf6aiJuGwiUzmkKdlo= +knative.dev/serving v0.20.1-0.20210123202654-e61294b2ca32/go.mod h1:PvcTcrNFpIlC1s5+IT4SXUTmsMnHLkLbL2K/rE9h8+k= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= 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= diff --git a/vendor/k8s.io/gengo/examples/deepcopy-gen/generators/deepcopy.go b/vendor/k8s.io/gengo/examples/deepcopy-gen/generators/deepcopy.go index 40f1306d5d..68b81d47ea 100644 --- a/vendor/k8s.io/gengo/examples/deepcopy-gen/generators/deepcopy.go +++ b/vendor/k8s.io/gengo/examples/deepcopy-gen/generators/deepcopy.go @@ -29,7 +29,7 @@ import ( "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/klog" + "k8s.io/klog/v2" ) // CustomArgs is used tby the go2idl framework to pass args specific to this diff --git a/vendor/k8s.io/gengo/examples/defaulter-gen/generators/defaulter.go b/vendor/k8s.io/gengo/examples/defaulter-gen/generators/defaulter.go index 9ee7b79f50..5861fcfed8 100644 --- a/vendor/k8s.io/gengo/examples/defaulter-gen/generators/defaulter.go +++ b/vendor/k8s.io/gengo/examples/defaulter-gen/generators/defaulter.go @@ -29,7 +29,7 @@ import ( "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/klog" + "k8s.io/klog/v2" ) // CustomArgs is used tby the go2idl framework to pass args specific to this diff --git a/vendor/k8s.io/gengo/examples/import-boss/generators/import_restrict.go b/vendor/k8s.io/gengo/examples/import-boss/generators/import_restrict.go index 308bb6b8d2..7232f5e6bf 100644 --- a/vendor/k8s.io/gengo/examples/import-boss/generators/import_restrict.go +++ b/vendor/k8s.io/gengo/examples/import-boss/generators/import_restrict.go @@ -35,7 +35,7 @@ import ( "k8s.io/gengo/types" "sigs.k8s.io/yaml" - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/vendor/k8s.io/gengo/examples/set-gen/generators/sets.go b/vendor/k8s.io/gengo/examples/set-gen/generators/sets.go index 8ddce7e3aa..ab9fc7f1e2 100644 --- a/vendor/k8s.io/gengo/examples/set-gen/generators/sets.go +++ b/vendor/k8s.io/gengo/examples/set-gen/generators/sets.go @@ -25,7 +25,7 @@ import ( "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/klog" + "k8s.io/klog/v2" ) // NameSystems returns the name system used by the generators in this package. diff --git a/vendor/k8s.io/gengo/examples/set-gen/generators/tags.go b/vendor/k8s.io/gengo/examples/set-gen/generators/tags.go index bb3b4d2573..52e8767718 100644 --- a/vendor/k8s.io/gengo/examples/set-gen/generators/tags.go +++ b/vendor/k8s.io/gengo/examples/set-gen/generators/tags.go @@ -18,7 +18,7 @@ package generators import ( "k8s.io/gengo/types" - "k8s.io/klog" + "k8s.io/klog/v2" ) // extractBoolTagOrDie gets the comment-tags for the key and asserts that, if diff --git a/vendor/k8s.io/gengo/generator/execute.go b/vendor/k8s.io/gengo/generator/execute.go index d1b12258c7..e489fd3f0d 100644 --- a/vendor/k8s.io/gengo/generator/execute.go +++ b/vendor/k8s.io/gengo/generator/execute.go @@ -29,7 +29,7 @@ import ( "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/klog" + "k8s.io/klog/v2" ) func errs2strings(errors []error) []string { diff --git a/vendor/k8s.io/gengo/generator/import_tracker.go b/vendor/k8s.io/gengo/generator/import_tracker.go index 5d87de4ff0..60c899ac46 100644 --- a/vendor/k8s.io/gengo/generator/import_tracker.go +++ b/vendor/k8s.io/gengo/generator/import_tracker.go @@ -20,7 +20,7 @@ import ( "go/token" "strings" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/gengo/namer" "k8s.io/gengo/types" diff --git a/vendor/k8s.io/gengo/parser/parse.go b/vendor/k8s.io/gengo/parser/parse.go index f3abe57cce..497f4615b4 100644 --- a/vendor/k8s.io/gengo/parser/parse.go +++ b/vendor/k8s.io/gengo/parser/parse.go @@ -33,7 +33,7 @@ import ( "strings" "k8s.io/gengo/types" - "k8s.io/klog" + "k8s.io/klog/v2" ) // This clarifies when a pkg path has been canonicalized. @@ -589,7 +589,7 @@ func (b *Builder) importWithMode(dir string, mode build.ImportMode) (*build.Pack if err != nil { return nil, fmt.Errorf("unable to get current directory: %v", err) } - buildPkg, err := b.context.Import(dir, cwd, mode) + buildPkg, err := b.context.Import(filepath.ToSlash(dir), cwd, mode) if err != nil { return nil, err } @@ -763,7 +763,8 @@ func (b *Builder) walkType(u types.Universe, useName *types.Name, in tc.Type) *t out.Methods = map[string]*types.Type{} } method := t.Method(i) - mt := b.walkType(u, nil, method.Type()) + name := tcNameToName(method.String()) + mt := b.walkType(u, &name, method.Type()) mt.CommentLines = splitLines(b.priorCommentLines(method.Pos(), 1).Text()) out.Methods[method.Name()] = mt } @@ -798,7 +799,8 @@ func (b *Builder) walkType(u types.Universe, useName *types.Name, in tc.Type) *t out.Methods = map[string]*types.Type{} } method := t.Method(i) - mt := b.walkType(u, nil, method.Type()) + name := tcNameToName(method.String()) + mt := b.walkType(u, &name, method.Type()) mt.CommentLines = splitLines(b.priorCommentLines(method.Pos(), 1).Text()) out.Methods[method.Name()] = mt } diff --git a/vendor/knative.dev/pkg/apis/duck/v1/addressable_types.go b/vendor/knative.dev/pkg/apis/duck/v1/addressable_types.go index db39ab862b..83e746a001 100644 --- a/vendor/knative.dev/pkg/apis/duck/v1/addressable_types.go +++ b/vendor/knative.dev/pkg/apis/duck/v1/addressable_types.go @@ -22,9 +22,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" "knative.dev/pkg/apis" "knative.dev/pkg/apis/duck/ducktypes" + "knative.dev/pkg/kmeta" ) // +genduck @@ -67,6 +69,7 @@ type AddressStatus struct { var ( _ apis.Listable = (*AddressableType)(nil) _ ducktypes.Populatable = (*AddressableType)(nil) + _ kmeta.OwnerRefable = (*AddressableType)(nil) ) // GetFullType implements duck.Implementable @@ -97,6 +100,11 @@ func (t *AddressableType) Populate() { } } +// GetGroupVersionKind implements kmeta.OwnerRefable +func (t *AddressableType) GetGroupVersionKind() schema.GroupVersionKind { + return t.GroupVersionKind() +} + // GetListType implements apis.Listable func (*AddressableType) GetListType() runtime.Object { return &AddressableTypeList{} diff --git a/vendor/modules.txt b/vendor/modules.txt index ee4b0231e8..881ebf2e48 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -506,7 +506,7 @@ gotest.tools/assert/cmp gotest.tools/internal/difflib gotest.tools/internal/format gotest.tools/internal/source -# k8s.io/api v0.18.12 => k8s.io/api v0.18.12 +# k8s.io/api v0.19.7 => k8s.io/api v0.18.12 ## explicit k8s.io/api/admissionregistration/v1 k8s.io/api/admissionregistration/v1beta1 @@ -548,7 +548,7 @@ k8s.io/api/settings/v1alpha1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.18.12 => k8s.io/apimachinery v0.18.12 +# k8s.io/apimachinery v0.19.7 => k8s.io/apimachinery v0.18.12 ## explicit k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -695,7 +695,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/code-generator v0.18.12 => k8s.io/code-generator v0.18.12 +# k8s.io/code-generator v0.19.7 => k8s.io/code-generator v0.18.12 ## explicit k8s.io/code-generator k8s.io/code-generator/cmd/client-gen @@ -730,7 +730,7 @@ k8s.io/code-generator/cmd/set-gen k8s.io/code-generator/pkg/namer k8s.io/code-generator/pkg/util k8s.io/code-generator/third_party/forked/golang/reflect -# k8s.io/gengo v0.0.0-20200205140755-e0e292d8aa12 +# k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 k8s.io/gengo/args k8s.io/gengo/examples/deepcopy-gen/generators k8s.io/gengo/examples/defaulter-gen/generators @@ -756,7 +756,7 @@ k8s.io/kube-openapi/pkg/util/sets k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/trace -# knative.dev/eventing v0.20.1-0.20210121081853-26a3bfa203e8 +# knative.dev/eventing v0.20.1-0.20210122193254-ff327f0343c6 ## explicit knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/configs @@ -789,12 +789,12 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1alpha2/fake # knative.dev/hack v0.0.0-20210120165453-8d623a0af457 ## explicit knative.dev/hack -# knative.dev/networking v0.0.0-20210121025453-4db00b8ae77a +# knative.dev/networking v0.0.0-20210123150554-8b522a9049a1 ## explicit knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking knative.dev/networking/pkg/apis/networking/v1alpha1 -# knative.dev/pkg v0.0.0-20210121051653-32a3248a7121 +# knative.dev/pkg v0.0.0-20210124203454-7101e9d4f6c6 ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -838,7 +838,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.20.1-0.20210122011153-d0a0e3827242 +# knative.dev/serving v0.20.1-0.20210123202654-e61294b2ca32 ## explicit knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1