diff --git a/go.mod b/go.mod index 4464c99c..6b399445 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( k8s.io/client-go v0.25.2 k8s.io/code-generator v0.25.2 k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 - knative.dev/hack v0.0.0-20221031132314-566898d800e9 - knative.dev/pkg v0.0.0-20221031202413-2f194914a4b2 + knative.dev/hack v0.0.0-20221101141106-4b6bd86dae9d + knative.dev/pkg v0.0.0-20221101143811-8fa1a3f55bf5 ) require ( diff --git a/go.sum b/go.sum index af466de2..5dad807e 100644 --- a/go.sum +++ b/go.sum @@ -801,10 +801,10 @@ k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkI k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -knative.dev/hack v0.0.0-20221031132314-566898d800e9 h1:TkrNe/pYuNu5PUyIfFAIUxgcmivItCspde1hCAC+fgw= -knative.dev/hack v0.0.0-20221031132314-566898d800e9/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= -knative.dev/pkg v0.0.0-20221031202413-2f194914a4b2 h1:1nIQaBgEoDkhS/GWDqYZhMGRudn6F89HAlANTu6OoWw= -knative.dev/pkg v0.0.0-20221031202413-2f194914a4b2/go.mod h1:j5kO7gKmWGj2DJpefCEiPbItToiYf+2bCtI+A6REkQo= +knative.dev/hack v0.0.0-20221101141106-4b6bd86dae9d h1:HeFly0SqthOWK2XmQy48kYB+S8X5cnSnyOSkOugjQYk= +knative.dev/hack v0.0.0-20221101141106-4b6bd86dae9d/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= +knative.dev/pkg v0.0.0-20221101143811-8fa1a3f55bf5 h1:3YQBFwswKM6PRTQzTaeWaSnxsA/Ri/sBlUV3PeM8gmA= +knative.dev/pkg v0.0.0-20221101143811-8fa1a3f55bf5/go.mod h1:j5kO7gKmWGj2DJpefCEiPbItToiYf+2bCtI+A6REkQo= 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/pkg/codegen/cmd/injection-gen/generators/filtered_informer.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/filtered_informer.go index 53debfb3..b9c5c4ae 100644 --- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/filtered_informer.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/filtered_informer.go @@ -41,6 +41,7 @@ type filteredInjectionGenerator struct { injectionClientSetPackage string clientSetPackage string listerPkg string + listerHasPointerElem bool } var _ generator.Generator = (*filteredInjectionGenerator)(nil) @@ -92,6 +93,7 @@ func (g *filteredInjectionGenerator) GenerateType(c *generator.Context, t *types "clientSetInterface": c.Universe.Type(types.Name{Package: g.clientSetPackage, Name: "Interface"}), "resourceLister": c.Universe.Type(types.Name{Name: g.typeToGenerate.Name.Name + "Lister", Package: g.listerPkg}), "resourceNamespaceLister": c.Universe.Type(types.Name{Name: g.typeToGenerate.Name.Name + "NamespaceLister", Package: g.listerPkg}), + "listerHasPointerElem": g.listerHasPointerElem, "groupGoName": namer.IC(g.groupGoName), "versionGoName": namer.IC(g.groupVersion.Version.String()), "group": namer.IC(g.groupGoName), @@ -246,7 +248,7 @@ func (w *wrapper) List(selector {{ .labelsSelector|raw }}) (ret []*{{ .type|raw return nil, err } for idx := range lo.Items { - ret = append(ret, &lo.Items[idx]) + ret = append(ret, {{if not .listerHasPointerElem}}&{{end}}lo.Items[idx]) } return ret, nil } diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/packages.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/packages.go index 72d5ed0d..8c3fe524 100644 --- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/packages.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/packages.go @@ -503,6 +503,7 @@ func versionInformerPackages(basePackage string, groupPkgName string, gv clientg clientSetPackage: customArgs.VersionedClientSetPackage, injectionClientSetPackage: filepath.Join(basePackage, "client"), listerPkg: listerPackagePath, + listerHasPointerElem: customArgs.ListerHasPointerElem, }) return generators }, diff --git a/vendor/modules.txt b/vendor/modules.txt index 07819e0b..1323bd49 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -687,10 +687,10 @@ k8s.io/utils/internal/third_party/forked/golang/net k8s.io/utils/net k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/hack v0.0.0-20221031132314-566898d800e9 +# knative.dev/hack v0.0.0-20221101141106-4b6bd86dae9d ## explicit; go 1.18 knative.dev/hack -# knative.dev/pkg v0.0.0-20221031202413-2f194914a4b2 +# knative.dev/pkg v0.0.0-20221101143811-8fa1a3f55bf5 ## explicit; go 1.18 knative.dev/pkg/apis knative.dev/pkg/apis/duck