diff --git a/LICENSES/vendor/github.com/kcp-dev/logicalcluster/v3/LICENSE b/LICENSES/vendor/github.com/kcp-dev/logicalcluster/v3/LICENSE new file mode 100644 index 0000000000000..5d545d727b24b --- /dev/null +++ b/LICENSES/vendor/github.com/kcp-dev/logicalcluster/v3/LICENSE @@ -0,0 +1,206 @@ += vendor/github.com/kcp-dev/logicalcluster/v3 licensed under: = + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + += vendor/github.com/kcp-dev/logicalcluster/v3/LICENSE 3b83ef96387f14655fc854ddc3c6bd57 diff --git a/cluster/gce/gci/audit_policy_test.go b/cluster/gce/gci/audit_policy_test.go index 9763302b458d5..728f94569cedf 100644 --- a/cluster/gce/gci/audit_policy_test.go +++ b/cluster/gce/gci/audit_policy_test.go @@ -22,7 +22,6 @@ import ( "path/filepath" "testing" - "github.com/kcp-dev/logicalcluster/v2" "k8s.io/apiserver/pkg/apis/audit" auditinstall "k8s.io/apiserver/pkg/apis/audit/install" auditpkg "k8s.io/apiserver/pkg/audit" diff --git a/cmd/kube-apiserver/app/aggregator.go b/cmd/kube-apiserver/app/aggregator.go index 14093395d7fce..73e9ee34fe8cf 100644 --- a/cmd/kube-apiserver/app/aggregator.go +++ b/cmd/kube-apiserver/app/aggregator.go @@ -25,7 +25,7 @@ import ( "strings" "sync" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/klog/v2" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/cmd/kube-controller-manager/app/core.go b/cmd/kube-controller-manager/app/core.go index 1a0849e12d5d5..f4e7487055de8 100644 --- a/cmd/kube-controller-manager/app/core.go +++ b/cmd/kube-controller-manager/app/core.go @@ -17,7 +17,6 @@ limitations under the License. // Package app implements a server that runs a set of active // components. This includes replication controllers, service endpoints and // nodes. -// package app import ( @@ -28,7 +27,6 @@ import ( "strings" "time" - "github.com/kcp-dev/logicalcluster/v2" "k8s.io/klog/v2" v1 "k8s.io/api/core/v1" diff --git a/go.mod b/go.mod index d7cef4d7039b8..9e5d352845955 100644 --- a/go.mod +++ b/go.mod @@ -52,9 +52,10 @@ require ( github.com/heketi/heketi v10.3.0+incompatible github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 // indirect github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5 - github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be - github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 + github.com/kcp-dev/apimachinery v0.0.0-20221205120156-b90e084cbd56 + github.com/kcp-dev/client-go v0.0.0-20221205150201-dfa4fc4b06bb github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 + github.com/kcp-dev/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 github.com/libopenstorage/openstorage v1.0.0 github.com/lithammer/dedent v1.1.0 github.com/lpabon/godbc v0.1.1 // indirect @@ -302,9 +303,11 @@ replace ( github.com/julienschmidt/httprouter => github.com/julienschmidt/httprouter v1.3.0 github.com/jung-kurt/gofpdf => github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5 github.com/karrick/godirwalk => github.com/karrick/godirwalk v1.16.1 - github.com/kcp-dev/apimachinery => github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be - github.com/kcp-dev/client-go => github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 + + github.com/kcp-dev/apimachinery => github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 + github.com/kcp-dev/client-go => github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb github.com/kcp-dev/logicalcluster/v2 => github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 + github.com/kcp-dev/logicalcluster/v3 => github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 github.com/kisielk/errcheck => github.com/kisielk/errcheck v1.5.0 github.com/kisielk/gotool => github.com/kisielk/gotool v1.0.0 github.com/konsorten/go-windows-terminal-sequences => github.com/konsorten/go-windows-terminal-sequences v1.0.2 diff --git a/go.sum b/go.sum index 9ab6116a76993..2f52bcefafc3a 100644 --- a/go.sum +++ b/go.sum @@ -275,10 +275,6 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be h1:2uDzJ896+ojtzgr9HJL8+tZEoqhq8blwymGinWFrQ6E= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 h1:Dxst7pq601Y7zNhSAec7LoBySHFWvD+djLTqoTmHrL0= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6/go.mod h1:Qmq1OxUOSdVQ8YIGnjbya5Xt04KMJ5fN41QvErl/XnI= github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -356,6 +352,12 @@ github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.m github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU= github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 h1:XxRBHVw8nfR2hS4PrwpfLmGTFHW4fpRmK2o6wtLY5k0= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56/go.mod h1:XEv+UQlH7NT41TOZYRK+LRo2URcwYjP8GQqOqtBk0RI= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb h1:hxhAOWnBMTkLdxIJbvKh0jUKkZp51t7/+bbdxYhb67g= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb/go.mod h1:kLMJgfd5gpWZv2y42vrn1W7WgeFpBlDV3vcJCqx4qxk= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 h1:zS7dh4JYSew1wAimDQjOQLndo/65hwXzeZHnt0Kl5IM= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/pkg/controller/certificates/rootcacertpublisher/publisher.go b/pkg/controller/certificates/rootcacertpublisher/publisher.go index 56833484ebd6b..446299b8c773a 100644 --- a/pkg/controller/certificates/rootcacertpublisher/publisher.go +++ b/pkg/controller/certificates/rootcacertpublisher/publisher.go @@ -23,10 +23,10 @@ import ( "time" kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" kcpcorev1informers "github.com/kcp-dev/client-go/informers/core/v1" + kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" kcpcorev1listers "github.com/kcp-dev/client-go/listers/core/v1" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -222,7 +222,7 @@ func (c *Publisher) syncNamespace(ctx context.Context, key string) (err error) { switch { case apierrors.IsNotFound(err): - _, err = c.client.Cluster(clusterName).CoreV1().ConfigMaps(name).Create(ctx, &v1.ConfigMap{ + _, err = c.client.Cluster(clusterName.Path()).CoreV1().ConfigMaps(name).Create(ctx, &v1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ Name: RootCACertConfigMapName, Annotations: map[string]string{DescriptionAnnotation: Description}, @@ -257,7 +257,7 @@ func (c *Publisher) syncNamespace(ctx context.Context, key string) (err error) { } cm.Annotations[DescriptionAnnotation] = Description - _, err = c.client.Cluster(clusterName).CoreV1().ConfigMaps(name).Update(ctx, cm, metav1.UpdateOptions{}) + _, err = c.client.Cluster(clusterName.Path()).CoreV1().ConfigMaps(name).Update(ctx, cm, metav1.UpdateOptions{}) return err } diff --git a/pkg/controller/clusterroleaggregation/clusterroleaggregation_controller.go b/pkg/controller/clusterroleaggregation/clusterroleaggregation_controller.go index d7720349c3f11..523af7eec171c 100644 --- a/pkg/controller/clusterroleaggregation/clusterroleaggregation_controller.go +++ b/pkg/controller/clusterroleaggregation/clusterroleaggregation_controller.go @@ -23,10 +23,10 @@ import ( "time" kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - kcprbacclient "github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1" kcprbacinformers "github.com/kcp-dev/client-go/informers/rbac/v1" + kcprbacclient "github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1" kcprbaclisters "github.com/kcp-dev/client-go/listers/rbac/v1" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/equality" @@ -145,7 +145,7 @@ func (c *ClusterRoleAggregationController) applyClusterRoles(ctx context.Context WithRules(toApplyPolicyRules(newPolicyRules)...) opts := metav1.ApplyOptions{FieldManager: "clusterrole-aggregation-controller", Force: true} - _, err := c.clusterRoleClient.ClusterRoles().Cluster(logicalcluster.From(sharedClusterRole)).Apply(ctx, clusterRoleApply, opts) + _, err := c.clusterRoleClient.ClusterRoles().Cluster(logicalcluster.From(sharedClusterRole).Path()).Apply(ctx, clusterRoleApply, opts) return err } @@ -155,7 +155,7 @@ func (c *ClusterRoleAggregationController) updateClusterRoles(ctx context.Contex for _, rule := range newPolicyRules { clusterRole.Rules = append(clusterRole.Rules, *rule.DeepCopy()) } - _, err := c.clusterRoleClient.ClusterRoles().Cluster(logicalcluster.From(sharedClusterRole)).Update(ctx, clusterRole, metav1.UpdateOptions{}) + _, err := c.clusterRoleClient.ClusterRoles().Cluster(logicalcluster.From(sharedClusterRole).Path()).Update(ctx, clusterRole, metav1.UpdateOptions{}) return err } diff --git a/pkg/controller/garbagecollector/garbagecollector.go b/pkg/controller/garbagecollector/garbagecollector.go index 8668a37222c8e..7649ab4ba8d2c 100644 --- a/pkg/controller/garbagecollector/garbagecollector.go +++ b/pkg/controller/garbagecollector/garbagecollector.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/controller/garbagecollector/garbagecollector_patch.go b/pkg/controller/garbagecollector/garbagecollector_patch.go index c60d41fb8b291..7ef280dd49207 100644 --- a/pkg/controller/garbagecollector/garbagecollector_patch.go +++ b/pkg/controller/garbagecollector/garbagecollector_patch.go @@ -22,7 +22,7 @@ import ( "reflect" "time" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/controller/garbagecollector/graph_builder.go b/pkg/controller/garbagecollector/graph_builder.go index a4cef307cdf25..5b9a47ada857a 100644 --- a/pkg/controller/garbagecollector/graph_builder.go +++ b/pkg/controller/garbagecollector/graph_builder.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/klog/v2" diff --git a/pkg/controller/namespace/deletion/namespaced_resources_deleter.go b/pkg/controller/namespace/deletion/namespaced_resources_deleter.go index ee2910fe2957a..d7e8f91470a9c 100644 --- a/pkg/controller/namespace/deletion/namespaced_resources_deleter.go +++ b/pkg/controller/namespace/deletion/namespaced_resources_deleter.go @@ -25,7 +25,7 @@ import ( kcpcorev1client "github.com/kcp-dev/client-go/kubernetes/typed/core/v1" kcpmetadata "github.com/kcp-dev/client-go/metadata" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/klog/v2" @@ -82,10 +82,11 @@ type namespacedResourcesDeleter struct { // Delete deletes all resources in the given namespace. // Before deleting resources: -// * It ensures that deletion timestamp is set on the -// namespace (does nothing if deletion timestamp is missing). -// * Verifies that the namespace is in the "terminating" phase -// (updates the namespace phase if it is not yet marked terminating) +// - It ensures that deletion timestamp is set on the +// namespace (does nothing if deletion timestamp is missing). +// - Verifies that the namespace is in the "terminating" phase +// (updates the namespace phase if it is not yet marked terminating) +// // After deleting the resources: // * It removes finalizer token from the given namespace. // @@ -97,7 +98,7 @@ func (d *namespacedResourcesDeleter) Delete(clusterName logicalcluster.Name, nsN // Multiple controllers may edit a namespace during termination // first get the latest state of the namespace before proceeding // if the namespace was deleted already, don't do anything - namespace, err := d.nsClient.Cluster(clusterName).Get(context.TODO(), nsName, metav1.GetOptions{}) + namespace, err := d.nsClient.Cluster(clusterName.Path()).Get(context.TODO(), nsName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { return nil @@ -287,7 +288,7 @@ func (d *namespacedResourcesDeleter) retryOnConflictError(namespace *v1.Namespac return nil, err } prevNamespace := latestNamespace - latestNamespace, err = d.nsClient.Cluster(logicalcluster.From(latestNamespace)).Get(context.TODO(), latestNamespace.Name, metav1.GetOptions{}) + latestNamespace, err = d.nsClient.Cluster(logicalcluster.From(latestNamespace).Path()).Get(context.TODO(), latestNamespace.Name, metav1.GetOptions{}) if err != nil { return nil, err } @@ -304,7 +305,7 @@ func (d *namespacedResourcesDeleter) updateNamespaceStatusFunc(namespace *v1.Nam } newNamespace := namespace.DeepCopy() newNamespace.Status.Phase = v1.NamespaceTerminating - return d.nsClient.Cluster(logicalcluster.From(namespace)).UpdateStatus(context.TODO(), newNamespace, metav1.UpdateOptions{}) + return d.nsClient.Cluster(logicalcluster.From(namespace).Path()).UpdateStatus(context.TODO(), newNamespace, metav1.UpdateOptions{}) } // finalized returns true if the namespace.Spec.Finalizers is an empty list @@ -327,7 +328,7 @@ func (d *namespacedResourcesDeleter) finalizeNamespace(namespace *v1.Namespace) for _, value := range finalizerSet.List() { namespaceFinalize.Spec.Finalizers = append(namespaceFinalize.Spec.Finalizers, v1.FinalizerName(value)) } - namespace, err := d.nsClient.Cluster(logicalcluster.From(namespace)).Finalize(context.Background(), &namespaceFinalize, metav1.UpdateOptions{}) + namespace, err := d.nsClient.Cluster(logicalcluster.From(namespace).Path()).Finalize(context.Background(), &namespaceFinalize, metav1.UpdateOptions{}) if err != nil { // it was removed already, so life is good if errors.IsNotFound(err) { @@ -356,7 +357,7 @@ func (d *namespacedResourcesDeleter) deleteCollection(clusterName logicalcluster // namespace itself. background := metav1.DeletePropagationBackground opts := metav1.DeleteOptions{PropagationPolicy: &background} - err := d.metadataClient.Cluster(clusterName).Resource(gvr).Namespace(namespace).DeleteCollection(context.TODO(), opts, metav1.ListOptions{}) + err := d.metadataClient.Cluster(clusterName.Path()).Resource(gvr).Namespace(namespace).DeleteCollection(context.TODO(), opts, metav1.ListOptions{}) if err == nil { return true, nil @@ -378,9 +379,10 @@ func (d *namespacedResourcesDeleter) deleteCollection(clusterName logicalcluster // listCollection will list the items in the specified namespace // it returns the following: -// the list of items in the collection (if found) -// a boolean if the operation is supported -// an error if the operation is supported but could not be completed. +// +// the list of items in the collection (if found) +// a boolean if the operation is supported +// an error if the operation is supported but could not be completed. func (d *namespacedResourcesDeleter) listCollection(clusterName logicalcluster.Name, gvr schema.GroupVersionResource, namespace string) (*metav1.PartialObjectMetadataList, bool, error) { klog.V(5).Infof("namespace controller - listCollection - namespace: %s, gvr: %v", namespace, gvr) @@ -392,7 +394,7 @@ func (d *namespacedResourcesDeleter) listCollection(clusterName logicalcluster.N return nil, false, nil } - partialList, err := d.metadataClient.Cluster(clusterName).Resource(gvr).Namespace(namespace).List(context.TODO(), metav1.ListOptions{}) + partialList, err := d.metadataClient.Cluster(clusterName.Path()).Resource(gvr).Namespace(namespace).List(context.TODO(), metav1.ListOptions{}) if err == nil { return partialList, true, nil } @@ -424,7 +426,7 @@ func (d *namespacedResourcesDeleter) deleteEachItem(clusterName logicalcluster.N for _, item := range unstructuredList.Items { background := metav1.DeletePropagationBackground opts := metav1.DeleteOptions{PropagationPolicy: &background} - if err = d.metadataClient.Cluster(clusterName).Resource(gvr).Namespace(namespace).Delete(context.TODO(), item.GetName(), opts); err != nil && !errors.IsNotFound(err) && !errors.IsMethodNotSupported(err) { + if err = d.metadataClient.Cluster(clusterName.Path()).Resource(gvr).Namespace(namespace).Delete(context.TODO(), item.GetName(), opts); err != nil && !errors.IsNotFound(err) && !errors.IsMethodNotSupported(err) { return err } } @@ -587,7 +589,7 @@ func (d *namespacedResourcesDeleter) deleteAllContent(ns *v1.Namespace) (int64, // we need to reflect that information. Recall that additional finalizers can be set on namespaces, so this finalizer may clear itself and // NOT remove the resource instance. if hasChanged := conditionUpdater.Update(ns); hasChanged { - if _, err = d.nsClient.Cluster(logicalcluster.From(ns)).UpdateStatus(context.TODO(), ns, metav1.UpdateOptions{}); err != nil { + if _, err = d.nsClient.Cluster(logicalcluster.From(ns).Path()).UpdateStatus(context.TODO(), ns, metav1.UpdateOptions{}); err != nil { utilruntime.HandleError(fmt.Errorf("couldn't update status condition for namespace %q: %v", namespace, err)) } } @@ -627,7 +629,7 @@ func (d *namespacedResourcesDeleter) estimateGracefulTerminationForPods(clusterN if podsGetter == nil || reflect.ValueOf(podsGetter).IsNil() { return 0, fmt.Errorf("unexpected: podsGetter is nil. Cannot estimate grace period seconds for pods") } - items, err := podsGetter.Pods().Cluster(clusterName).Namespace(ns).List(context.TODO(), metav1.ListOptions{}) + items, err := podsGetter.Pods().Cluster(clusterName.Path()).Namespace(ns).List(context.TODO(), metav1.ListOptions{}) if err != nil { return 0, err } diff --git a/pkg/controller/namespace/deletion/namespaced_resources_deleter_test.go b/pkg/controller/namespace/deletion/namespaced_resources_deleter_test.go index e3e486aed5f3b..f84fc935083e1 100644 --- a/pkg/controller/namespace/deletion/namespaced_resources_deleter_test.go +++ b/pkg/controller/namespace/deletion/namespaced_resources_deleter_test.go @@ -25,7 +25,7 @@ import ( "sync" "testing" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index 7d4ef1f135b2d..2fe5be934a926 100644 --- a/pkg/controller/namespace/namespace_controller.go +++ b/pkg/controller/namespace/namespace_controller.go @@ -21,11 +21,11 @@ import ( "time" kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" kcpcorev1informers "github.com/kcp-dev/client-go/informers/core/v1" + kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" kcpcorev1listers "github.com/kcp-dev/client-go/listers/core/v1" kcpmetadata "github.com/kcp-dev/client-go/metadata" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "golang.org/x/time/rate" v1 "k8s.io/api/core/v1" diff --git a/pkg/controller/resourcequota/resource_quota_controller.go b/pkg/controller/resourcequota/resource_quota_controller.go index 6d567a5b0cb9b..df2ecfb91cc80 100644 --- a/pkg/controller/resourcequota/resource_quota_controller.go +++ b/pkg/controller/resourcequota/resource_quota_controller.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/klog/v2" diff --git a/pkg/controller/resourcequota/resource_quota_monitor.go b/pkg/controller/resourcequota/resource_quota_monitor.go index d58d7bfa2748b..4767cc87fbfc4 100644 --- a/pkg/controller/resourcequota/resource_quota_monitor.go +++ b/pkg/controller/resourcequota/resource_quota_monitor.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/kcp-dev/logicalcluster/v2" - + "github.com/kcp-dev/logicalcluster/v3" + "k8s.io/klog/v2" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/controller/serviceaccount/serviceaccounts_controller.go b/pkg/controller/serviceaccount/serviceaccounts_controller.go index 0e5ef4a5e5d81..48cf0ff889d9d 100644 --- a/pkg/controller/serviceaccount/serviceaccounts_controller.go +++ b/pkg/controller/serviceaccount/serviceaccounts_controller.go @@ -21,11 +21,12 @@ import ( "fmt" "time" + "github.com/kcp-dev/logicalcluster/v3" + kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" kcpcorev1informers "github.com/kcp-dev/client-go/informers/core/v1" + kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" kcpcorev1listers "github.com/kcp-dev/client-go/listers/core/v1" - "github.com/kcp-dev/logicalcluster/v2" "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -221,7 +222,7 @@ func (c *ServiceAccountsController) syncNamespace(ctx context.Context, key strin // TODO eliminate this once the fake client can handle creation without NS sa.Namespace = ns.Name - if _, err := c.client.Cluster(clusterName).CoreV1().ServiceAccounts(ns.Name).Create(ctx, &sa, metav1.CreateOptions{}); err != nil && !apierrors.IsAlreadyExists(err) { + if _, err := c.client.Cluster(clusterName.Path()).CoreV1().ServiceAccounts(ns.Name).Create(ctx, &sa, metav1.CreateOptions{}); err != nil && !apierrors.IsAlreadyExists(err) { // we can safely ignore terminating namespace errors if !apierrors.HasStatusCause(err, v1.NamespaceTerminatingCause) { createFailures = append(createFailures, err) diff --git a/pkg/controller/serviceaccount/tokengetter.go b/pkg/controller/serviceaccount/tokengetter.go index 739911927a66b..fdd21fce1c00c 100644 --- a/pkg/controller/serviceaccount/tokengetter.go +++ b/pkg/controller/serviceaccount/tokengetter.go @@ -23,7 +23,7 @@ import ( kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" kcpcorev1listers "github.com/kcp-dev/client-go/listers/core/v1" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" @@ -48,7 +48,7 @@ type serviceAccountTokenClusterGetter struct { func (s *serviceAccountTokenClusterGetter) Cluster(name logicalcluster.Name) serviceaccount.ServiceAccountTokenGetter { return NewGetterFromClient( - s.client.Cluster(name), + s.client.Cluster(name.Path()), s.secretLister.Cluster(name), s.serviceAccountLister.Cluster(name), nil, diff --git a/pkg/controller/serviceaccount/tokens_controller.go b/pkg/controller/serviceaccount/tokens_controller.go index eeb4720bc2ee1..1797d3f663cec 100644 --- a/pkg/controller/serviceaccount/tokens_controller.go +++ b/pkg/controller/serviceaccount/tokens_controller.go @@ -23,11 +23,11 @@ import ( "time" kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" kcpcorev1informers "github.com/kcp-dev/client-go/informers/core/v1" + kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" kcpcorev1listers "github.com/kcp-dev/client-go/listers/core/v1" kcpthirdpartycache "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/tools/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -356,7 +356,7 @@ func (e *TokensController) deleteToken(clusterName logicalcluster.Name, ns, name opts.Preconditions = &metav1.Preconditions{UID: &uid} } - err := e.client.Cluster(clusterName).CoreV1().Secrets(ns).Delete(context.TODO(), name, opts) + err := e.client.Cluster(clusterName.Path()).CoreV1().Secrets(ns).Delete(context.TODO(), name, opts) // NotFound doesn't need a retry (it's already been deleted) // Conflict doesn't need a retry (the UID precondition failed) if err == nil || apierrors.IsNotFound(err) || apierrors.IsConflict(err) { @@ -380,7 +380,7 @@ func (e *TokensController) ensureReferencedToken(serviceAccount *v1.ServiceAccou // We don't want to update the cache's copy of the service account // so add the secret to a freshly retrieved copy of the service account - serviceAccounts := e.client.Cluster(clusterName).CoreV1().ServiceAccounts(serviceAccount.Namespace) + serviceAccounts := e.client.Cluster(clusterName.Path()).CoreV1().ServiceAccounts(serviceAccount.Namespace) liveServiceAccount, err := serviceAccounts.Get(context.TODO(), serviceAccount.Name, metav1.GetOptions{}) if err != nil { // Retry if we cannot fetch the live service account (for a NotFound error, either the live lookup or our cache are stale) @@ -419,7 +419,7 @@ func (e *TokensController) ensureReferencedToken(serviceAccount *v1.ServiceAccou } // Save the secret - createdToken, err := e.client.Cluster(clusterName).CoreV1().Secrets(serviceAccount.Namespace).Create(context.TODO(), secret, metav1.CreateOptions{}) + createdToken, err := e.client.Cluster(clusterName.Path()).CoreV1().Secrets(serviceAccount.Namespace).Create(context.TODO(), secret, metav1.CreateOptions{}) if err != nil { // if the namespace is being terminated, create will fail no matter what if apierrors.HasStatusCause(err, v1.NamespaceTerminatingCause) { @@ -473,7 +473,7 @@ func (e *TokensController) ensureReferencedToken(serviceAccount *v1.ServiceAccou // we weren't able to use the token, try to clean it up. klog.V(2).Infof("deleting secret %s|%s/%s because reference couldn't be added (%v)", clusterName, secret.Namespace, secret.Name, err) deleteOpts := metav1.DeleteOptions{Preconditions: &metav1.Preconditions{UID: &createdToken.UID}} - if err := e.client.Cluster(clusterName).CoreV1().Secrets(createdToken.Namespace).Delete(context.TODO(), createdToken.Name, deleteOpts); err != nil { + if err := e.client.Cluster(clusterName.Path()).CoreV1().Secrets(createdToken.Namespace).Delete(context.TODO(), createdToken.Name, deleteOpts); err != nil { klog.Error(err) // if we fail, just log it } } @@ -533,7 +533,7 @@ func (e *TokensController) generateTokenIfNeeded(serviceAccount *v1.ServiceAccou // We don't want to update the cache's copy of the secret // so add the token to a freshly retrieved copy of the secret - secrets := e.client.Cluster(clusterName).CoreV1().Secrets(cachedSecret.Namespace) + secrets := e.client.Cluster(clusterName.Path()).CoreV1().Secrets(cachedSecret.Namespace) liveSecret, err := secrets.Get(context.TODO(), cachedSecret.Name, metav1.GetOptions{}) if err != nil { // Retry for any error other than a NotFound @@ -597,7 +597,7 @@ func (e *TokensController) generateTokenIfNeeded(serviceAccount *v1.ServiceAccou func (e *TokensController) removeSecretReference(saClusterName logicalcluster.Name, saNamespace string, saName string, saUID types.UID, secretName string) error { // We don't want to update the cache's copy of the service account // so remove the secret from a freshly retrieved copy of the service account - serviceAccounts := e.client.Cluster(saClusterName).CoreV1().ServiceAccounts(saNamespace) + serviceAccounts := e.client.Cluster(saClusterName.Path()).CoreV1().ServiceAccounts(saNamespace) serviceAccount, err := serviceAccounts.Get(context.TODO(), saName, metav1.GetOptions{}) // Ignore NotFound errors when attempting to remove a reference if apierrors.IsNotFound(err) { @@ -651,7 +651,7 @@ func (e *TokensController) getServiceAccount(clusterName logicalcluster.Name, ns } // Live lookup - sa, err = e.client.Cluster(clusterName).CoreV1().ServiceAccounts(ns).Get(context.TODO(), name, metav1.GetOptions{}) + sa, err = e.client.Cluster(clusterName.Path()).CoreV1().ServiceAccounts(ns).Get(context.TODO(), name, metav1.GetOptions{}) if apierrors.IsNotFound(err) { return nil, nil } @@ -687,7 +687,7 @@ func (e *TokensController) getSecret(clusterName logicalcluster.Name, ns string, } // Live lookup - secret, err := e.client.Cluster(clusterName).CoreV1().Secrets(ns).Get(context.TODO(), name, metav1.GetOptions{}) + secret, err := e.client.Cluster(clusterName.Path()).CoreV1().Secrets(ns).Get(context.TODO(), name, metav1.GetOptions{}) if apierrors.IsNotFound(err) { return nil, nil } diff --git a/pkg/genericcontrolplane/apis/apis.go b/pkg/genericcontrolplane/apis/apis.go index 5abc296d40dac..8fe980aa4b34b 100644 --- a/pkg/genericcontrolplane/apis/apis.go +++ b/pkg/genericcontrolplane/apis/apis.go @@ -24,7 +24,7 @@ import ( kcpkubernetesinformers "github.com/kcp-dev/client-go/informers" kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" apiserverinternalv1alpha1 "k8s.io/api/apiserverinternal/v1alpha1" authenticationv1 "k8s.io/api/authentication/v1" @@ -191,7 +191,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget) return nil, err } - rootCluster := logicalcluster.New("root") + rootCluster := logicalcluster.NewName("root") // Have to create this outside the post-start hook to ensure the informer is started correctly rootConfigMapsInformer := c.ExtraConfig.VersionedInformers.Core().V1().ConfigMaps().Cluster(rootCluster) @@ -204,7 +204,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget) return err } - controller := clusterauthenticationtrust.NewClusterAuthenticationTrustController(m.ClusterAuthenticationInfo, kubeClient.Cluster(rootCluster), rootConfigMapsInformer) + controller := clusterauthenticationtrust.NewClusterAuthenticationTrustController(m.ClusterAuthenticationInfo, kubeClient.Cluster(rootCluster.Path()), rootConfigMapsInformer) // generate a context from stopCh. This is to avoid modifying files which are relying on apiserver // TODO: See if we can pass ctx to the current method @@ -251,7 +251,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget) } controller := lease.NewController( clock.RealClock{}, - kubeClient.Cluster(rootCluster), + kubeClient.Cluster(rootCluster.Path()), m.GenericAPIServer.APIServerID, int32(c.ExtraConfig.IdentityLeaseDurationSeconds), nil, @@ -267,7 +267,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget) return err } go apiserverleasegc.NewAPIServerLeaseGC( - kubeClient.Cluster(rootCluster), + kubeClient.Cluster(rootCluster.Path()), time.Duration(c.ExtraConfig.IdentityLeaseDurationSeconds)*time.Second, metav1.NamespaceSystem, KubeAPIServerIdentityLeaseLabelSelector, diff --git a/pkg/genericcontrolplane/clientutils/multiclusterconfig.go b/pkg/genericcontrolplane/clientutils/multiclusterconfig.go index 0880a1c10f984..7a650b1a54bad 100644 --- a/pkg/genericcontrolplane/clientutils/multiclusterconfig.go +++ b/pkg/genericcontrolplane/clientutils/multiclusterconfig.go @@ -26,7 +26,7 @@ import ( "net/http" "strings" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/pkg/genericcontrolplane/server.go b/pkg/genericcontrolplane/server.go index 1c139fd6deb7f..8ad3b9e63e21c 100644 --- a/pkg/genericcontrolplane/server.go +++ b/pkg/genericcontrolplane/server.go @@ -25,9 +25,9 @@ import ( "net/url" "time" - kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" kcpkubernetesinformers "github.com/kcp-dev/client-go/informers" - "github.com/kcp-dev/logicalcluster/v2" + kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" + "github.com/kcp-dev/logicalcluster/v3" extensionsapiserver "k8s.io/apiextensions-apiserver/pkg/apiserver" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/admission" diff --git a/pkg/registry/rbac/rest/storage_rbac.go b/pkg/registry/rbac/rest/storage_rbac.go index b6c6f37acea2f..98f8866369f61 100644 --- a/pkg/registry/rbac/rest/storage_rbac.go +++ b/pkg/registry/rbac/rest/storage_rbac.go @@ -22,7 +22,7 @@ import ( "time" kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacapiv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/serviceaccount/claims.go b/pkg/serviceaccount/claims.go index a079221ed29af..5d43cf74860c8 100644 --- a/pkg/serviceaccount/claims.go +++ b/pkg/serviceaccount/claims.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "gopkg.in/square/go-jose.v2/jwt" "k8s.io/apiserver/pkg/audit" "k8s.io/klog/v2" diff --git a/pkg/serviceaccount/jwt.go b/pkg/serviceaccount/jwt.go index 555d7ea7efa9b..271228b6627df 100644 --- a/pkg/serviceaccount/jwt.go +++ b/pkg/serviceaccount/jwt.go @@ -28,7 +28,7 @@ import ( "fmt" "strings" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2/jwt" v1 "k8s.io/api/core/v1" diff --git a/pkg/serviceaccount/legacy.go b/pkg/serviceaccount/legacy.go index b648700a09e21..5498f4fe2180a 100644 --- a/pkg/serviceaccount/legacy.go +++ b/pkg/serviceaccount/legacy.go @@ -22,7 +22,7 @@ import ( "errors" "fmt" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "gopkg.in/square/go-jose.v2/jwt" "k8s.io/klog/v2" diff --git a/plugin/pkg/admission/security/podsecuritypolicy/admission.go b/plugin/pkg/admission/security/podsecuritypolicy/admission.go index 38eda71facb18..913c302f8d494 100644 --- a/plugin/pkg/admission/security/podsecuritypolicy/admission.go +++ b/plugin/pkg/admission/security/podsecuritypolicy/admission.go @@ -23,8 +23,8 @@ import ( "sort" "strings" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/klog/v2" - "github.com/kcp-dev/logicalcluster/v2" policyv1beta1 "k8s.io/api/policy/v1beta1" apiequality "k8s.io/apimachinery/pkg/api/equality" @@ -106,9 +106,9 @@ func (p *Plugin) SetExternalKubeInformerFactory(f informers.SharedInformerFactor // Admit determines if the pod should be admitted based on the requested security context // and the available PSPs. // -// 1. Find available PSPs. -// 2. Create the providers, includes setting pre-allocated values if necessary. -// 3. Try to generate and validate a PSP with providers. If we find one then admit the pod +// 1. Find available PSPs. +// 2. Create the providers, includes setting pre-allocated values if necessary. +// 3. Try to generate and validate a PSP with providers. If we find one then admit the pod // with the validated PSP. If we don't find any reject the pod and give all errors from the // failed attempts. func (p *Plugin) Admit(ctx context.Context, a admission.Attributes, o admission.ObjectInterfaces) error { diff --git a/staging/src/k8s.io/api/go.mod b/staging/src/k8s.io/api/go.mod index 1ae16e07ae39b..1b377ece1febf 100644 --- a/staging/src/k8s.io/api/go.mod +++ b/staging/src/k8s.io/api/go.mod @@ -19,7 +19,6 @@ replace ( google.golang.org/protobuf => google.golang.org/protobuf v1.27.1 k8s.io/api => ../api k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go k8s.io/klog/v2 => k8s.io/klog/v2 v2.60.1 k8s.io/utils => k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 diff --git a/staging/src/k8s.io/api/go.sum b/staging/src/k8s.io/api/go.sum index c996b2f9b98aa..d70379a03c557 100644 --- a/staging/src/k8s.io/api/go.sum +++ b/staging/src/k8s.io/api/go.sum @@ -1,422 +1,79 @@ -bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= -bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod h1:Ulb78X89vxKYgdL24HMTiXYHlyHEvruOj1ZPlqeNEZM= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Azure/azure-sdk-for-go v55.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= -github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= -github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= -github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= -github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/GoogleCloudPlatform/k8s-cloud-provider v1.16.1-0.20210702024009-ea6160c1d0e3/go.mod h1:8XasY4ymP2V/tn2OOV9ZadmiTE1FIB/h3W+yNlPttKw= -github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA= -github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= -github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= -github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/hcsshim v0.8.22/go.mod h1:91uVCVzvX2QD16sMCenoxxXo6L1wJnLMX2PSufFMtF0= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/auth0/go-jwt-middleware v1.0.1/go.mod h1:YSeUX3z6+TF2H+7padiEqNJ73Zy9vXW72U//IgN0BIM= -github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= -github.com/aws/aws-sdk-go v1.38.49/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= -github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= -github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= -github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= -github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/container-storage-interface/spec v1.5.0/go.mod h1:8K96oQNkJ7pFcC2R9Z1ynGGBB1I93kcS6PGg3SsOk8s= -github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= -github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= -github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= -github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.4.9/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.12/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= -github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= -github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= -github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= -github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= -github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4= -github.com/coredns/corefile-migration v1.0.14/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= -github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= -github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= -github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= -github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cadvisor v0.44.1/go.mod h1:GQ9KQfz0iNHQk3D6ftzJWK4TXabfIgM10Oy3FkR+Gzg= -github.com/google/cel-go v0.10.1/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= -github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= -github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/heketi/heketi v10.3.0+incompatible/go.mod h1:bB9ly3RchcQqsQ9CpyaQwvva7RS5ytVoSoholZQON6o= -github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod h1:xGMAM8JLi7UkZt1i4FQeQy0R2T8GLUwQhOP5M1gBhy4= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5/go.mod h1:DM4VvS+hD/kDi1U1QsX2fnZowwBhqD0Dk3bRPKF/Oc8= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= -github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= -github.com/kcp-dev/apimachinery v0.0.0-20221019133255-9e1e13940519/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6/go.mod h1:Qmq1OxUOSdVQ8YIGnjbya5Xt04KMJ5fN41QvErl/XnI= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc= -github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= -github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= -github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA= -github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY= -github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/moby/ipvs v1.0.1/go.mod h1:2pngiyseZbIKXNv7hsKj3O9UEz30c53MT9005gt2hxQ= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= -github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= -github.com/moby/sys/mountinfo v0.6.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= -github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= -github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/mvdan/xurls v1.1.0/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= @@ -424,467 +81,79 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runc v1.1.1/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/quobyte/api v0.1.8/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI= -github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= -github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/assertions v1.1.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= -github.com/storageos/go-api v2.2.0+incompatible/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= -github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= -go.etcd.io/etcd/client/v3 v3.5.1/go.mod h1:OnjH4M8OnAotwaB2l9bVgZzRFKru7/ZMoS46OtKyd3Q= -go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= -go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= -go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= -go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= -go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= -go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= -go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20210220032938-85be41e4509f/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4= -golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= -gonum.org/v1/gonum v0.6.2/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= -gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= -gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.46.0/go.mod h1:ceL4oozhkAiTID8XMmJBsIxID/9wMXJVVFXPg4ylg3I= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201102152239-715cce707fb0/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210429181445-86c259c2b4ab/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= @@ -893,41 +162,16 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= -gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/system-validators v1.7.0/go.mod h1:gP1Ky+R9wtrSiFbrpEPwWMeYz9yqyy1S/KOh0Vci7WI= 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= -modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= -modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= -modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= -modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= -modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= -sigs.k8s.io/kustomize/api v0.11.4/go.mod h1:k+8RsqYbgpkIrJ4p9jcdPqe8DprLxFUUO0yNOq8C+xI= -sigs.k8s.io/kustomize/cmd/config v0.10.6/go.mod h1:/S4A4nUANUa4bZJ/Edt7ZQTyKOY9WCER0uBS1SW2Rco= -sigs.k8s.io/kustomize/kustomize/v4 v4.5.4/go.mod h1:Zo/Xc5FKD6sHl0lilbrieeGeZHVYCA4BzxeAaLI05Bg= -sigs.k8s.io/kustomize/kyaml v0.13.6/go.mod h1:yHP031rn1QX1lr/Xd934Ri/xdVNG8BE2ECa78Ht/kEg= sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.mod b/staging/src/k8s.io/apiextensions-apiserver/go.mod index 43668c2244bd0..d4c6b3f47eb35 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/go.mod +++ b/staging/src/k8s.io/apiextensions-apiserver/go.mod @@ -2,7 +2,7 @@ module k8s.io/apiextensions-apiserver -go 1.18 +go 1.16 require ( github.com/emicklei/go-restful v2.9.5+incompatible @@ -12,9 +12,10 @@ require ( github.com/google/go-cmp v0.5.8 github.com/google/gofuzz v1.1.0 github.com/google/uuid v1.1.2 - github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be - github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 + github.com/kcp-dev/apimachinery v0.0.0-20221205120156-b90e084cbd56 + github.com/kcp-dev/client-go v0.0.0-20221205150201-dfa4fc4b06bb github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 + github.com/kcp-dev/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/spf13/cobra v1.4.0 github.com/spf13/pflag v1.0.5 @@ -42,6 +43,10 @@ require ( replace ( github.com/go-logr/logr => github.com/go-logr/logr v1.2.0 github.com/google/go-cmp => github.com/google/go-cmp v0.5.5 + + github.com/kcp-dev/apimachinery => github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 + github.com/kcp-dev/client-go => github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb + github.com/kcp-dev/logicalcluster/v3 => github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 github.com/stretchr/testify => github.com/stretchr/testify v1.7.0 golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.sum b/staging/src/k8s.io/apiextensions-apiserver/go.sum index 96a51ec5dbd96..4f1ba318ce217 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/go.sum +++ b/staging/src/k8s.io/apiextensions-apiserver/go.sum @@ -301,11 +301,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/apimachinery v0.0.0-20221019133255-9e1e13940519/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be h1:2uDzJ896+ojtzgr9HJL8+tZEoqhq8blwymGinWFrQ6E= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 h1:Dxst7pq601Y7zNhSAec7LoBySHFWvD+djLTqoTmHrL0= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6/go.mod h1:Qmq1OxUOSdVQ8YIGnjbya5Xt04KMJ5fN41QvErl/XnI= github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -373,6 +368,12 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 h1:XxRBHVw8nfR2hS4PrwpfLmGTFHW4fpRmK2o6wtLY5k0= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56/go.mod h1:XEv+UQlH7NT41TOZYRK+LRo2URcwYjP8GQqOqtBk0RI= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb h1:hxhAOWnBMTkLdxIJbvKh0jUKkZp51t7/+bbdxYhb67g= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb/go.mod h1:kLMJgfd5gpWZv2y42vrn1W7WgeFpBlDV3vcJCqx4qxk= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 h1:zS7dh4JYSew1wAimDQjOQLndo/65hwXzeZHnt0Kl5IM= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= diff --git a/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh b/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh index 28b2dfdbfa784..ba01e7f3f6a23 100755 --- a/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh +++ b/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh @@ -42,9 +42,10 @@ bash "${CODEGEN_PKG}/generate-internal-groups.sh" deepcopy,conversion \ --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \ --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt" -GO111MODULE=on GOBIN="${OUTPUT_DIR}" "${HACK_PKG}/go-install.sh" github.com/kcp-dev/code-generator code-generator 2dc1248118a7f2337c6374ff5778c0880e1a4226 +#GO111MODULE=on GOBIN="${OUTPUT_DIR}" "${HACK_PKG}/go-install.sh" github.com/kcp-dev/code-generator code-generator 2dc1248118a7f2337c6374ff5778c0880e1a4226 pushd "${SCRIPT_ROOT}" -GO111MODULE=on "${OUTPUT_DIR}/code-generator" \ +CODE_GENERATOR=/Users/lszaszki/go/src/github.com/kcp-dev/code-generator/bin +GO111MODULE=on "${CODE_GENERATOR}/code-generator" \ "client:standalone=true,outputPackagePath=k8s.io/apiextensions-apiserver/pkg/client/kcp,name=clientset,apiPackagePath=k8s.io/apiextensions-apiserver/pkg/apis,singleClusterClientPackagePath=k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset,headerFile=${HACK_PKG}/boilerplate.go.txt" \ "lister:apiPackagePath=k8s.io/apiextensions-apiserver/pkg/apis,singleClusterListerPackagePath=k8s.io/apiextensions-apiserver/pkg/client/listers,headerFile=${HACK_PKG}/boilerplate.go.txt" \ "informer:standalone=true,outputPackagePath=k8s.io/apiextensions-apiserver/pkg/client/kcp,apiPackagePath=k8s.io/apiextensions-apiserver/pkg/apis,singleClusterClientPackagePath=k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset,singleClusterListerPackagePath=k8s.io/apiextensions-apiserver/pkg/client/listers,singleClusterInformerPackagePath=k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions,headerFile=${HACK_PKG}/boilerplate.go.txt" \ diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery.go index 49b2064e7a430..d564eb3ace553 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery.go @@ -22,7 +22,8 @@ import ( "sort" "strings" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" + autoscaling "k8s.io/api/autoscaling/v1" apiextensionshelpers "k8s.io/apiextensions-apiserver/pkg/apihelpers" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go index 751d1ee40775c..dd28f4d45046e 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go @@ -27,12 +27,13 @@ import ( "sync/atomic" "time" + "github.com/kcp-dev/logicalcluster/v3" + kcpapiextensionsv1informers "k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/apiextensions/v1" kcpapiextensionsv1listers "k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1" utilnet "k8s.io/apimachinery/pkg/util/net" "sigs.k8s.io/structured-merge-diff/v4/fieldpath" - "github.com/kcp-dev/logicalcluster/v2" apiextensionshelpers "k8s.io/apiextensions-apiserver/pkg/apihelpers" apiextensionsinternal "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/kcp_rest_options_getter.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/kcp_rest_options_getter.go index af9a5fdbb0e92..814b481e88ec1 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/kcp_rest_options_getter.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/kcp_rest_options_getter.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/register.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/register.go index 9aba8e85e166d..7f9da840e1808 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/register.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/register.go @@ -39,14 +39,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/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/register.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/register.go index 144c20666d243..25fca99178b42 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/register.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme/register.go @@ -39,14 +39,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/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/clientset.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/clientset.go index 6eb9d33140eb5..40f48e901c6fb 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/clientset.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/clientset.go @@ -27,7 +27,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" @@ -40,7 +40,7 @@ import ( ) type ClusterInterface interface { - Cluster(logicalcluster.Name) client.Interface + Cluster(logicalcluster.Path) client.Interface Discovery() discovery.DiscoveryInterface ApiextensionsV1() apiextensionsv1.ApiextensionsV1ClusterInterface ApiextensionsV1beta1() apiextensionsv1beta1.ApiextensionsV1beta1ClusterInterface @@ -73,11 +73,11 @@ func (c *ClusterClientset) ApiextensionsV1beta1() apiextensionsv1beta1.Apiextens return c.apiextensionsV1beta1 } // Cluster scopes this clientset to one cluster. -func (c *ClusterClientset) Cluster(name logicalcluster.Name) client.Interface { - if name == logicalcluster.Wildcard { +func (c *ClusterClientset) Cluster(path logicalcluster.Path) client.Interface { + if path == logicalcluster.Wildcard { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } // NewForConfig creates a new ClusterClientset for the given config. diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/fake/clientset.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/fake/clientset.go index 3be74fa54878c..f2836a9e53b64 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/fake/clientset.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/fake/clientset.go @@ -25,7 +25,7 @@ package fake import ( kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing" kcpfakediscovery "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/discovery/fake" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/discovery" @@ -87,7 +87,7 @@ func (c *ClusterClientset) ApiextensionsV1beta1() kcpapiextensionsv1beta1.Apiext return &fakeapiextensionsv1beta1.ApiextensionsV1beta1ClusterClient{Fake: c.Fake} } // Cluster scopes this clientset to one cluster. -func (c *ClusterClientset) Cluster(cluster logicalcluster.Name) client.Interface { +func (c *ClusterClientset) Cluster(cluster logicalcluster.Path) client.Interface { if cluster == logicalcluster.Wildcard { panic("A specific cluster must be provided when scoping, not the wildcard.") } @@ -106,7 +106,7 @@ type Clientset struct { *kcptesting.Fake discovery *kcpfakediscovery.FakeDiscovery tracker kcptesting.ScopedObjectTracker - cluster logicalcluster.Name + cluster logicalcluster.Path } // Discovery retrieves the DiscoveryClient diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/apiextensions_client.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/apiextensions_client.go index 8146b9f7d4789..1ddf076c85105 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/apiextensions_client.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/apiextensions_client.go @@ -26,7 +26,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/client-go/rest" @@ -39,18 +39,18 @@ type ApiextensionsV1ClusterInterface interface { } type ApiextensionsV1ClusterScoper interface { - Cluster(logicalcluster.Name) apiextensionsv1.ApiextensionsV1Interface + Cluster(logicalcluster.Path) apiextensionsv1.ApiextensionsV1Interface } type ApiextensionsV1ClusterClient struct { clientCache kcpclient.Cache[*apiextensionsv1.ApiextensionsV1Client] } -func (c *ApiextensionsV1ClusterClient) Cluster(name logicalcluster.Name) apiextensionsv1.ApiextensionsV1Interface { - if name == logicalcluster.Wildcard { +func (c *ApiextensionsV1ClusterClient) Cluster(path logicalcluster.Path) apiextensionsv1.ApiextensionsV1Interface { + if path == logicalcluster.Wildcard { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/customresourcedefinition.go index 5565a3330dac9..5ef5d969d637d 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/customresourcedefinition.go @@ -24,7 +24,7 @@ package v1 import ( kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" @@ -43,7 +43,7 @@ type CustomResourceDefinitionsClusterGetter interface { // CustomResourceDefinitionClusterInterface can operate on CustomResourceDefinitions across all clusters, // or scope down to one cluster and return a apiextensionsv1client.CustomResourceDefinitionInterface. type CustomResourceDefinitionClusterInterface interface { - Cluster(logicalcluster.Name) apiextensionsv1client.CustomResourceDefinitionInterface + Cluster(logicalcluster.Path) apiextensionsv1client.CustomResourceDefinitionInterface List(ctx context.Context, opts metav1.ListOptions) (*apiextensionsv1.CustomResourceDefinitionList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -53,12 +53,12 @@ type customResourceDefinitionsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *customResourceDefinitionsClusterInterface) Cluster(name logicalcluster.Name) apiextensionsv1client.CustomResourceDefinitionInterface { - if name == logicalcluster.Wildcard { +func (c *customResourceDefinitionsClusterInterface) Cluster(path logicalcluster.Path) apiextensionsv1client.CustomResourceDefinitionInterface { + if path == logicalcluster.Wildcard { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).CustomResourceDefinitions() + return c.clientCache.ClusterOrDie(path).CustomResourceDefinitions() } diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/fake/apiextensions_client.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/fake/apiextensions_client.go index 37cf5e8d0fac1..7409a9cc04e88 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/fake/apiextensions_client.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/fake/apiextensions_client.go @@ -24,7 +24,7 @@ package v1 import ( kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/client-go/rest" kcpapiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1" @@ -37,7 +37,7 @@ type ApiextensionsV1ClusterClient struct { *kcptesting.Fake } -func (c *ApiextensionsV1ClusterClient) Cluster(cluster logicalcluster.Name) apiextensionsv1.ApiextensionsV1Interface { +func (c *ApiextensionsV1ClusterClient) Cluster(cluster logicalcluster.Path) apiextensionsv1.ApiextensionsV1Interface { if cluster == logicalcluster.Wildcard { panic("A specific cluster must be provided when scoping, not the wildcard.") } @@ -52,7 +52,7 @@ var _ apiextensionsv1.ApiextensionsV1Interface = (*ApiextensionsV1Client)(nil) type ApiextensionsV1Client struct { *kcptesting.Fake - Cluster logicalcluster.Name + Cluster logicalcluster.Path } func (c *ApiextensionsV1Client) RESTClient() rest.Interface { diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/fake/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/fake/customresourcedefinition.go index debe01518cc5c..4404ee378e182 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/fake/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1/fake/customresourcedefinition.go @@ -23,7 +23,7 @@ limitations under the License. package v1 import ( - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing" "k8s.io/apimachinery/pkg/runtime/schema" @@ -49,7 +49,7 @@ type customResourceDefinitionsClusterClient struct { } // Cluster scopes the client down to a particular cluster. -func (c *customResourceDefinitionsClusterClient) Cluster(cluster logicalcluster.Name) apiextensionsv1client.CustomResourceDefinitionInterface { +func (c *customResourceDefinitionsClusterClient) Cluster(cluster logicalcluster.Path) apiextensionsv1client.CustomResourceDefinitionInterface { if cluster == logicalcluster.Wildcard { panic("A specific cluster must be provided when scoping, not the wildcard.") } @@ -84,7 +84,7 @@ func (c *customResourceDefinitionsClusterClient) Watch(ctx context.Context, opts } type customResourceDefinitionsClient struct { *kcptesting.Fake - Cluster logicalcluster.Name + Cluster logicalcluster.Path } diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/apiextensions_client.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/apiextensions_client.go index 66a497377ef70..d5de5bbd2183c 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/apiextensions_client.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/apiextensions_client.go @@ -26,7 +26,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/client-go/rest" @@ -39,18 +39,18 @@ type ApiextensionsV1beta1ClusterInterface interface { } type ApiextensionsV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) apiextensionsv1beta1.ApiextensionsV1beta1Interface + Cluster(logicalcluster.Path) apiextensionsv1beta1.ApiextensionsV1beta1Interface } type ApiextensionsV1beta1ClusterClient struct { clientCache kcpclient.Cache[*apiextensionsv1beta1.ApiextensionsV1beta1Client] } -func (c *ApiextensionsV1beta1ClusterClient) Cluster(name logicalcluster.Name) apiextensionsv1beta1.ApiextensionsV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *ApiextensionsV1beta1ClusterClient) Cluster(path logicalcluster.Path) apiextensionsv1beta1.ApiextensionsV1beta1Interface { + if path == logicalcluster.Wildcard { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/customresourcedefinition.go index 1b288b7ce3bbc..4c9c486edfccf 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/customresourcedefinition.go @@ -24,7 +24,7 @@ package v1beta1 import ( kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" @@ -43,7 +43,7 @@ type CustomResourceDefinitionsClusterGetter interface { // CustomResourceDefinitionClusterInterface can operate on CustomResourceDefinitions across all clusters, // or scope down to one cluster and return a apiextensionsv1beta1client.CustomResourceDefinitionInterface. type CustomResourceDefinitionClusterInterface interface { - Cluster(logicalcluster.Name) apiextensionsv1beta1client.CustomResourceDefinitionInterface + Cluster(logicalcluster.Path) apiextensionsv1beta1client.CustomResourceDefinitionInterface List(ctx context.Context, opts metav1.ListOptions) (*apiextensionsv1beta1.CustomResourceDefinitionList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -53,12 +53,12 @@ type customResourceDefinitionsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *customResourceDefinitionsClusterInterface) Cluster(name logicalcluster.Name) apiextensionsv1beta1client.CustomResourceDefinitionInterface { - if name == logicalcluster.Wildcard { +func (c *customResourceDefinitionsClusterInterface) Cluster(path logicalcluster.Path) apiextensionsv1beta1client.CustomResourceDefinitionInterface { + if path == logicalcluster.Wildcard { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).CustomResourceDefinitions() + return c.clientCache.ClusterOrDie(path).CustomResourceDefinitions() } diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/fake/apiextensions_client.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/fake/apiextensions_client.go index 6c55bf04bdf20..9dcd4ca91871f 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/fake/apiextensions_client.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/fake/apiextensions_client.go @@ -24,7 +24,7 @@ package v1beta1 import ( kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/client-go/rest" kcpapiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1" @@ -37,7 +37,7 @@ type ApiextensionsV1beta1ClusterClient struct { *kcptesting.Fake } -func (c *ApiextensionsV1beta1ClusterClient) Cluster(cluster logicalcluster.Name) apiextensionsv1beta1.ApiextensionsV1beta1Interface { +func (c *ApiextensionsV1beta1ClusterClient) Cluster(cluster logicalcluster.Path) apiextensionsv1beta1.ApiextensionsV1beta1Interface { if cluster == logicalcluster.Wildcard { panic("A specific cluster must be provided when scoping, not the wildcard.") } @@ -52,7 +52,7 @@ var _ apiextensionsv1beta1.ApiextensionsV1beta1Interface = (*ApiextensionsV1beta type ApiextensionsV1beta1Client struct { *kcptesting.Fake - Cluster logicalcluster.Name + Cluster logicalcluster.Path } func (c *ApiextensionsV1beta1Client) RESTClient() rest.Interface { diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/fake/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/fake/customresourcedefinition.go index d2cd5d0d4e60e..e1bcc2f77964b 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/fake/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1beta1/fake/customresourcedefinition.go @@ -23,7 +23,7 @@ limitations under the License. package v1beta1 import ( - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing" "k8s.io/apimachinery/pkg/runtime/schema" @@ -49,7 +49,7 @@ type customResourceDefinitionsClusterClient struct { } // Cluster scopes the client down to a particular cluster. -func (c *customResourceDefinitionsClusterClient) Cluster(cluster logicalcluster.Name) apiextensionsv1beta1client.CustomResourceDefinitionInterface { +func (c *customResourceDefinitionsClusterClient) Cluster(cluster logicalcluster.Path) apiextensionsv1beta1client.CustomResourceDefinitionInterface { if cluster == logicalcluster.Wildcard { panic("A specific cluster must be provided when scoping, not the wildcard.") } @@ -84,7 +84,7 @@ func (c *customResourceDefinitionsClusterClient) Watch(ctx context.Context, opts } type customResourceDefinitionsClient struct { *kcptesting.Fake - Cluster logicalcluster.Name + Cluster logicalcluster.Path } diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/apiextensions/v1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/apiextensions/v1/customresourcedefinition.go index 139a3a2faf887..0ab2f7c3c90b0 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/apiextensions/v1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/apiextensions/v1/customresourcedefinition.go @@ -33,7 +33,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsv1listers "k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go index bdd762cbdbd60..3723c2fd5ab7f 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go @@ -33,7 +33,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apiextensionsv1beta1listers "k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1beta1" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/factory.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/factory.go index cfa9edb1e57e2..6a9f4b8ca7aeb 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/factory.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/factory.go @@ -28,7 +28,7 @@ import ( "time" kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/generic.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/generic.go index 86897aaddb24f..b5749dc8997f7 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/generic.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/generic.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/tools/cache" kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" upstreaminformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1/customresourcedefinition.go index d0117f8cadfa8..b1d7821c35485 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1/customresourcedefinition.go @@ -24,7 +24,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/client-go/tools/cache" "k8s.io/apimachinery/pkg/labels" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1beta1/customresourcedefinition.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1beta1/customresourcedefinition.go index 81a72f801377b..9e7a4b88704b6 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1beta1/customresourcedefinition.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1beta1/customresourcedefinition.go @@ -24,7 +24,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/client-go/tools/cache" "k8s.io/apimachinery/pkg/labels" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/apiapproval/apiapproval_controller.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/apiapproval/apiapproval_controller.go index a4eec698c275a..d8b75aeeae377 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/apiapproval/apiapproval_controller.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/apiapproval/apiapproval_controller.go @@ -163,7 +163,7 @@ func (c *KubernetesAPIApprovalPolicyConformantConditionController) sync(key stri crd := inCustomResourceDefinition.DeepCopy() apihelpers.SetCRDCondition(crd, *cond) - _, err = c.crdClient.CustomResourceDefinitions().Cluster(clusterName).UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{}) + _, err = c.crdClient.CustomResourceDefinitions().Cluster(clusterName.Path()).UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{}) if apierrors.IsNotFound(err) || apierrors.IsConflict(err) { // deleted or changed in the meantime, we'll get called again return nil diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/establish/establishing_controller.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/establish/establishing_controller.go index ff18354df3dc6..62801985a034c 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/establish/establishing_controller.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/establish/establishing_controller.go @@ -21,8 +21,9 @@ import ( "fmt" "time" + "github.com/kcp-dev/logicalcluster/v3" + kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" kcpapiextensionsv1client "k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1" kcpapiextensionsv1informers "k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/apiextensions/v1" kcpapiextensionsv1listers "k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1" @@ -145,7 +146,7 @@ func (ec *EstablishingController) sync(key string) error { apiextensionshelpers.SetCRDCondition(crd, establishedCondition) // Update server with new CRD condition. - _, err = ec.crdClient.CustomResourceDefinitions().Cluster(clusterName).UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{}) + _, err = ec.crdClient.CustomResourceDefinitions().Cluster(clusterName.Path()).UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{}) if apierrors.IsNotFound(err) || apierrors.IsConflict(err) { // deleted or changed in the meantime, we'll get called again return nil diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/crd_finalizer.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/crd_finalizer.go index ccc047d36801e..81e91a092f08a 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/crd_finalizer.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/finalizer/crd_finalizer.go @@ -22,8 +22,9 @@ import ( "reflect" "time" + "github.com/kcp-dev/logicalcluster/v3" + kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" kcpapiextensionsv1client "k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1" kcpapiextensionsv1informers "k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/apiextensions/v1" kcpapiextensionsv1listers "k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1" @@ -132,7 +133,7 @@ func (c *CRDFinalizer) sync(key string) error { Reason: "InstanceDeletionInProgress", Message: "CustomResource deletion is in progress", }) - crd, err = c.crdClient.CustomResourceDefinitions().Cluster(clusterName).UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{}) + crd, err = c.crdClient.CustomResourceDefinitions().Cluster(clusterName.Path()).UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{}) if apierrors.IsNotFound(err) || apierrors.IsConflict(err) { // deleted or changed in the meantime, we'll get called again return nil @@ -155,7 +156,7 @@ func (c *CRDFinalizer) sync(key string) error { cond, deleteErr := c.deleteInstances(crd) apiextensionshelpers.SetCRDCondition(crd, cond) if deleteErr != nil { - if _, err = c.crdClient.CustomResourceDefinitions().Cluster(clusterName).UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{}); err != nil { + if _, err = c.crdClient.CustomResourceDefinitions().Cluster(clusterName.Path()).UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{}); err != nil { utilruntime.HandleError(err) } return deleteErr @@ -170,7 +171,7 @@ func (c *CRDFinalizer) sync(key string) error { } apiextensionshelpers.CRDRemoveFinalizer(crd, apiextensionsv1.CustomResourceCleanupFinalizer) - _, err = c.crdClient.CustomResourceDefinitions().Cluster(clusterName).UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{}) + _, err = c.crdClient.CustomResourceDefinitions().Cluster(clusterName.Path()).UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{}) if apierrors.IsNotFound(err) || apierrors.IsConflict(err) { // deleted or changed in the meantime, we'll get called again return nil diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/nonstructuralschema/nonstructuralschema_controller.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/nonstructuralschema/nonstructuralschema_controller.go index 75057ec0da9c8..99de30fd80ea5 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/nonstructuralschema/nonstructuralschema_controller.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/nonstructuralschema/nonstructuralschema_controller.go @@ -169,7 +169,7 @@ func (c *ConditionController) sync(key string) error { apiextensionshelpers.SetCRDCondition(crd, *cond) } - _, err = c.crdClient.CustomResourceDefinitions().Cluster(clusterName).UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{}) + _, err = c.crdClient.CustomResourceDefinitions().Cluster(clusterName.Path()).UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{}) if apierrors.IsNotFound(err) || apierrors.IsConflict(err) { // deleted or changed in the meantime, we'll get called again return nil diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/controller.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/controller.go index d90e98fe17a77..01854fe6911a7 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/controller.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/controller.go @@ -22,8 +22,9 @@ import ( "sync" "time" + "github.com/kcp-dev/logicalcluster/v3" + kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" kcpapiextensionsv1informers "k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/apiextensions/v1" kcpapiextensionsv1listers "k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/naming_controller.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/naming_controller.go index 47e34cca04d17..5407b7f519349 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/naming_controller.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/status/naming_controller.go @@ -23,9 +23,10 @@ import ( "strings" "time" + "github.com/kcp-dev/logicalcluster/v3" + kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpthirdpartycache "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/tools/cache" - "github.com/kcp-dev/logicalcluster/v2" kcpapiextensionsv1client "k8s.io/apiextensions-apiserver/pkg/client/kcp/clientset/versioned/typed/apiextensions/v1" kcpapiextensionsv1informers "k8s.io/apiextensions-apiserver/pkg/client/kcp/informers/externalversions/apiextensions/v1" kcpapiextensionsv1listers "k8s.io/apiextensions-apiserver/pkg/client/kcp/listers/apiextensions/v1" @@ -284,7 +285,7 @@ func (c *NamingConditionController) sync(key string) error { apiextensionshelpers.SetCRDCondition(crd, namingCondition) apiextensionshelpers.SetCRDCondition(crd, establishedCondition) - updatedObj, err := c.crdClient.CustomResourceDefinitions().Cluster(clusterName).UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{}) + updatedObj, err := c.crdClient.CustomResourceDefinitions().Cluster(clusterName.Path()).UpdateStatus(context.TODO(), crd, metav1.UpdateOptions{}) if apierrors.IsNotFound(err) || apierrors.IsConflict(err) { // deleted or changed in the meantime, we'll get called again return nil diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/kcp/cluster_aware_crd_lister.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/kcp/cluster_aware_crd_lister.go index b4e74f57872c9..170b6b588393f 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/kcp/cluster_aware_crd_lister.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/kcp/cluster_aware_crd_lister.go @@ -19,7 +19,8 @@ package kcp import ( "context" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" + "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/labels" ) diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod index f9293dbcf4284..48e2306acbdc6 100644 --- a/staging/src/k8s.io/apiserver/go.mod +++ b/staging/src/k8s.io/apiserver/go.mod @@ -19,9 +19,9 @@ require ( github.com/google/gofuzz v1.1.0 github.com/google/uuid v1.1.2 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 - github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be - github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 - github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 + github.com/kcp-dev/apimachinery v0.0.0-20221205120156-b90e084cbd56 + github.com/kcp-dev/client-go v0.0.0-20221205150201-dfa4fc4b06bb + github.com/kcp-dev/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 // indirect github.com/sirupsen/logrus v1.8.1 // indirect @@ -62,6 +62,10 @@ require ( replace ( github.com/go-logr/logr => github.com/go-logr/logr v1.2.0 github.com/google/go-cmp => github.com/google/go-cmp v0.5.5 + + github.com/kcp-dev/apimachinery => github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 + github.com/kcp-dev/client-go => github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb + github.com/kcp-dev/logicalcluster/v3 => github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 github.com/stretchr/testify => github.com/stretchr/testify v1.7.0 golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 diff --git a/staging/src/k8s.io/apiserver/go.sum b/staging/src/k8s.io/apiserver/go.sum index b31339e827e73..20552bec27b82 100644 --- a/staging/src/k8s.io/apiserver/go.sum +++ b/staging/src/k8s.io/apiserver/go.sum @@ -295,12 +295,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/apimachinery v0.0.0-20221019133255-9e1e13940519/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be h1:2uDzJ896+ojtzgr9HJL8+tZEoqhq8blwymGinWFrQ6E= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 h1:Dxst7pq601Y7zNhSAec7LoBySHFWvD+djLTqoTmHrL0= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6/go.mod h1:Qmq1OxUOSdVQ8YIGnjbya5Xt04KMJ5fN41QvErl/XnI= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= @@ -365,6 +359,12 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 h1:XxRBHVw8nfR2hS4PrwpfLmGTFHW4fpRmK2o6wtLY5k0= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56/go.mod h1:XEv+UQlH7NT41TOZYRK+LRo2URcwYjP8GQqOqtBk0RI= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb h1:hxhAOWnBMTkLdxIJbvKh0jUKkZp51t7/+bbdxYhb67g= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb/go.mod h1:kLMJgfd5gpWZv2y42vrn1W7WgeFpBlDV3vcJCqx4qxk= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 h1:zS7dh4JYSew1wAimDQjOQLndo/65hwXzeZHnt0Kl5IM= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= diff --git a/staging/src/k8s.io/apiserver/pkg/admission/attributes.go b/staging/src/k8s.io/apiserver/pkg/admission/attributes.go index 00843f40f66f6..cca038d97c738 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/attributes.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/attributes.go @@ -21,7 +21,7 @@ import ( "strings" "sync" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/validation" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/interfaces.go b/staging/src/k8s.io/apiserver/pkg/admission/interfaces.go index cbdcd5be88bb9..be735f075b884 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/interfaces.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/interfaces.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" auditinternal "k8s.io/apiserver/pkg/apis/audit" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go index a639b0e0a54b3..d35c2088c1be6 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go @@ -23,8 +23,8 @@ import ( "time" kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" kcpkubernetesinformers "github.com/kcp-dev/client-go/informers" + kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" kcpcorev1listers "github.com/kcp-dev/client-go/listers/core/v1" "k8s.io/klog/v2" @@ -160,7 +160,7 @@ func (l *Lifecycle) Admit(ctx context.Context, a admission.Attributes, o admissi // refuse to operate on non-existent namespaces if !exists || forceLiveLookup { // as a last resort, make a call directly to storage - namespace, err = l.client.Cluster(clusterName).CoreV1().Namespaces().Get(ctx, a.GetNamespace(), metav1.GetOptions{}) + namespace, err = l.client.Cluster(clusterName.Path()).CoreV1().Namespaces().Get(ctx, a.GetNamespace(), metav1.GetOptions{}) switch { case errors.IsNotFound(err): return err diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/namespace/matcher.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/namespace/matcher.go index 08e168db8eee4..1cf2ceae48ca0 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/namespace/matcher.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/namespace/matcher.go @@ -77,7 +77,7 @@ func (m *Matcher) GetNamespaceLabels(attr admission.Attributes) (map[string]stri } if apierrors.IsNotFound(err) { // in case of latency in our caches, make a call direct to storage to verify that it truly exists or not - namespace, err = m.Client.Cluster(attr.GetCluster()).CoreV1().Namespaces().Get(context.TODO(), namespaceName, metav1.GetOptions{}) + namespace, err = m.Client.Cluster(attr.GetCluster().Path()).CoreV1().Namespaces().Get(context.TODO(), namespaceName, metav1.GetOptions{}) if err != nil { return nil, err } diff --git a/staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount/util.go b/staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount/util.go index 4bf148bf267b7..21510290fb817 100644 --- a/staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount/util.go +++ b/staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount/util.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/discovery/storageversionhash.go b/staging/src/k8s.io/apiserver/pkg/endpoints/discovery/storageversionhash.go index 1fcd5c5cd932b..eedef8515918f 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/discovery/storageversionhash.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/discovery/storageversionhash.go @@ -20,7 +20,7 @@ import ( "crypto/sha256" "encoding/base64" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" ) // StorageVersionHash calculates the storage version hash for a diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go b/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go index 7d459288adedf..abe4c602b45ee 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/installer.go @@ -26,7 +26,7 @@ import ( "unicode" "github.com/emicklei/go-restful" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime" @@ -405,7 +405,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag if err != nil { return nil, nil, err } - apiResource.StorageVersionHash = discovery.StorageVersionHash(logicalcluster.New(""), gvk.Group, gvk.Version, gvk.Kind) + apiResource.StorageVersionHash = discovery.StorageVersionHash(logicalcluster.NewName(""), gvk.Group, gvk.Version, gvk.Kind) } // Get the list of actions for the given scope. diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/request/context_cluster.go b/staging/src/k8s.io/apiserver/pkg/endpoints/request/context_cluster.go index b44d5690972ef..dcfdc684d62ec 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/request/context_cluster.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/request/context_cluster.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" ) type clusterKey int @@ -32,7 +32,7 @@ const ( ) type Cluster struct { - // Name is the name of the cluster. + // Name holds a cluster name. Name logicalcluster.Name // HACK: only for testing wildcard semantics @@ -76,21 +76,20 @@ func ValidClusterFrom(ctx context.Context) (*Cluster, error) { return nil, buildClusterError("no cluster in the request context", ctx) } if cluster.Name.Empty() && !cluster.Wildcard { - return nil, buildClusterError("cluster name is empty in the request context", ctx) + return nil, buildClusterError("cluster path is empty in the request context", ctx) } return cluster, nil } -// ClusterNameFrom returns the cluster name from the value of the cluster -// key on the ctx. -// If the cluster name is empty, then return an error. +// ClusterNameFrom returns a cluster.Name from the value of the cluster key on the ctx. +// If the cluster name is not present or cannot be constructed, then return an error. func ClusterNameFrom(ctx context.Context) (logicalcluster.Name, error) { cluster, err := ValidClusterFrom(ctx) if err != nil { - return logicalcluster.Name{}, err + return "", err } if cluster.Name.Empty() { - return logicalcluster.Name{}, buildClusterError("cluster name is empty in the request context", ctx) + return "", buildClusterError("cluster name is empty in the request context", ctx) } return cluster.Name, nil } diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go index aea90d215623a..35165b7e1f68a 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go @@ -929,13 +929,13 @@ func markAsDeleting(obj runtime.Object, now time.Time) (err error) { // grace period seconds (graceful deletion) and updating the list of // finalizers (finalization); it returns: // -// 1. an error -// 2. a boolean indicating that the object was not found, but it should be -// ignored -// 3. a boolean indicating that the object's grace period is exhausted and it -// should be deleted immediately -// 4. a new output object with the state that was updated -// 5. a copy of the last existing state of the object +// 1. an error +// 2. a boolean indicating that the object was not found, but it should be +// ignored +// 3. a boolean indicating that the object's grace period is exhausted and it +// should be deleted immediately +// 4. a new output object with the state that was updated +// 5. a copy of the last existing state of the object func (e *Store) updateForGracefulDeletionAndFinalizers(ctx context.Context, name, key string, options *metav1.DeleteOptions, preconditions storage.Preconditions, deleteValidation rest.ValidateObjectFunc, in runtime.Object) (err error, ignoreNotFound, deleteImmediately bool, out, lastExisting runtime.Object) { lastGraceful := int64(0) var pendingFinalizers bool diff --git a/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go b/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go index 005f558eac736..ff02123547c2c 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/rest/resttest/resttest.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -880,8 +880,8 @@ func (t *Tester) testDeleteNonExist(obj runtime.Object, opts metav1.DeleteOption } -// This test the fast-fail path. We test that the precondition gets verified -// again before deleting the object in tests of pkg/storage/etcd. +// This test the fast-fail path. We test that the precondition gets verified +// again before deleting the object in tests of pkg/storage/etcd. func (t *Tester) testDeleteWithUID(obj runtime.Object, createFn CreateFunc, getFn GetFunc, isNotFoundFn IsErrorFunc, opts metav1.DeleteOptions) { ctx := t.TestContext() @@ -917,8 +917,8 @@ func (t *Tester) testDeleteWithUID(obj runtime.Object, createFn CreateFunc, getF } } -// This test the fast-fail path. We test that the precondition gets verified -// again before deleting the object in tests of pkg/storage/etcd. +// This test the fast-fail path. We test that the precondition gets verified +// again before deleting the object in tests of pkg/storage/etcd. func (t *Tester) testDeleteWithResourceVersion(obj runtime.Object, createFn CreateFunc, getFn GetFunc, isNotFoundFn IsErrorFunc, opts metav1.DeleteOptions) { ctx := t.TestContext() diff --git a/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go b/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go index 62a6092cf0e8e..bfe3497c35682 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go +++ b/staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go @@ -26,7 +26,7 @@ import ( systemd "github.com/coreos/go-systemd/v22/daemon" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/staging/src/k8s.io/apiserver/pkg/server/handler.go b/staging/src/k8s.io/apiserver/pkg/server/handler.go index 6980583f2a950..7500012a00a32 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/handler.go +++ b/staging/src/k8s.io/apiserver/pkg/server/handler.go @@ -25,8 +25,8 @@ import ( "strings" "github.com/emicklei/go-restful" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/klog/v2" - "github.com/kcp-dev/logicalcluster/v2" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" @@ -111,7 +111,7 @@ func (a *APIServerHandler) ListedPaths(clusterName logicalcluster.Name) []string handledPaths = append(handledPaths, ws.RootPath()) } - for _, path := range a.NonGoRestfulMux.ListedPaths(logicalcluster.New("")) { + for _, path := range a.NonGoRestfulMux.ListedPaths(logicalcluster.NewName("")) { if a.PathValidForCluster == nil || a.PathValidForCluster(path, clusterName) { handledPaths = append(handledPaths, path) } @@ -162,7 +162,7 @@ func (d director) ServeHTTP(w http.ResponseWriter, req *http.Request) { d.nonGoRestfulMux.ServeHTTP(w, req) } -//TODO: Unify with RecoverPanics? +// TODO: Unify with RecoverPanics? func logStackOnRecover(s runtime.NegotiatedSerializer, panicReason interface{}, w http.ResponseWriter) { var buffer bytes.Buffer buffer.WriteString(fmt.Sprintf("recover from panic situation: - %v\r\n", panicReason)) diff --git a/staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder.go b/staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder.go index 8bd2272b939fe..a8304286bf9a0 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder.go +++ b/staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder.go @@ -27,7 +27,7 @@ import ( "k8s.io/klog/v2" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder_test.go b/staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder_test.go index 938047bd7c87d..53e7d62c8ed57 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder_test.go @@ -21,7 +21,7 @@ import ( "net/http/httptest" "testing" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "github.com/stretchr/testify/assert" ) diff --git a/staging/src/k8s.io/apiserver/pkg/server/routes/index.go b/staging/src/k8s.io/apiserver/pkg/server/routes/index.go index 2baed24de64ad..5d22ed0126503 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/routes/index.go +++ b/staging/src/k8s.io/apiserver/pkg/server/routes/index.go @@ -19,7 +19,7 @@ package routes import ( "net/http" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" diff --git a/staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go b/staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go index 5f61b1e0d28e4..6b6eef8af78bb 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go +++ b/staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go @@ -20,8 +20,8 @@ import ( "net/http" restful "github.com/emicklei/go-restful" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/klog/v2" - "github.com/kcp-dev/logicalcluster/v2" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/server/mux" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go index 82c1f25ea59aa..a51804998724d 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_patch.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_patch.go index dc521547fb9be..648ffc2a6f39c 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_patch.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_patch.go @@ -3,7 +3,7 @@ package cacher import ( "context" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_patch_test.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_patch_test.go index dadb813474236..c21240ff8f9a1 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_patch_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher/watch_cache_patch_test.go @@ -19,7 +19,7 @@ package cacher import ( "testing" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go index e43e3ec22cff3..fd644666c84e0 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" clientv3 "go.etcd.io/etcd/client/v3" "k8s.io/apiserver/pkg/kcp" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_patch.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_patch.go index 8b00668114939..a8c087f4db04f 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_patch.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_patch.go @@ -19,7 +19,7 @@ package etcd3 import ( "strings" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2" @@ -45,7 +45,7 @@ func adjustClusterNameIfWildcard(shard genericapirequest.Shard, cluster *generic klog.Warningf("shard=%s cluster=%s invalid key=%s had %d parts, not %d", shard, cluster, keyWithoutPrefix, len(parts), minLen) return logicalcluster.Name{} } - return logicalcluster.New(parts[i]) + return logicalcluster.NewName(parts[i]) } switch { diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_patch_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_patch_test.go index 9f338b3f90588..46ba04b2b0f7f 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_patch_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_patch_test.go @@ -19,7 +19,7 @@ package etcd3 import ( "testing" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" ) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go index fb00f54258017..34eb597f963a7 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go @@ -34,7 +34,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" clientv3 "go.etcd.io/etcd/client/v3" "google.golang.org/grpc/grpclog" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go index 50281c9b65ec4..b32c98d45c0bc 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "go.etcd.io/etcd/api/v3/mvccpb" clientv3 "go.etcd.io/etcd/client/v3" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" diff --git a/staging/src/k8s.io/cli-runtime/go.sum b/staging/src/k8s.io/cli-runtime/go.sum index 24e6c4d606dea..2f091a27051cb 100644 --- a/staging/src/k8s.io/cli-runtime/go.sum +++ b/staging/src/k8s.io/cli-runtime/go.sum @@ -218,8 +218,6 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= diff --git a/staging/src/k8s.io/client-go/go.mod b/staging/src/k8s.io/client-go/go.mod index bb254bb985820..aec48394e4249 100644 --- a/staging/src/k8s.io/client-go/go.mod +++ b/staging/src/k8s.io/client-go/go.mod @@ -5,46 +5,53 @@ module k8s.io/client-go go 1.16 require ( - cloud.google.com/go v0.81.0 // indirect github.com/Azure/go-autorest/autorest v0.11.18 github.com/Azure/go-autorest/autorest/adal v0.9.13 github.com/davecgh/go-spew v1.1.1 - github.com/emicklei/go-restful v2.9.5+incompatible // indirect github.com/evanphx/json-patch v4.12.0+incompatible - github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect - github.com/go-openapi/jsonreference v0.19.5 // indirect - github.com/go-openapi/swag v0.19.14 // indirect github.com/gogo/protobuf v1.3.2 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da github.com/golang/protobuf v1.5.2 - github.com/google/btree v1.0.1 // indirect github.com/google/gnostic v0.5.7-v3refs - github.com/google/go-cmp v0.5.5 + github.com/google/go-cmp v0.5.8 github.com/google/gofuzz v1.1.0 github.com/google/uuid v1.1.2 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 github.com/imdario/mergo v0.3.5 - github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.7.0 - golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect - golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd + github.com/stretchr/testify v1.7.1 + golang.org/x/net v0.0.0-20220722155237-a158d28d115b golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 - google.golang.org/protobuf v1.27.1 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/klog/v2 v2.60.1 + google.golang.org/protobuf v1.28.0 + k8s.io/api v0.24.3 + k8s.io/apimachinery v0.24.3 + k8s.io/klog/v2 v2.70.1 k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 - k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 - sigs.k8s.io/structured-merge-diff/v4 v4.2.1 - sigs.k8s.io/yaml v1.2.0 + k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 + sigs.k8s.io/yaml v1.3.0 ) replace ( + github.com/go-logr/logr => github.com/go-logr/logr v1.2.0 + github.com/google/go-cmp => github.com/google/go-cmp v0.5.5 + + github.com/kcp-dev/apimachinery => github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 + github.com/kcp-dev/client-go => github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb + github.com/kcp-dev/logicalcluster/v3 => github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 + github.com/stretchr/testify => github.com/stretchr/testify v1.7.0 + golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd + golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 + google.golang.org/protobuf => google.golang.org/protobuf v1.27.1 k8s.io/api => ../api k8s.io/apimachinery => ../apimachinery k8s.io/client-go => ../client-go + k8s.io/klog/v2 => k8s.io/klog/v2 v2.60.1 + k8s.io/utils => k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 + sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 + sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.2.1 + sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0 ) diff --git a/staging/src/k8s.io/client-go/go.sum b/staging/src/k8s.io/client-go/go.sum index 8c1598ddf2b21..6cac63f81d5e9 100644 --- a/staging/src/k8s.io/client-go/go.sum +++ b/staging/src/k8s.io/client-go/go.sum @@ -1,3 +1,5 @@ +bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= +bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod h1:Ulb78X89vxKYgdL24HMTiXYHlyHEvruOj1ZPlqeNEZM= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -27,6 +29,7 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -37,6 +40,9 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/Azure/azure-sdk-for-go v55.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.11.18 h1:90Y4srNYrwOtAgVo3ndrQkTYn6kf1Eg/AjTFJ8Is2aM= @@ -47,33 +53,122 @@ github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8K github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= github.com/Azure/go-autorest/autorest/mocks v0.4.1 h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= +github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/GoogleCloudPlatform/k8s-cloud-provider v1.16.1-0.20210702024009-ea6160c1d0e3/go.mod h1:8XasY4ymP2V/tn2OOV9ZadmiTE1FIB/h3W+yNlPttKw= +github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA= +github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= +github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= +github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/hcsshim v0.8.22/go.mod h1:91uVCVzvX2QD16sMCenoxxXo6L1wJnLMX2PSufFMtF0= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/auth0/go-jwt-middleware v1.0.1/go.mod h1:YSeUX3z6+TF2H+7padiEqNJ73Zy9vXW72U//IgN0BIM= +github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= +github.com/aws/aws-sdk-go v1.38.49/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= +github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= +github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= +github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= +github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= +github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= +github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= +github.com/container-storage-interface/spec v1.5.0/go.mod h1:8K96oQNkJ7pFcC2R9Z1ynGGBB1I93kcS6PGg3SsOk8s= +github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= +github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= +github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= +github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= +github.com/containerd/containerd v1.4.9/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.4.12/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= +github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= +github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= +github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= +github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= +github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4= +github.com/coredns/corefile-migration v1.0.14/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= +github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= @@ -84,24 +179,43 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= +github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= +github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible h1:7ZaBxOI7TMoYBfyA3cQHErNNyAWIKUMIwqxEtgHOs5c= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= +github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= @@ -111,9 +225,21 @@ github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -127,16 +253,13 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= @@ -145,22 +268,16 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +github.com/google/cadvisor v0.44.1/go.mod h1:GQ9KQfz0iNHQk3D6ftzJWK4TXabfIgM10Oy3FkR+Gzg= +github.com/google/cel-go v0.10.1/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= +github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA= github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -181,57 +298,152 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= +github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/heketi/heketi v10.3.0+incompatible/go.mod h1:bB9ly3RchcQqsQ9CpyaQwvva7RS5ytVoSoholZQON6o= +github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod h1:xGMAM8JLi7UkZt1i4FQeQy0R2T8GLUwQhOP5M1gBhy4= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5/go.mod h1:DM4VvS+hD/kDi1U1QsX2fnZowwBhqD0Dk3bRPKF/Oc8= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= +github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= +github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc= +github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= +github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= +github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY= +github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/moby/ipvs v1.0.1/go.mod h1:2pngiyseZbIKXNv7hsKj3O9UEz30c53MT9005gt2hxQ= github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= +github.com/moby/sys/mountinfo v0.6.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= +github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mvdan/xurls v1.1.0/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= @@ -241,30 +453,141 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= +github.com/opencontainers/runc v1.1.1/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= +github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56/go.mod h1:XEv+UQlH7NT41TOZYRK+LRo2URcwYjP8GQqOqtBk0RI= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb/go.mod h1:kLMJgfd5gpWZv2y42vrn1W7WgeFpBlDV3vcJCqx4qxk= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/quobyte/api v0.1.8/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI= +github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= +github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v1.1.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= +github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= +github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= +github.com/storageos/go-api v2.2.0+incompatible/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= +github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= +github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= +github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= +go.etcd.io/etcd/client/v3 v3.5.1/go.mod h1:OnjH4M8OnAotwaB2l9bVgZzRFKru7/ZMoS46OtKyd3Q= +go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= +go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= +go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -272,17 +595,47 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= +go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= +go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= +go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= +go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= +go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= +go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= +go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= +go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= @@ -290,6 +643,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20210220032938-85be41e4509f/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4= +golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -303,55 +658,22 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -365,6 +687,9 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -378,51 +703,6 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -441,23 +721,32 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -465,6 +754,7 @@ golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -492,12 +782,21 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= +gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= +gonum.org/v1/gonum v0.6.2/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= +gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= +gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= +gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -519,6 +818,8 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= +google.golang.org/api v0.46.0/go.mod h1:ceL4oozhkAiTID8XMmJBsIxID/9wMXJVVFXPg4ylg3I= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -540,6 +841,7 @@ google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvx google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -548,8 +850,10 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= @@ -558,6 +862,7 @@ google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201102152239-715cce707fb0/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -567,8 +872,13 @@ google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210429181445-86c259c2b4ab/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -580,25 +890,18 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -606,13 +909,23 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8X gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= @@ -621,6 +934,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= +gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -628,22 +943,33 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/system-validators v1.7.0/go.mod h1:gP1Ky+R9wtrSiFbrpEPwWMeYz9yqyy1S/KOh0Vci7WI= 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= +modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= +modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= +modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= +modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= +modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= -sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/kustomize/api v0.11.4/go.mod h1:k+8RsqYbgpkIrJ4p9jcdPqe8DprLxFUUO0yNOq8C+xI= +sigs.k8s.io/kustomize/cmd/config v0.10.6/go.mod h1:/S4A4nUANUa4bZJ/Edt7ZQTyKOY9WCER0uBS1SW2Rco= +sigs.k8s.io/kustomize/kustomize/v4 v4.5.4/go.mod h1:Zo/Xc5FKD6sHl0lilbrieeGeZHVYCA4BzxeAaLI05Bg= +sigs.k8s.io/kustomize/kyaml v0.13.6/go.mod h1:yHP031rn1QX1lr/Xd934Ri/xdVNG8BE2ECa78Ht/kEg= sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= diff --git a/staging/src/k8s.io/cloud-provider/go.mod b/staging/src/k8s.io/cloud-provider/go.mod index c16399703fd7b..0f63633435191 100644 --- a/staging/src/k8s.io/cloud-provider/go.mod +++ b/staging/src/k8s.io/cloud-provider/go.mod @@ -23,6 +23,10 @@ require ( replace ( github.com/go-logr/logr => github.com/go-logr/logr v1.2.0 github.com/google/go-cmp => github.com/google/go-cmp v0.5.5 + + github.com/kcp-dev/apimachinery => github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 + github.com/kcp-dev/client-go => github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb + github.com/kcp-dev/logicalcluster/v3 => github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 github.com/stretchr/testify => github.com/stretchr/testify v1.7.0 golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 diff --git a/staging/src/k8s.io/cloud-provider/go.sum b/staging/src/k8s.io/cloud-provider/go.sum index 9a5a15dba0ca9..152d4a49ce07b 100644 --- a/staging/src/k8s.io/cloud-provider/go.sum +++ b/staging/src/k8s.io/cloud-provider/go.sum @@ -291,12 +291,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/apimachinery v0.0.0-20221019133255-9e1e13940519/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be h1:2uDzJ896+ojtzgr9HJL8+tZEoqhq8blwymGinWFrQ6E= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 h1:Dxst7pq601Y7zNhSAec7LoBySHFWvD+djLTqoTmHrL0= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6/go.mod h1:Qmq1OxUOSdVQ8YIGnjbya5Xt04KMJ5fN41QvErl/XnI= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= @@ -362,6 +356,12 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 h1:XxRBHVw8nfR2hS4PrwpfLmGTFHW4fpRmK2o6wtLY5k0= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56/go.mod h1:XEv+UQlH7NT41TOZYRK+LRo2URcwYjP8GQqOqtBk0RI= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb h1:hxhAOWnBMTkLdxIJbvKh0jUKkZp51t7/+bbdxYhb67g= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb/go.mod h1:kLMJgfd5gpWZv2y42vrn1W7WgeFpBlDV3vcJCqx4qxk= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 h1:zS7dh4JYSew1wAimDQjOQLndo/65hwXzeZHnt0Kl5IM= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= diff --git a/staging/src/k8s.io/code-generator/examples/go.mod b/staging/src/k8s.io/code-generator/examples/go.mod index 080c4bab3e74d..f03559a1fdcd9 100644 --- a/staging/src/k8s.io/code-generator/examples/go.mod +++ b/staging/src/k8s.io/code-generator/examples/go.mod @@ -5,8 +5,8 @@ module k8s.io/code-generator/examples go 1.16 require ( - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 + k8s.io/api v0.24.3 + k8s.io/apimachinery v0.24.3 k8s.io/client-go v0.0.0 k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 ) diff --git a/staging/src/k8s.io/code-generator/examples/go.sum b/staging/src/k8s.io/code-generator/examples/go.sum index 32aaa6a2b469b..eaf955478aa0b 100644 --- a/staging/src/k8s.io/code-generator/examples/go.sum +++ b/staging/src/k8s.io/code-generator/examples/go.sum @@ -13,11 +13,6 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -58,27 +53,21 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 h1:H2pdYOb3KQ1/YsqVWoWNLQO+fusocsw354rqGTZtAgw= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= -github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -89,17 +78,16 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM= -github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= +github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= -github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -114,7 +102,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -128,14 +115,11 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -145,17 +129,14 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -163,10 +144,6 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -179,10 +156,7 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= -github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= @@ -199,9 +173,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/liggitt/json v0.0.0-20211020163728-48258682683b h1:BO7msS16+MiMykkD4MInZIgqnBYCPE7vtaUSe/omoqE= github.com/liggitt/json v0.0.0-20211020163728-48258682683b/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= -github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -210,9 +183,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d h1:7PxY7LVfSZm7PEeBTyK1rj1gABdCO2mbri6GKO1cMDs= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= -github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -242,9 +214,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -255,15 +226,12 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -286,7 +254,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -295,8 +262,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -328,27 +293,14 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -360,7 +312,6 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -392,23 +343,14 @@ golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= -golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -417,9 +359,6 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -469,13 +408,7 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -498,19 +431,13 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -540,17 +467,7 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -563,12 +480,6 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -581,8 +492,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -615,18 +526,19 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= -k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= +k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/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= +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= 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= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= -sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= +sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/staging/src/k8s.io/code-generator/go.mod b/staging/src/k8s.io/code-generator/go.mod index b4a5f51241be9..7588c655e7b62 100644 --- a/staging/src/k8s.io/code-generator/go.mod +++ b/staging/src/k8s.io/code-generator/go.mod @@ -6,23 +6,38 @@ go 1.16 require ( github.com/emicklei/go-restful v2.9.5+incompatible // indirect + github.com/go-logr/logr v1.2.3 // indirect github.com/go-openapi/jsonreference v0.19.5 // indirect github.com/go-openapi/swag v0.19.14 // indirect github.com/gogo/protobuf v1.3.2 github.com/google/gnostic v0.5.7-v3refs + github.com/google/go-cmp v0.5.8 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/onsi/ginkgo v1.14.0 // indirect github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.7.0 // indirect - golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect - golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect + github.com/stretchr/testify v1.7.1 // indirect + golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect + golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 - google.golang.org/protobuf v1.27.1 // indirect + google.golang.org/protobuf v1.28.0 // indirect gopkg.in/yaml.v2 v2.4.0 k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 - k8s.io/klog/v2 v2.60.1 + k8s.io/klog/v2 v2.70.1 k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 - sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect ) -replace k8s.io/code-generator => ../code-generator +replace ( + github.com/go-logr/logr => github.com/go-logr/logr v1.2.0 + github.com/google/go-cmp => github.com/google/go-cmp v0.5.5 + github.com/stretchr/testify => github.com/stretchr/testify v1.7.0 + golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd + golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 + google.golang.org/protobuf => google.golang.org/protobuf v1.27.1 + k8s.io/code-generator => ../code-generator + k8s.io/klog/v2 => k8s.io/klog/v2 v2.60.1 + k8s.io/utils => k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 + sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.2.1 + sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0 +) diff --git a/staging/src/k8s.io/code-generator/go.sum b/staging/src/k8s.io/code-generator/go.sum index ce4cf9c24d5fc..82afafa21b328 100644 --- a/staging/src/k8s.io/code-generator/go.sum +++ b/staging/src/k8s.io/code-generator/go.sum @@ -23,8 +23,6 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= @@ -42,11 +40,6 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= @@ -54,10 +47,6 @@ github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -112,18 +101,13 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -134,20 +118,6 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -157,23 +127,6 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -181,7 +134,6 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -205,22 +157,10 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -231,7 +171,6 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -247,14 +186,11 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= diff --git a/staging/src/k8s.io/component-base/go.sum b/staging/src/k8s.io/component-base/go.sum index 2e07b1269f62a..6cf800089eaba 100644 --- a/staging/src/k8s.io/component-base/go.sum +++ b/staging/src/k8s.io/component-base/go.sum @@ -205,8 +205,6 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= diff --git a/staging/src/k8s.io/component-helpers/go.sum b/staging/src/k8s.io/component-helpers/go.sum index 5d687db890837..95363360e8ebe 100644 --- a/staging/src/k8s.io/component-helpers/go.sum +++ b/staging/src/k8s.io/component-helpers/go.sum @@ -152,8 +152,6 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= diff --git a/staging/src/k8s.io/controller-manager/go.mod b/staging/src/k8s.io/controller-manager/go.mod index 434b67c08426c..977dda40cb291 100644 --- a/staging/src/k8s.io/controller-manager/go.mod +++ b/staging/src/k8s.io/controller-manager/go.mod @@ -20,6 +20,10 @@ require ( replace ( github.com/go-logr/logr => github.com/go-logr/logr v1.2.0 github.com/google/go-cmp => github.com/google/go-cmp v0.5.5 + + github.com/kcp-dev/apimachinery => github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 + github.com/kcp-dev/client-go => github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb + github.com/kcp-dev/logicalcluster/v3 => github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 github.com/stretchr/testify => github.com/stretchr/testify v1.7.0 golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 diff --git a/staging/src/k8s.io/controller-manager/go.sum b/staging/src/k8s.io/controller-manager/go.sum index 989e28d9085ae..8afce8aa2362b 100644 --- a/staging/src/k8s.io/controller-manager/go.sum +++ b/staging/src/k8s.io/controller-manager/go.sum @@ -288,12 +288,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/apimachinery v0.0.0-20221019133255-9e1e13940519/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be h1:2uDzJ896+ojtzgr9HJL8+tZEoqhq8blwymGinWFrQ6E= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 h1:Dxst7pq601Y7zNhSAec7LoBySHFWvD+djLTqoTmHrL0= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6/go.mod h1:Qmq1OxUOSdVQ8YIGnjbya5Xt04KMJ5fN41QvErl/XnI= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= @@ -359,6 +353,12 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 h1:XxRBHVw8nfR2hS4PrwpfLmGTFHW4fpRmK2o6wtLY5k0= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56/go.mod h1:XEv+UQlH7NT41TOZYRK+LRo2URcwYjP8GQqOqtBk0RI= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb h1:hxhAOWnBMTkLdxIJbvKh0jUKkZp51t7/+bbdxYhb67g= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb/go.mod h1:kLMJgfd5gpWZv2y42vrn1W7WgeFpBlDV3vcJCqx4qxk= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 h1:zS7dh4JYSew1wAimDQjOQLndo/65hwXzeZHnt0Kl5IM= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= diff --git a/staging/src/k8s.io/kube-aggregator/go.mod b/staging/src/k8s.io/kube-aggregator/go.mod index 63bbe032dbed3..255c1ca5e4779 100644 --- a/staging/src/k8s.io/kube-aggregator/go.mod +++ b/staging/src/k8s.io/kube-aggregator/go.mod @@ -8,7 +8,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/emicklei/go-restful v2.9.5+incompatible github.com/gogo/protobuf v1.3.2 - github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 + github.com/kcp-dev/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 github.com/spf13/cobra v1.4.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.1 @@ -28,6 +28,10 @@ require ( replace ( github.com/go-logr/logr => github.com/go-logr/logr v1.2.0 github.com/google/go-cmp => github.com/google/go-cmp v0.5.5 + + github.com/kcp-dev/apimachinery => github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 + github.com/kcp-dev/client-go => github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb + github.com/kcp-dev/logicalcluster/v3 => github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 github.com/stretchr/testify => github.com/stretchr/testify v1.7.0 golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 diff --git a/staging/src/k8s.io/kube-aggregator/go.sum b/staging/src/k8s.io/kube-aggregator/go.sum index 55f7dffa45866..02b23e980de8a 100644 --- a/staging/src/k8s.io/kube-aggregator/go.sum +++ b/staging/src/k8s.io/kube-aggregator/go.sum @@ -289,12 +289,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/apimachinery v0.0.0-20221019133255-9e1e13940519/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be h1:2uDzJ896+ojtzgr9HJL8+tZEoqhq8blwymGinWFrQ6E= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 h1:Dxst7pq601Y7zNhSAec7LoBySHFWvD+djLTqoTmHrL0= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6/go.mod h1:Qmq1OxUOSdVQ8YIGnjbya5Xt04KMJ5fN41QvErl/XnI= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= @@ -360,6 +354,12 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 h1:XxRBHVw8nfR2hS4PrwpfLmGTFHW4fpRmK2o6wtLY5k0= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56/go.mod h1:XEv+UQlH7NT41TOZYRK+LRo2URcwYjP8GQqOqtBk0RI= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb h1:hxhAOWnBMTkLdxIJbvKh0jUKkZp51t7/+bbdxYhb67g= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb/go.mod h1:kLMJgfd5gpWZv2y42vrn1W7WgeFpBlDV3vcJCqx4qxk= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 h1:zS7dh4JYSew1wAimDQjOQLndo/65hwXzeZHnt0Kl5IM= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go index 85aca7f4e8d56..d92ded3815b73 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go @@ -22,7 +22,6 @@ import ( "fmt" "net/http" - logicalcluster "github.com/kcp-dev/logicalcluster/v2" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" @@ -30,33 +29,6 @@ import ( apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1" ) -type ClusterInterface interface { - Cluster(name logicalcluster.Name) Interface -} - -type Cluster struct { - *scopedClientset -} - -// Cluster sets the cluster for a Clientset. -func (c *Cluster) Cluster(name logicalcluster.Name) Interface { - return &Clientset{ - scopedClientset: c.scopedClientset, - cluster: name, - } -} - -// NewClusterForConfig creates a new Cluster for the given config. -// If config's RateLimiter is not set and QPS and Burst are acceptable, -// NewClusterForConfig will generate a rate-limiter in configShallowCopy. -func NewClusterForConfig(c *rest.Config) (*Cluster, error) { - cs, err := NewForConfig(c) - if err != nil { - return nil, err - } - return &Cluster{scopedClientset: cs.scopedClientset}, nil -} - type Interface interface { Discovery() discovery.DiscoveryInterface ApiregistrationV1beta1() apiregistrationv1beta1.ApiregistrationV1beta1Interface @@ -66,13 +38,6 @@ type Interface interface { // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { - *scopedClientset - cluster logicalcluster.Name -} - -// scopedClientset contains the clients for groups. Each group has exactly one -// version included in a Clientset. -type scopedClientset struct { *discovery.DiscoveryClient apiregistrationV1beta1 *apiregistrationv1beta1.ApiregistrationV1beta1Client apiregistrationV1 *apiregistrationv1.ApiregistrationV1Client @@ -80,12 +45,12 @@ type scopedClientset struct { // ApiregistrationV1beta1 retrieves the ApiregistrationV1beta1Client func (c *Clientset) ApiregistrationV1beta1() apiregistrationv1beta1.ApiregistrationV1beta1Interface { - return apiregistrationv1beta1.NewWithCluster(c.apiregistrationV1beta1.RESTClient(), c.cluster) + return c.apiregistrationV1beta1 } // ApiregistrationV1 retrieves the ApiregistrationV1Client func (c *Clientset) ApiregistrationV1() apiregistrationv1.ApiregistrationV1Interface { - return apiregistrationv1.NewWithCluster(c.apiregistrationV1.RESTClient(), c.cluster) + return c.apiregistrationV1 } // Discovery retrieves the DiscoveryClient @@ -93,7 +58,7 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { if c == nil { return nil } - return c.DiscoveryClient.WithCluster(c.cluster) + return c.DiscoveryClient } // NewForConfig creates a new Clientset for the given config. @@ -130,7 +95,7 @@ func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*Clientset, configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) } - var cs scopedClientset + var cs Clientset var err error cs.apiregistrationV1beta1, err = apiregistrationv1beta1.NewForConfigAndClient(&configShallowCopy, httpClient) if err != nil { @@ -145,7 +110,7 @@ func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*Clientset, if err != nil { return nil, err } - return &Clientset{scopedClientset: &cs}, nil + return &cs, nil } // NewForConfigOrDie creates a new Clientset for the given config and @@ -160,10 +125,10 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { - var cs scopedClientset + var cs Clientset cs.apiregistrationV1beta1 = apiregistrationv1beta1.New(c) cs.apiregistrationV1 = apiregistrationv1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) - return &Clientset{scopedClientset: &cs} + return &cs } diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/register.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/register.go index 0bdc5ab507627..18428eac8ac7e 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/register.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/register.go @@ -39,14 +39,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/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/register.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/register.go index 904397937f86a..cb21939117f2f 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/register.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/register.go @@ -39,14 +39,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/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1/apiregistration_client.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1/apiregistration_client.go index 5d9c95716be97..f6dc74aa93571 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1/apiregistration_client.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1/apiregistration_client.go @@ -21,7 +21,6 @@ package v1 import ( "net/http" - logicalcluster "github.com/kcp-dev/logicalcluster/v2" rest "k8s.io/client-go/rest" v1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" @@ -35,7 +34,6 @@ type ApiregistrationV1Interface interface { // ApiregistrationV1Client is used to interact with features provided by the apiregistration.k8s.io group. type ApiregistrationV1Client struct { restClient rest.Interface - cluster logicalcluster.Name } func (c *ApiregistrationV1Client) APIServices() APIServiceInterface { @@ -68,7 +66,7 @@ func NewForConfigAndClient(c *rest.Config, h *http.Client) (*ApiregistrationV1Cl if err != nil { return nil, err } - return &ApiregistrationV1Client{restClient: client}, nil + return &ApiregistrationV1Client{client}, nil } // NewForConfigOrDie creates a new ApiregistrationV1Client for the given config and @@ -83,12 +81,7 @@ func NewForConfigOrDie(c *rest.Config) *ApiregistrationV1Client { // New creates a new ApiregistrationV1Client for the given RESTClient. func New(c rest.Interface) *ApiregistrationV1Client { - return &ApiregistrationV1Client{restClient: c} -} - -// NewWithCluster creates a new ApiregistrationV1Client for the given RESTClient and cluster. -func NewWithCluster(c rest.Interface, cluster logicalcluster.Name) *ApiregistrationV1Client { - return &ApiregistrationV1Client{restClient: c, cluster: cluster} + return &ApiregistrationV1Client{c} } func setConfigDefaults(config *rest.Config) error { diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1/apiservice.go index ec5c6aaddf666..25bf6ea44b9ac 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1/apiservice.go @@ -22,7 +22,6 @@ import ( "context" "time" - logicalcluster "github.com/kcp-dev/logicalcluster/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" @@ -53,15 +52,13 @@ type APIServiceInterface interface { // aPIServices implements APIServiceInterface type aPIServices struct { - client rest.Interface - cluster logicalcluster.Name + client rest.Interface } // newAPIServices returns a APIServices func newAPIServices(c *ApiregistrationV1Client) *aPIServices { return &aPIServices{ - client: c.RESTClient(), - cluster: c.cluster, + client: c.RESTClient(), } } @@ -69,7 +66,6 @@ func newAPIServices(c *ApiregistrationV1Client) *aPIServices { func (c *aPIServices) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.APIService, err error) { result = &v1.APIService{} err = c.client.Get(). - Cluster(c.cluster). Resource("apiservices"). Name(name). VersionedParams(&options, scheme.ParameterCodec). @@ -86,7 +82,6 @@ func (c *aPIServices) List(ctx context.Context, opts metav1.ListOptions) (result } result = &v1.APIServiceList{} err = c.client.Get(). - Cluster(c.cluster). Resource("apiservices"). VersionedParams(&opts, scheme.ParameterCodec). Timeout(timeout). @@ -103,7 +98,6 @@ func (c *aPIServices) Watch(ctx context.Context, opts metav1.ListOptions) (watch } opts.Watch = true return c.client.Get(). - Cluster(c.cluster). Resource("apiservices"). VersionedParams(&opts, scheme.ParameterCodec). Timeout(timeout). @@ -114,7 +108,6 @@ func (c *aPIServices) Watch(ctx context.Context, opts metav1.ListOptions) (watch func (c *aPIServices) Create(ctx context.Context, aPIService *v1.APIService, opts metav1.CreateOptions) (result *v1.APIService, err error) { result = &v1.APIService{} err = c.client.Post(). - Cluster(c.cluster). Resource("apiservices"). VersionedParams(&opts, scheme.ParameterCodec). Body(aPIService). @@ -127,7 +120,6 @@ func (c *aPIServices) Create(ctx context.Context, aPIService *v1.APIService, opt func (c *aPIServices) Update(ctx context.Context, aPIService *v1.APIService, opts metav1.UpdateOptions) (result *v1.APIService, err error) { result = &v1.APIService{} err = c.client.Put(). - Cluster(c.cluster). Resource("apiservices"). Name(aPIService.Name). VersionedParams(&opts, scheme.ParameterCodec). @@ -142,7 +134,6 @@ func (c *aPIServices) Update(ctx context.Context, aPIService *v1.APIService, opt func (c *aPIServices) UpdateStatus(ctx context.Context, aPIService *v1.APIService, opts metav1.UpdateOptions) (result *v1.APIService, err error) { result = &v1.APIService{} err = c.client.Put(). - Cluster(c.cluster). Resource("apiservices"). Name(aPIService.Name). SubResource("status"). @@ -156,7 +147,6 @@ func (c *aPIServices) UpdateStatus(ctx context.Context, aPIService *v1.APIServic // Delete takes name of the aPIService and deletes it. Returns an error if one occurs. func (c *aPIServices) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { return c.client.Delete(). - Cluster(c.cluster). Resource("apiservices"). Name(name). Body(&opts). @@ -171,7 +161,6 @@ func (c *aPIServices) DeleteCollection(ctx context.Context, opts metav1.DeleteOp timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second } return c.client.Delete(). - Cluster(c.cluster). Resource("apiservices"). VersionedParams(&listOpts, scheme.ParameterCodec). Timeout(timeout). @@ -184,7 +173,6 @@ func (c *aPIServices) DeleteCollection(ctx context.Context, opts metav1.DeleteOp func (c *aPIServices) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.APIService, err error) { result = &v1.APIService{} err = c.client.Patch(pt). - Cluster(c.cluster). Resource("apiservices"). Name(name). SubResource(subresources...). diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/apiregistration_client.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/apiregistration_client.go index b1f6e7e8e1a22..de1e781ba80c3 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/apiregistration_client.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/apiregistration_client.go @@ -21,7 +21,6 @@ package v1beta1 import ( "net/http" - logicalcluster "github.com/kcp-dev/logicalcluster/v2" rest "k8s.io/client-go/rest" v1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1" "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" @@ -35,7 +34,6 @@ type ApiregistrationV1beta1Interface interface { // ApiregistrationV1beta1Client is used to interact with features provided by the apiregistration.k8s.io group. type ApiregistrationV1beta1Client struct { restClient rest.Interface - cluster logicalcluster.Name } func (c *ApiregistrationV1beta1Client) APIServices() APIServiceInterface { @@ -68,7 +66,7 @@ func NewForConfigAndClient(c *rest.Config, h *http.Client) (*ApiregistrationV1be if err != nil { return nil, err } - return &ApiregistrationV1beta1Client{restClient: client}, nil + return &ApiregistrationV1beta1Client{client}, nil } // NewForConfigOrDie creates a new ApiregistrationV1beta1Client for the given config and @@ -83,12 +81,7 @@ func NewForConfigOrDie(c *rest.Config) *ApiregistrationV1beta1Client { // New creates a new ApiregistrationV1beta1Client for the given RESTClient. func New(c rest.Interface) *ApiregistrationV1beta1Client { - return &ApiregistrationV1beta1Client{restClient: c} -} - -// NewWithCluster creates a new ApiregistrationV1beta1Client for the given RESTClient and cluster. -func NewWithCluster(c rest.Interface, cluster logicalcluster.Name) *ApiregistrationV1beta1Client { - return &ApiregistrationV1beta1Client{restClient: c, cluster: cluster} + return &ApiregistrationV1beta1Client{c} } func setConfigDefaults(config *rest.Config) error { diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/apiservice.go index fc1bd6ccf2903..a5e76412e1d53 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/apiservice.go @@ -22,7 +22,6 @@ import ( "context" "time" - logicalcluster "github.com/kcp-dev/logicalcluster/v2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" @@ -53,15 +52,13 @@ type APIServiceInterface interface { // aPIServices implements APIServiceInterface type aPIServices struct { - client rest.Interface - cluster logicalcluster.Name + client rest.Interface } // newAPIServices returns a APIServices func newAPIServices(c *ApiregistrationV1beta1Client) *aPIServices { return &aPIServices{ - client: c.RESTClient(), - cluster: c.cluster, + client: c.RESTClient(), } } @@ -69,7 +66,6 @@ func newAPIServices(c *ApiregistrationV1beta1Client) *aPIServices { func (c *aPIServices) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.APIService, err error) { result = &v1beta1.APIService{} err = c.client.Get(). - Cluster(c.cluster). Resource("apiservices"). Name(name). VersionedParams(&options, scheme.ParameterCodec). @@ -86,7 +82,6 @@ func (c *aPIServices) List(ctx context.Context, opts v1.ListOptions) (result *v1 } result = &v1beta1.APIServiceList{} err = c.client.Get(). - Cluster(c.cluster). Resource("apiservices"). VersionedParams(&opts, scheme.ParameterCodec). Timeout(timeout). @@ -103,7 +98,6 @@ func (c *aPIServices) Watch(ctx context.Context, opts v1.ListOptions) (watch.Int } opts.Watch = true return c.client.Get(). - Cluster(c.cluster). Resource("apiservices"). VersionedParams(&opts, scheme.ParameterCodec). Timeout(timeout). @@ -114,7 +108,6 @@ func (c *aPIServices) Watch(ctx context.Context, opts v1.ListOptions) (watch.Int func (c *aPIServices) Create(ctx context.Context, aPIService *v1beta1.APIService, opts v1.CreateOptions) (result *v1beta1.APIService, err error) { result = &v1beta1.APIService{} err = c.client.Post(). - Cluster(c.cluster). Resource("apiservices"). VersionedParams(&opts, scheme.ParameterCodec). Body(aPIService). @@ -127,7 +120,6 @@ func (c *aPIServices) Create(ctx context.Context, aPIService *v1beta1.APIService func (c *aPIServices) Update(ctx context.Context, aPIService *v1beta1.APIService, opts v1.UpdateOptions) (result *v1beta1.APIService, err error) { result = &v1beta1.APIService{} err = c.client.Put(). - Cluster(c.cluster). Resource("apiservices"). Name(aPIService.Name). VersionedParams(&opts, scheme.ParameterCodec). @@ -142,7 +134,6 @@ func (c *aPIServices) Update(ctx context.Context, aPIService *v1beta1.APIService func (c *aPIServices) UpdateStatus(ctx context.Context, aPIService *v1beta1.APIService, opts v1.UpdateOptions) (result *v1beta1.APIService, err error) { result = &v1beta1.APIService{} err = c.client.Put(). - Cluster(c.cluster). Resource("apiservices"). Name(aPIService.Name). SubResource("status"). @@ -156,7 +147,6 @@ func (c *aPIServices) UpdateStatus(ctx context.Context, aPIService *v1beta1.APIS // Delete takes name of the aPIService and deletes it. Returns an error if one occurs. func (c *aPIServices) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { return c.client.Delete(). - Cluster(c.cluster). Resource("apiservices"). Name(name). Body(&opts). @@ -171,7 +161,6 @@ func (c *aPIServices) DeleteCollection(ctx context.Context, opts v1.DeleteOption timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second } return c.client.Delete(). - Cluster(c.cluster). Resource("apiservices"). VersionedParams(&listOpts, scheme.ParameterCodec). Timeout(timeout). @@ -184,7 +173,6 @@ func (c *aPIServices) DeleteCollection(ctx context.Context, opts v1.DeleteOption func (c *aPIServices) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.APIService, err error) { result = &v1beta1.APIService{} err = c.client.Patch(pt). - Cluster(c.cluster). Resource("apiservices"). Name(name). SubResource(subresources...). diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1/apiservice.go index 465b510becee4..1c6a5cf20bd6c 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1/apiservice.go @@ -55,11 +55,7 @@ func NewAPIServiceInformer(client clientset.Interface, resyncPeriod time.Duratio // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewFilteredAPIServiceInformer(client clientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { - return NewFilteredAPIServiceInformerWithOptions(client, tweakListOptions, cache.WithResyncPeriod(resyncPeriod), cache.WithIndexers(indexers)) -} - -func NewFilteredAPIServiceInformerWithOptions(client clientset.Interface, tweakListOptions internalinterfaces.TweakListOptionsFunc, opts ...cache.SharedInformerOption) cache.SharedIndexInformer { - return cache.NewSharedIndexInformerWithOptions( + return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options metav1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { @@ -75,22 +71,13 @@ func NewFilteredAPIServiceInformerWithOptions(client clientset.Interface, tweakL }, }, &apiregistrationv1.APIService{}, - opts..., + resyncPeriod, + indexers, ) } func (f *aPIServiceInformer) defaultInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - indexers := cache.Indexers{} - for k, v := range f.factory.ExtraClusterScopedIndexers() { - indexers[k] = v - } - - return NewFilteredAPIServiceInformerWithOptions(client, - f.tweakListOptions, - cache.WithResyncPeriod(resyncPeriod), - cache.WithIndexers(indexers), - cache.WithKeyFunction(f.factory.KeyFunction()), - ) + return NewFilteredAPIServiceInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *aPIServiceInformer) Informer() cache.SharedIndexInformer { diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1beta1/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1beta1/apiservice.go index 5f5896954ddcc..aab505a259621 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1beta1/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1beta1/apiservice.go @@ -55,11 +55,7 @@ func NewAPIServiceInformer(client clientset.Interface, resyncPeriod time.Duratio // Always prefer using an informer factory to get a shared informer instead of getting an independent // one. This reduces memory footprint and number of connections to the server. func NewFilteredAPIServiceInformer(client clientset.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { - return NewFilteredAPIServiceInformerWithOptions(client, tweakListOptions, cache.WithResyncPeriod(resyncPeriod), cache.WithIndexers(indexers)) -} - -func NewFilteredAPIServiceInformerWithOptions(client clientset.Interface, tweakListOptions internalinterfaces.TweakListOptionsFunc, opts ...cache.SharedInformerOption) cache.SharedIndexInformer { - return cache.NewSharedIndexInformerWithOptions( + return cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { if tweakListOptions != nil { @@ -75,22 +71,13 @@ func NewFilteredAPIServiceInformerWithOptions(client clientset.Interface, tweakL }, }, &apiregistrationv1beta1.APIService{}, - opts..., + resyncPeriod, + indexers, ) } func (f *aPIServiceInformer) defaultInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - indexers := cache.Indexers{} - for k, v := range f.factory.ExtraClusterScopedIndexers() { - indexers[k] = v - } - - return NewFilteredAPIServiceInformerWithOptions(client, - f.tweakListOptions, - cache.WithResyncPeriod(resyncPeriod), - cache.WithIndexers(indexers), - cache.WithKeyFunction(f.factory.KeyFunction()), - ) + return NewFilteredAPIServiceInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } func (f *aPIServiceInformer) Informer() cache.SharedIndexInformer { diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/factory.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/factory.go index 133eb1e4909a0..88cb2bdecf3a8 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/factory.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/factory.go @@ -36,15 +36,12 @@ import ( type SharedInformerOption func(*sharedInformerFactory) *sharedInformerFactory type sharedInformerFactory struct { - client clientset.Interface - namespace string - tweakListOptions internalinterfaces.TweakListOptionsFunc - lock sync.Mutex - defaultResync time.Duration - customResync map[reflect.Type]time.Duration - extraClusterScopedIndexers cache.Indexers - extraNamespaceScopedIndexers cache.Indexers - keyFunc cache.KeyFunc + client clientset.Interface + namespace string + tweakListOptions internalinterfaces.TweakListOptionsFunc + lock sync.Mutex + defaultResync time.Duration + customResync map[reflect.Type]time.Duration informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. @@ -78,30 +75,6 @@ func WithNamespace(namespace string) SharedInformerOption { } } -// WithExtraClusterScopedIndexers adds cluster scoped indexers on all informers of the configured SharedInformerFactory -func WithExtraClusterScopedIndexers(indexers cache.Indexers) SharedInformerOption { - return func(factory *sharedInformerFactory) *sharedInformerFactory { - factory.extraClusterScopedIndexers = indexers - return factory - } -} - -// WithExtraNamespaceScopedIndexers adds namespace scoped indexers on all informers of the configured SharedInformerFactory -func WithExtraNamespaceScopedIndexers(indexers cache.Indexers) SharedInformerOption { - return func(factory *sharedInformerFactory) *sharedInformerFactory { - factory.extraNamespaceScopedIndexers = indexers - return factory - } -} - -// WithKeyFunction sets a custom key function for all informers of the configured SharedInformerFactory -func WithKeyFunction(keyFunc cache.KeyFunc) SharedInformerOption { - return func(factory *sharedInformerFactory) *sharedInformerFactory { - factory.keyFunc = keyFunc - return factory - } -} - // NewSharedInformerFactory constructs a new instance of sharedInformerFactory for all namespaces. func NewSharedInformerFactory(client clientset.Interface, defaultResync time.Duration) SharedInformerFactory { return NewSharedInformerFactoryWithOptions(client, defaultResync) @@ -118,14 +91,12 @@ func NewFilteredSharedInformerFactory(client clientset.Interface, defaultResync // NewSharedInformerFactoryWithOptions constructs a new instance of a SharedInformerFactory with additional options. func NewSharedInformerFactoryWithOptions(client clientset.Interface, defaultResync time.Duration, options ...SharedInformerOption) SharedInformerFactory { factory := &sharedInformerFactory{ - client: client, - namespace: v1.NamespaceAll, - defaultResync: defaultResync, - informers: make(map[reflect.Type]cache.SharedIndexInformer), - startedInformers: make(map[reflect.Type]bool), - customResync: make(map[reflect.Type]time.Duration), - extraClusterScopedIndexers: cache.Indexers{}, - extraNamespaceScopedIndexers: cache.Indexers{}, + client: client, + namespace: v1.NamespaceAll, + defaultResync: defaultResync, + informers: make(map[reflect.Type]cache.SharedIndexInformer), + startedInformers: make(map[reflect.Type]bool), + customResync: make(map[reflect.Type]time.Duration), } // Apply all options @@ -194,21 +165,6 @@ func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internal return informer } -// KeyFunction returns any extra cluster scoped indexers set on the factory -func (f *sharedInformerFactory) ExtraClusterScopedIndexers() cache.Indexers { - return f.extraClusterScopedIndexers -} - -// KeyFunction returns any extra namespace scoped indexers set on the factory -func (f *sharedInformerFactory) ExtraNamespaceScopedIndexers() cache.Indexers { - return f.extraNamespaceScopedIndexers -} - -// KeyFunction returns the keyfunction set on the factory -func (f *sharedInformerFactory) KeyFunction() cache.KeyFunc { - return f.keyFunc -} - // SharedInformerFactory provides shared informers for resources in all known // API group versions. type SharedInformerFactory interface { diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index ce31191874631..5fd2bca8ce64b 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -34,9 +34,6 @@ type NewInformerFunc func(clientset.Interface, time.Duration) cache.SharedIndexI type SharedInformerFactory interface { Start(stopCh <-chan struct{}) InformerFor(obj runtime.Object, newFunc NewInformerFunc) cache.SharedIndexInformer - ExtraClusterScopedIndexers() cache.Indexers - ExtraNamespaceScopedIndexers() cache.Indexers - KeyFunction() cache.KeyFunc } // TweakListOptionsFunc is a function that transforms a v1.ListOptions. diff --git a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go index 76f30eeb36438..d96383d37b9fd 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go @@ -25,7 +25,7 @@ import ( "github.com/emicklei/go-restful" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/klog/v2" "k8s.io/apiserver/pkg/server" @@ -100,7 +100,7 @@ func BuildAndRegisterAggregator(downloader *Downloader, delegationTarget server. // ignore errors for the empty delegate we attach at the end the chain // atm the empty delegate returns 503 when the server hasn't been fully initialized // and the spec downloader only silences 404s - if len(delegate.ListedPaths(logicalcluster.New(""))) == 0 && delegate.NextDelegate() == nil { + if len(delegate.ListedPaths(logicalcluster.NewName(""))) == 0 && delegate.NextDelegate() == nil { continue } return nil, err diff --git a/staging/src/k8s.io/kube-controller-manager/go.mod b/staging/src/k8s.io/kube-controller-manager/go.mod index 1b69f0e9739d4..06494a5a1f790 100644 --- a/staging/src/k8s.io/kube-controller-manager/go.mod +++ b/staging/src/k8s.io/kube-controller-manager/go.mod @@ -13,6 +13,10 @@ require ( replace ( github.com/go-logr/logr => github.com/go-logr/logr v1.2.0 github.com/google/go-cmp => github.com/google/go-cmp v0.5.5 + + github.com/kcp-dev/apimachinery => github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 + github.com/kcp-dev/client-go => github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb + github.com/kcp-dev/logicalcluster/v3 => github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 github.com/stretchr/testify => github.com/stretchr/testify v1.7.0 golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 diff --git a/staging/src/k8s.io/kube-controller-manager/go.sum b/staging/src/k8s.io/kube-controller-manager/go.sum index 046d719085563..34192eae29acf 100644 --- a/staging/src/k8s.io/kube-controller-manager/go.sum +++ b/staging/src/k8s.io/kube-controller-manager/go.sum @@ -254,9 +254,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/apimachinery v0.0.0-20221019133255-9e1e13940519/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6/go.mod h1:Qmq1OxUOSdVQ8YIGnjbya5Xt04KMJ5fN41QvErl/XnI= github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= @@ -315,6 +312,9 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56/go.mod h1:XEv+UQlH7NT41TOZYRK+LRo2URcwYjP8GQqOqtBk0RI= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb/go.mod h1:kLMJgfd5gpWZv2y42vrn1W7WgeFpBlDV3vcJCqx4qxk= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= diff --git a/staging/src/k8s.io/kube-proxy/go.sum b/staging/src/k8s.io/kube-proxy/go.sum index 8670a74639595..edba987af0063 100644 --- a/staging/src/k8s.io/kube-proxy/go.sum +++ b/staging/src/k8s.io/kube-proxy/go.sum @@ -182,7 +182,6 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= diff --git a/staging/src/k8s.io/kube-scheduler/go.sum b/staging/src/k8s.io/kube-scheduler/go.sum index 8670a74639595..edba987af0063 100644 --- a/staging/src/k8s.io/kube-scheduler/go.sum +++ b/staging/src/k8s.io/kube-scheduler/go.sum @@ -182,7 +182,6 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= diff --git a/staging/src/k8s.io/kubectl/go.sum b/staging/src/k8s.io/kubectl/go.sum index 76110563aa68a..adb93447efeda 100644 --- a/staging/src/k8s.io/kubectl/go.sum +++ b/staging/src/k8s.io/kubectl/go.sum @@ -274,8 +274,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= diff --git a/staging/src/k8s.io/kubelet/go.sum b/staging/src/k8s.io/kubelet/go.sum index db787a5704d9f..6a7451859166a 100644 --- a/staging/src/k8s.io/kubelet/go.sum +++ b/staging/src/k8s.io/kubelet/go.sum @@ -183,7 +183,6 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= diff --git a/staging/src/k8s.io/legacy-cloud-providers/go.mod b/staging/src/k8s.io/legacy-cloud-providers/go.mod index c0c1792ba3987..931383c2e720f 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/go.mod +++ b/staging/src/k8s.io/legacy-cloud-providers/go.mod @@ -45,6 +45,10 @@ require ( replace ( github.com/go-logr/logr => github.com/go-logr/logr v1.2.0 github.com/google/go-cmp => github.com/google/go-cmp v0.5.5 + + github.com/kcp-dev/apimachinery => github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 + github.com/kcp-dev/client-go => github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb + github.com/kcp-dev/logicalcluster/v3 => github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 github.com/stretchr/testify => github.com/stretchr/testify v1.7.0 golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 diff --git a/staging/src/k8s.io/legacy-cloud-providers/go.sum b/staging/src/k8s.io/legacy-cloud-providers/go.sum index c6c438a6bf216..7f72251a06032 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/go.sum +++ b/staging/src/k8s.io/legacy-cloud-providers/go.sum @@ -304,10 +304,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/apimachinery v0.0.0-20221019133255-9e1e13940519/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6/go.mod h1:Qmq1OxUOSdVQ8YIGnjbya5Xt04KMJ5fN41QvErl/XnI= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= @@ -374,6 +370,9 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56/go.mod h1:XEv+UQlH7NT41TOZYRK+LRo2URcwYjP8GQqOqtBk0RI= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb/go.mod h1:kLMJgfd5gpWZv2y42vrn1W7WgeFpBlDV3vcJCqx4qxk= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= diff --git a/staging/src/k8s.io/metrics/go.mod b/staging/src/k8s.io/metrics/go.mod index f0e1e7870fe98..896a22a9f31d1 100644 --- a/staging/src/k8s.io/metrics/go.mod +++ b/staging/src/k8s.io/metrics/go.mod @@ -6,7 +6,6 @@ go 1.16 require ( github.com/gogo/protobuf v1.3.2 - github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/stretchr/testify v1.7.1 google.golang.org/appengine v1.6.7 // indirect diff --git a/staging/src/k8s.io/metrics/go.sum b/staging/src/k8s.io/metrics/go.sum index 6f43670740c1e..e5366ad8fa64c 100644 --- a/staging/src/k8s.io/metrics/go.sum +++ b/staging/src/k8s.io/metrics/go.sum @@ -151,8 +151,6 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/clientset.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/clientset.go index 938eab14f5295..500e3a5f83e21 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/clientset.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/clientset.go @@ -22,7 +22,6 @@ import ( "fmt" "net/http" - logicalcluster "github.com/kcp-dev/logicalcluster/v2" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" @@ -30,33 +29,6 @@ import ( metricsv1beta1 "k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1" ) -type ClusterInterface interface { - Cluster(name logicalcluster.Name) Interface -} - -type Cluster struct { - *scopedClientset -} - -// Cluster sets the cluster for a Clientset. -func (c *Cluster) Cluster(name logicalcluster.Name) Interface { - return &Clientset{ - scopedClientset: c.scopedClientset, - cluster: name, - } -} - -// NewClusterForConfig creates a new Cluster for the given config. -// If config's RateLimiter is not set and QPS and Burst are acceptable, -// NewClusterForConfig will generate a rate-limiter in configShallowCopy. -func NewClusterForConfig(c *rest.Config) (*Cluster, error) { - cs, err := NewForConfig(c) - if err != nil { - return nil, err - } - return &Cluster{scopedClientset: cs.scopedClientset}, nil -} - type Interface interface { Discovery() discovery.DiscoveryInterface MetricsV1alpha1() metricsv1alpha1.MetricsV1alpha1Interface @@ -66,13 +38,6 @@ type Interface interface { // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { - *scopedClientset - cluster logicalcluster.Name -} - -// scopedClientset contains the clients for groups. Each group has exactly one -// version included in a Clientset. -type scopedClientset struct { *discovery.DiscoveryClient metricsV1alpha1 *metricsv1alpha1.MetricsV1alpha1Client metricsV1beta1 *metricsv1beta1.MetricsV1beta1Client @@ -80,12 +45,12 @@ type scopedClientset struct { // MetricsV1alpha1 retrieves the MetricsV1alpha1Client func (c *Clientset) MetricsV1alpha1() metricsv1alpha1.MetricsV1alpha1Interface { - return metricsv1alpha1.NewWithCluster(c.metricsV1alpha1.RESTClient(), c.cluster) + return c.metricsV1alpha1 } // MetricsV1beta1 retrieves the MetricsV1beta1Client func (c *Clientset) MetricsV1beta1() metricsv1beta1.MetricsV1beta1Interface { - return metricsv1beta1.NewWithCluster(c.metricsV1beta1.RESTClient(), c.cluster) + return c.metricsV1beta1 } // Discovery retrieves the DiscoveryClient @@ -93,7 +58,7 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { if c == nil { return nil } - return c.DiscoveryClient.WithCluster(c.cluster) + return c.DiscoveryClient } // NewForConfig creates a new Clientset for the given config. @@ -130,7 +95,7 @@ func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*Clientset, configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) } - var cs scopedClientset + var cs Clientset var err error cs.metricsV1alpha1, err = metricsv1alpha1.NewForConfigAndClient(&configShallowCopy, httpClient) if err != nil { @@ -145,7 +110,7 @@ func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*Clientset, if err != nil { return nil, err } - return &Clientset{scopedClientset: &cs}, nil + return &cs, nil } // NewForConfigOrDie creates a new Clientset for the given config and @@ -160,10 +125,10 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { - var cs scopedClientset + var cs Clientset cs.metricsV1alpha1 = metricsv1alpha1.New(c) cs.metricsV1beta1 = metricsv1beta1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) - return &Clientset{scopedClientset: &cs} + return &cs } diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/register.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/register.go index 29310bff13fff..6d82cc0c76f1e 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/register.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/register.go @@ -39,14 +39,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/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/scheme/register.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/scheme/register.go index 361fe99e15aa4..a92b020a9ffc7 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/scheme/register.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/scheme/register.go @@ -39,14 +39,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/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/metrics_client.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/metrics_client.go index 6ef4d5dd0a76a..efc23042d4761 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/metrics_client.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/metrics_client.go @@ -21,7 +21,6 @@ package v1alpha1 import ( "net/http" - logicalcluster "github.com/kcp-dev/logicalcluster/v2" rest "k8s.io/client-go/rest" v1alpha1 "k8s.io/metrics/pkg/apis/metrics/v1alpha1" "k8s.io/metrics/pkg/client/clientset/versioned/scheme" @@ -36,7 +35,6 @@ type MetricsV1alpha1Interface interface { // MetricsV1alpha1Client is used to interact with features provided by the metrics.k8s.io group. type MetricsV1alpha1Client struct { restClient rest.Interface - cluster logicalcluster.Name } func (c *MetricsV1alpha1Client) NodeMetricses() NodeMetricsInterface { @@ -73,7 +71,7 @@ func NewForConfigAndClient(c *rest.Config, h *http.Client) (*MetricsV1alpha1Clie if err != nil { return nil, err } - return &MetricsV1alpha1Client{restClient: client}, nil + return &MetricsV1alpha1Client{client}, nil } // NewForConfigOrDie creates a new MetricsV1alpha1Client for the given config and @@ -88,12 +86,7 @@ func NewForConfigOrDie(c *rest.Config) *MetricsV1alpha1Client { // New creates a new MetricsV1alpha1Client for the given RESTClient. func New(c rest.Interface) *MetricsV1alpha1Client { - return &MetricsV1alpha1Client{restClient: c} -} - -// NewWithCluster creates a new MetricsV1alpha1Client for the given RESTClient and cluster. -func NewWithCluster(c rest.Interface, cluster logicalcluster.Name) *MetricsV1alpha1Client { - return &MetricsV1alpha1Client{restClient: c, cluster: cluster} + return &MetricsV1alpha1Client{c} } func setConfigDefaults(config *rest.Config) error { diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/nodemetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/nodemetrics.go index e57906018362d..d79163ddb816f 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/nodemetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/nodemetrics.go @@ -22,7 +22,6 @@ import ( "context" "time" - logicalcluster "github.com/kcp-dev/logicalcluster/v2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -46,15 +45,13 @@ type NodeMetricsInterface interface { // nodeMetricses implements NodeMetricsInterface type nodeMetricses struct { - client rest.Interface - cluster logicalcluster.Name + client rest.Interface } // newNodeMetricses returns a NodeMetricses func newNodeMetricses(c *MetricsV1alpha1Client) *nodeMetricses { return &nodeMetricses{ - client: c.RESTClient(), - cluster: c.cluster, + client: c.RESTClient(), } } @@ -62,7 +59,6 @@ func newNodeMetricses(c *MetricsV1alpha1Client) *nodeMetricses { func (c *nodeMetricses) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.NodeMetrics, err error) { result = &v1alpha1.NodeMetrics{} err = c.client.Get(). - Cluster(c.cluster). Resource("nodes"). Name(name). VersionedParams(&options, scheme.ParameterCodec). @@ -79,7 +75,6 @@ func (c *nodeMetricses) List(ctx context.Context, opts v1.ListOptions) (result * } result = &v1alpha1.NodeMetricsList{} err = c.client.Get(). - Cluster(c.cluster). Resource("nodes"). VersionedParams(&opts, scheme.ParameterCodec). Timeout(timeout). @@ -96,7 +91,6 @@ func (c *nodeMetricses) Watch(ctx context.Context, opts v1.ListOptions) (watch.I } opts.Watch = true return c.client.Get(). - Cluster(c.cluster). Resource("nodes"). VersionedParams(&opts, scheme.ParameterCodec). Timeout(timeout). diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/podmetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/podmetrics.go index 0ce7c745230ac..49d57c8e887ee 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/podmetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/podmetrics.go @@ -22,7 +22,6 @@ import ( "context" "time" - logicalcluster "github.com/kcp-dev/logicalcluster/v2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -46,17 +45,15 @@ type PodMetricsInterface interface { // podMetricses implements PodMetricsInterface type podMetricses struct { - client rest.Interface - cluster logicalcluster.Name - ns string + client rest.Interface + ns string } // newPodMetricses returns a PodMetricses func newPodMetricses(c *MetricsV1alpha1Client, namespace string) *podMetricses { return &podMetricses{ - client: c.RESTClient(), - cluster: c.cluster, - ns: namespace, + client: c.RESTClient(), + ns: namespace, } } @@ -64,7 +61,6 @@ func newPodMetricses(c *MetricsV1alpha1Client, namespace string) *podMetricses { func (c *podMetricses) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.PodMetrics, err error) { result = &v1alpha1.PodMetrics{} err = c.client.Get(). - Cluster(c.cluster). Namespace(c.ns). Resource("pods"). Name(name). @@ -82,7 +78,6 @@ func (c *podMetricses) List(ctx context.Context, opts v1.ListOptions) (result *v } result = &v1alpha1.PodMetricsList{} err = c.client.Get(). - Cluster(c.cluster). Namespace(c.ns). Resource("pods"). VersionedParams(&opts, scheme.ParameterCodec). @@ -100,7 +95,6 @@ func (c *podMetricses) Watch(ctx context.Context, opts v1.ListOptions) (watch.In } opts.Watch = true return c.client.Get(). - Cluster(c.cluster). Namespace(c.ns). Resource("pods"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/metrics_client.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/metrics_client.go index 5f5b856a06f8c..7a02cea2e5efd 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/metrics_client.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/metrics_client.go @@ -21,7 +21,6 @@ package v1beta1 import ( "net/http" - logicalcluster "github.com/kcp-dev/logicalcluster/v2" rest "k8s.io/client-go/rest" v1beta1 "k8s.io/metrics/pkg/apis/metrics/v1beta1" "k8s.io/metrics/pkg/client/clientset/versioned/scheme" @@ -36,7 +35,6 @@ type MetricsV1beta1Interface interface { // MetricsV1beta1Client is used to interact with features provided by the metrics.k8s.io group. type MetricsV1beta1Client struct { restClient rest.Interface - cluster logicalcluster.Name } func (c *MetricsV1beta1Client) NodeMetricses() NodeMetricsInterface { @@ -73,7 +71,7 @@ func NewForConfigAndClient(c *rest.Config, h *http.Client) (*MetricsV1beta1Clien if err != nil { return nil, err } - return &MetricsV1beta1Client{restClient: client}, nil + return &MetricsV1beta1Client{client}, nil } // NewForConfigOrDie creates a new MetricsV1beta1Client for the given config and @@ -88,12 +86,7 @@ func NewForConfigOrDie(c *rest.Config) *MetricsV1beta1Client { // New creates a new MetricsV1beta1Client for the given RESTClient. func New(c rest.Interface) *MetricsV1beta1Client { - return &MetricsV1beta1Client{restClient: c} -} - -// NewWithCluster creates a new MetricsV1beta1Client for the given RESTClient and cluster. -func NewWithCluster(c rest.Interface, cluster logicalcluster.Name) *MetricsV1beta1Client { - return &MetricsV1beta1Client{restClient: c, cluster: cluster} + return &MetricsV1beta1Client{c} } func setConfigDefaults(config *rest.Config) error { diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/nodemetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/nodemetrics.go index 787b5bb8a08a5..a312221ed25ae 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/nodemetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/nodemetrics.go @@ -22,7 +22,6 @@ import ( "context" "time" - logicalcluster "github.com/kcp-dev/logicalcluster/v2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -46,15 +45,13 @@ type NodeMetricsInterface interface { // nodeMetricses implements NodeMetricsInterface type nodeMetricses struct { - client rest.Interface - cluster logicalcluster.Name + client rest.Interface } // newNodeMetricses returns a NodeMetricses func newNodeMetricses(c *MetricsV1beta1Client) *nodeMetricses { return &nodeMetricses{ - client: c.RESTClient(), - cluster: c.cluster, + client: c.RESTClient(), } } @@ -62,7 +59,6 @@ func newNodeMetricses(c *MetricsV1beta1Client) *nodeMetricses { func (c *nodeMetricses) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.NodeMetrics, err error) { result = &v1beta1.NodeMetrics{} err = c.client.Get(). - Cluster(c.cluster). Resource("nodes"). Name(name). VersionedParams(&options, scheme.ParameterCodec). @@ -79,7 +75,6 @@ func (c *nodeMetricses) List(ctx context.Context, opts v1.ListOptions) (result * } result = &v1beta1.NodeMetricsList{} err = c.client.Get(). - Cluster(c.cluster). Resource("nodes"). VersionedParams(&opts, scheme.ParameterCodec). Timeout(timeout). @@ -96,7 +91,6 @@ func (c *nodeMetricses) Watch(ctx context.Context, opts v1.ListOptions) (watch.I } opts.Watch = true return c.client.Get(). - Cluster(c.cluster). Resource("nodes"). VersionedParams(&opts, scheme.ParameterCodec). Timeout(timeout). diff --git a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/podmetrics.go b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/podmetrics.go index c881d9de379e0..e66c377c25bae 100644 --- a/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/podmetrics.go +++ b/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/podmetrics.go @@ -22,7 +22,6 @@ import ( "context" "time" - logicalcluster "github.com/kcp-dev/logicalcluster/v2" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" @@ -46,17 +45,15 @@ type PodMetricsInterface interface { // podMetricses implements PodMetricsInterface type podMetricses struct { - client rest.Interface - cluster logicalcluster.Name - ns string + client rest.Interface + ns string } // newPodMetricses returns a PodMetricses func newPodMetricses(c *MetricsV1beta1Client, namespace string) *podMetricses { return &podMetricses{ - client: c.RESTClient(), - cluster: c.cluster, - ns: namespace, + client: c.RESTClient(), + ns: namespace, } } @@ -64,7 +61,6 @@ func newPodMetricses(c *MetricsV1beta1Client, namespace string) *podMetricses { func (c *podMetricses) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.PodMetrics, err error) { result = &v1beta1.PodMetrics{} err = c.client.Get(). - Cluster(c.cluster). Namespace(c.ns). Resource("pods"). Name(name). @@ -82,7 +78,6 @@ func (c *podMetricses) List(ctx context.Context, opts v1.ListOptions) (result *v } result = &v1beta1.PodMetricsList{} err = c.client.Get(). - Cluster(c.cluster). Namespace(c.ns). Resource("pods"). VersionedParams(&opts, scheme.ParameterCodec). @@ -100,7 +95,6 @@ func (c *podMetricses) Watch(ctx context.Context, opts v1.ListOptions) (watch.In } opts.Watch = true return c.client.Get(). - Cluster(c.cluster). Namespace(c.ns). Resource("pods"). VersionedParams(&opts, scheme.ParameterCodec). diff --git a/staging/src/k8s.io/pod-security-admission/go.mod b/staging/src/k8s.io/pod-security-admission/go.mod index 4e77b40f6c928..f7bbf05358b9f 100644 --- a/staging/src/k8s.io/pod-security-admission/go.mod +++ b/staging/src/k8s.io/pod-security-admission/go.mod @@ -23,6 +23,10 @@ require ( replace ( github.com/go-logr/logr => github.com/go-logr/logr v1.2.0 github.com/google/go-cmp => github.com/google/go-cmp v0.5.5 + + github.com/kcp-dev/apimachinery => github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 + github.com/kcp-dev/client-go => github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb + github.com/kcp-dev/logicalcluster/v3 => github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 github.com/stretchr/testify => github.com/stretchr/testify v1.7.0 golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 diff --git a/staging/src/k8s.io/pod-security-admission/go.sum b/staging/src/k8s.io/pod-security-admission/go.sum index 5218dc4d7eb20..54cb68da263d6 100644 --- a/staging/src/k8s.io/pod-security-admission/go.sum +++ b/staging/src/k8s.io/pod-security-admission/go.sum @@ -290,12 +290,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/apimachinery v0.0.0-20221019133255-9e1e13940519/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be h1:2uDzJ896+ojtzgr9HJL8+tZEoqhq8blwymGinWFrQ6E= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 h1:Dxst7pq601Y7zNhSAec7LoBySHFWvD+djLTqoTmHrL0= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6/go.mod h1:Qmq1OxUOSdVQ8YIGnjbya5Xt04KMJ5fN41QvErl/XnI= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= @@ -360,6 +354,12 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 h1:XxRBHVw8nfR2hS4PrwpfLmGTFHW4fpRmK2o6wtLY5k0= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56/go.mod h1:XEv+UQlH7NT41TOZYRK+LRo2URcwYjP8GQqOqtBk0RI= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb h1:hxhAOWnBMTkLdxIJbvKh0jUKkZp51t7/+bbdxYhb67g= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb/go.mod h1:kLMJgfd5gpWZv2y42vrn1W7WgeFpBlDV3vcJCqx4qxk= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 h1:zS7dh4JYSew1wAimDQjOQLndo/65hwXzeZHnt0Kl5IM= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= diff --git a/staging/src/k8s.io/sample-apiserver/go.mod b/staging/src/k8s.io/sample-apiserver/go.mod index 68058fae1a981..44d2ae5065fa1 100644 --- a/staging/src/k8s.io/sample-apiserver/go.mod +++ b/staging/src/k8s.io/sample-apiserver/go.mod @@ -20,6 +20,10 @@ require ( replace ( github.com/go-logr/logr => github.com/go-logr/logr v1.2.0 github.com/google/go-cmp => github.com/google/go-cmp v0.5.5 + + github.com/kcp-dev/apimachinery => github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 + github.com/kcp-dev/client-go => github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb + github.com/kcp-dev/logicalcluster/v3 => github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 github.com/stretchr/testify => github.com/stretchr/testify v1.7.0 golang.org/x/net => golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd golang.org/x/sys => golang.org/x/sys v0.0.0-20220209214540-3681064d5158 diff --git a/staging/src/k8s.io/sample-apiserver/go.sum b/staging/src/k8s.io/sample-apiserver/go.sum index 82080186f2eb6..d3c8838f5290b 100644 --- a/staging/src/k8s.io/sample-apiserver/go.sum +++ b/staging/src/k8s.io/sample-apiserver/go.sum @@ -289,11 +289,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/apimachinery v0.0.0-20221019133255-9e1e13940519/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be h1:2uDzJ896+ojtzgr9HJL8+tZEoqhq8blwymGinWFrQ6E= -github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 h1:Dxst7pq601Y7zNhSAec7LoBySHFWvD+djLTqoTmHrL0= -github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6/go.mod h1:Qmq1OxUOSdVQ8YIGnjbya5Xt04KMJ5fN41QvErl/XnI= github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -359,6 +354,12 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 h1:XxRBHVw8nfR2hS4PrwpfLmGTFHW4fpRmK2o6wtLY5k0= +github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56/go.mod h1:XEv+UQlH7NT41TOZYRK+LRo2URcwYjP8GQqOqtBk0RI= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb h1:hxhAOWnBMTkLdxIJbvKh0jUKkZp51t7/+bbdxYhb67g= +github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb/go.mod h1:kLMJgfd5gpWZv2y42vrn1W7WgeFpBlDV3vcJCqx4qxk= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 h1:zS7dh4JYSew1wAimDQjOQLndo/65hwXzeZHnt0Kl5IM= +github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= diff --git a/staging/src/k8s.io/sample-cli-plugin/go.sum b/staging/src/k8s.io/sample-cli-plugin/go.sum index 24e6c4d606dea..2f091a27051cb 100644 --- a/staging/src/k8s.io/sample-cli-plugin/go.sum +++ b/staging/src/k8s.io/sample-cli-plugin/go.sum @@ -218,8 +218,6 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= diff --git a/vendor/github.com/kcp-dev/apimachinery/pkg/cache/controller.go b/vendor/github.com/kcp-dev/apimachinery/pkg/cache/controller.go index 9e1bcd5502c43..b7310a97592f7 100644 --- a/vendor/github.com/kcp-dev/apimachinery/pkg/cache/controller.go +++ b/vendor/github.com/kcp-dev/apimachinery/pkg/cache/controller.go @@ -19,7 +19,7 @@ package cache import ( "fmt" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/apimachinery/pkg/api/meta" ) diff --git a/vendor/github.com/kcp-dev/apimachinery/pkg/cache/informers.go b/vendor/github.com/kcp-dev/apimachinery/pkg/cache/informers.go index f245c7505dfa9..c030522fb74a8 100644 --- a/vendor/github.com/kcp-dev/apimachinery/pkg/cache/informers.go +++ b/vendor/github.com/kcp-dev/apimachinery/pkg/cache/informers.go @@ -17,7 +17,7 @@ limitations under the License. package cache import ( - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/client-go/tools/cache" ) diff --git a/vendor/github.com/kcp-dev/apimachinery/pkg/cache/keyfunc.go b/vendor/github.com/kcp-dev/apimachinery/pkg/cache/keyfunc.go index e06d9912fa550..54d01706131fd 100644 --- a/vendor/github.com/kcp-dev/apimachinery/pkg/cache/keyfunc.go +++ b/vendor/github.com/kcp-dev/apimachinery/pkg/cache/keyfunc.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/client-go/tools/cache" ) @@ -81,7 +81,7 @@ func SplitMetaClusterNamespaceKey(key string) (clusterName logicalcluster.Name, if err != nil { err = invalidKey } - return logicalcluster.New(outerParts[0]), namespace, name, err + return logicalcluster.NewName(outerParts[0]), namespace, name, err default: return logicalcluster.Name{}, "", "", invalidKey } diff --git a/vendor/github.com/kcp-dev/apimachinery/pkg/cache/listers.go b/vendor/github.com/kcp-dev/apimachinery/pkg/cache/listers.go index b3c17ed6141c1..0ccdc2ff1030e 100644 --- a/vendor/github.com/kcp-dev/apimachinery/pkg/cache/listers.go +++ b/vendor/github.com/kcp-dev/apimachinery/pkg/cache/listers.go @@ -17,7 +17,7 @@ limitations under the License. package cache import ( - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" diff --git a/vendor/github.com/kcp-dev/apimachinery/pkg/client/cluster_config.go b/vendor/github.com/kcp-dev/apimachinery/pkg/client/cluster_config.go index ec55e57ee18a8..9f865d427bc92 100644 --- a/vendor/github.com/kcp-dev/apimachinery/pkg/client/cluster_config.go +++ b/vendor/github.com/kcp-dev/apimachinery/pkg/client/cluster_config.go @@ -19,7 +19,7 @@ package client import ( "net/http" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/client-go/rest" ) @@ -40,7 +40,7 @@ func SetMultiClusterRoundTripper(cfg *rest.Config) *rest.Config { // cluster endpoint. // // Note: it is the caller responsibility to make a copy of the rest config -func SetCluster(cfg *rest.Config, clusterName logicalcluster.Name) *rest.Config { - cfg.Host = cfg.Host + clusterName.Path() +func SetCluster(cfg *rest.Config, clusterName logicalcluster.Path) *rest.Config { + cfg.Host = cfg.Host + clusterName.RequestPath() return cfg } diff --git a/vendor/github.com/kcp-dev/apimachinery/pkg/client/constructor.go b/vendor/github.com/kcp-dev/apimachinery/pkg/client/constructor.go index 63b1abcee4e2e..b533a8712660e 100644 --- a/vendor/github.com/kcp-dev/apimachinery/pkg/client/constructor.go +++ b/vendor/github.com/kcp-dev/apimachinery/pkg/client/constructor.go @@ -20,7 +20,8 @@ import ( "net/http" "sync" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" + "k8s.io/client-go/rest" ) @@ -31,8 +32,8 @@ type Constructor[R any] struct { // Cache is a client factory that caches previous results. type Cache[R any] interface { - ClusterOrDie(name logicalcluster.Name) R - Cluster(name logicalcluster.Name) (R, error) + ClusterOrDie(path logicalcluster.Path) R + Cluster(path logicalcluster.Path) (R, error) } // NewCache creates a new client factory cache using the given constructor. @@ -43,7 +44,7 @@ func NewCache[R any](cfg *rest.Config, client *http.Client, constructor *Constru constructor: constructor, RWMutex: &sync.RWMutex{}, - clientsByCluster: map[logicalcluster.Name]R{}, + clientsByCluster: map[logicalcluster.Path]R{}, } } @@ -53,13 +54,13 @@ type clientCache[R any] struct { constructor *Constructor[R] *sync.RWMutex - clientsByCluster map[logicalcluster.Name]R + clientsByCluster map[logicalcluster.Path]R } // ClusterOrDie returns a new client scoped to the given logical cluster, or panics if there // is any error. -func (c *clientCache[R]) ClusterOrDie(name logicalcluster.Name) R { - client, err := c.Cluster(name) +func (c *clientCache[R]) ClusterOrDie(path logicalcluster.Path) R { + client, err := c.Cluster(path) if err != nil { // we ensure that the config is valid in the constructor, and we assume that any changes // we make to it during scoping will not make it invalid, in order to hide the error from @@ -70,17 +71,17 @@ func (c *clientCache[R]) ClusterOrDie(name logicalcluster.Name) R { } // Cluster returns a new client scoped to the given logical cluster. -func (c *clientCache[R]) Cluster(name logicalcluster.Name) (R, error) { +func (c *clientCache[R]) Cluster(path logicalcluster.Path) (R, error) { var cachedClient R var exists bool c.RLock() - cachedClient, exists = c.clientsByCluster[name] + cachedClient, exists = c.clientsByCluster[path] c.RUnlock() if exists { return cachedClient, nil } - cfg := SetCluster(rest.CopyConfig(c.cfg), name) + cfg := SetCluster(rest.CopyConfig(c.cfg), path) instance, err := c.constructor.NewForConfigAndClient(cfg, c.client) if err != nil { var result R @@ -89,12 +90,12 @@ func (c *clientCache[R]) Cluster(name logicalcluster.Name) (R, error) { c.Lock() defer c.Unlock() - cachedClient, exists = c.clientsByCluster[name] + cachedClient, exists = c.clientsByCluster[path] if exists { return cachedClient, nil } - c.clientsByCluster[name] = instance + c.clientsByCluster[path] = instance return instance, nil } diff --git a/vendor/github.com/kcp-dev/apimachinery/pkg/client/round_tripper.go b/vendor/github.com/kcp-dev/apimachinery/pkg/client/round_tripper.go index eff14242bb9b0..21383f3a8c12f 100644 --- a/vendor/github.com/kcp-dev/apimachinery/pkg/client/round_tripper.go +++ b/vendor/github.com/kcp-dev/apimachinery/pkg/client/round_tripper.go @@ -22,7 +22,7 @@ import ( "regexp" "strings" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" ) // ClusterRoundTripper is a cluster aware wrapper around http.RoundTripper @@ -41,8 +41,8 @@ func (c *ClusterRoundTripper) RoundTrip(req *http.Request) (*http.Response, erro cluster, ok := logicalcluster.ClusterFromContext(req.Context()) if ok { req = req.Clone(req.Context()) - req.URL.Path = generatePath(req.URL.Path, cluster) - req.URL.RawPath = generatePath(req.URL.RawPath, cluster) + req.URL.Path = generatePath(req.URL.Path, cluster.Path()) + req.URL.RawPath = generatePath(req.URL.RawPath, cluster.Path()) } return c.delegate.RoundTrip(req) } @@ -51,19 +51,19 @@ func (c *ClusterRoundTripper) RoundTrip(req *http.Request) (*http.Response, erro var apiRegex = regexp.MustCompile(`(/api/|/apis/)`) // generatePath formats the request path to target the specified cluster -func generatePath(originalPath string, cluster logicalcluster.Name) string { +func generatePath(originalPath string, cluster logicalcluster.Path) string { // If the originalPath already has cluster.Path() then the path was already modifed and no change needed - if strings.Contains(originalPath, cluster.Path()) { + if strings.Contains(originalPath, cluster.RequestPath()) { return originalPath } // If the originalPath has /api/ or /apis/ in it, it might be anywhere in the path, so we use a regex to find and // replaces /api/ or /apis/ with $cluster/api/ or $cluster/apis/ if apiRegex.MatchString(originalPath) { - return apiRegex.ReplaceAllString(originalPath, fmt.Sprintf("%s$1", cluster.Path())) + return apiRegex.ReplaceAllString(originalPath, fmt.Sprintf("%s$1", cluster.RequestPath())) } // Otherwise, we're just prepending /clusters/$name - path := cluster.Path() + path := cluster.RequestPath() // if the original path is relative, add a / separator if len(originalPath) > 0 && originalPath[0] != '/' { diff --git a/vendor/github.com/kcp-dev/apimachinery/third_party/informers/scoped_shared_informer.go b/vendor/github.com/kcp-dev/apimachinery/third_party/informers/scoped_shared_informer.go index 9e2aed2a1aad3..846caa876a666 100644 --- a/vendor/github.com/kcp-dev/apimachinery/third_party/informers/scoped_shared_informer.go +++ b/vendor/github.com/kcp-dev/apimachinery/third_party/informers/scoped_shared_informer.go @@ -20,7 +20,7 @@ import ( "time" kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/client-go/tools/cache" ) diff --git a/vendor/github.com/kcp-dev/apimachinery/third_party/informers/shared_informer.go b/vendor/github.com/kcp-dev/apimachinery/third_party/informers/shared_informer.go index 1fd38df3c54ad..4e38b2da3406c 100644 --- a/vendor/github.com/kcp-dev/apimachinery/third_party/informers/shared_informer.go +++ b/vendor/github.com/kcp-dev/apimachinery/third_party/informers/shared_informer.go @@ -24,7 +24,7 @@ import ( "time" kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" diff --git a/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1/mutatingwebhookconfiguration.go b/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1/mutatingwebhookconfiguration.go index 99541be79ac84..cdac3711b8425 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1/mutatingwebhookconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1/mutatingwebhookconfiguration.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1/validatingwebhookconfiguration.go b/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1/validatingwebhookconfiguration.go index 50a9f159547a0..362bf6dfe8363 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1/validatingwebhookconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1/validatingwebhookconfiguration.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration.go b/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration.go index 7bf80227326c9..386199c670775 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1beta1/validatingwebhookconfiguration.go b/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1beta1/validatingwebhookconfiguration.go index 15d2520cccd31..ebd0aab8d0488 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1beta1/validatingwebhookconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/informers/admissionregistration/v1beta1/validatingwebhookconfiguration.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/apiserverinternal/v1alpha1/storageversion.go b/vendor/github.com/kcp-dev/client-go/informers/apiserverinternal/v1alpha1/storageversion.go index 9840fe5b6a8d3..531d12eb864f3 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/apiserverinternal/v1alpha1/storageversion.go +++ b/vendor/github.com/kcp-dev/client-go/informers/apiserverinternal/v1alpha1/storageversion.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" internalv1alpha1 "k8s.io/api/apiserverinternal/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/apps/v1/controllerrevision.go b/vendor/github.com/kcp-dev/client-go/informers/apps/v1/controllerrevision.go index 78fbaf1995193..75e81b22cef1b 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/apps/v1/controllerrevision.go +++ b/vendor/github.com/kcp-dev/client-go/informers/apps/v1/controllerrevision.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/apps/v1/daemonset.go b/vendor/github.com/kcp-dev/client-go/informers/apps/v1/daemonset.go index 2311aee15511d..98d3eb371970a 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/apps/v1/daemonset.go +++ b/vendor/github.com/kcp-dev/client-go/informers/apps/v1/daemonset.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/apps/v1/deployment.go b/vendor/github.com/kcp-dev/client-go/informers/apps/v1/deployment.go index f972033122fd2..3642ffe7a6fa5 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/apps/v1/deployment.go +++ b/vendor/github.com/kcp-dev/client-go/informers/apps/v1/deployment.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/apps/v1/replicaset.go b/vendor/github.com/kcp-dev/client-go/informers/apps/v1/replicaset.go index 51e3f9b586363..e3ec51bed99a4 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/apps/v1/replicaset.go +++ b/vendor/github.com/kcp-dev/client-go/informers/apps/v1/replicaset.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/apps/v1/statefulset.go b/vendor/github.com/kcp-dev/client-go/informers/apps/v1/statefulset.go index 1e53e06f121cf..03a9262eb1c89 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/apps/v1/statefulset.go +++ b/vendor/github.com/kcp-dev/client-go/informers/apps/v1/statefulset.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta1/controllerrevision.go b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta1/controllerrevision.go index 74931d0b93d13..252a0341796c5 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta1/controllerrevision.go +++ b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta1/controllerrevision.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta1 "k8s.io/api/apps/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta1/deployment.go b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta1/deployment.go index 359fd3d6d3354..b1322d60a2933 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta1/deployment.go +++ b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta1/deployment.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta1 "k8s.io/api/apps/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta1/statefulset.go b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta1/statefulset.go index e119d3872a1db..08a3b0c339607 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta1/statefulset.go +++ b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta1/statefulset.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta1 "k8s.io/api/apps/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/controllerrevision.go b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/controllerrevision.go index b4b783d3cce37..b06dfa0c0b097 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/controllerrevision.go +++ b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/controllerrevision.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/daemonset.go b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/daemonset.go index 2f64944509749..670830a052e4d 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/daemonset.go +++ b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/daemonset.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/deployment.go b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/deployment.go index e7753afe98c9e..23378d152cc5e 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/deployment.go +++ b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/deployment.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/replicaset.go b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/replicaset.go index 175156eb43b20..841e4f4618790 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/replicaset.go +++ b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/replicaset.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/statefulset.go b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/statefulset.go index 79a6627b5c664..3f5a9c2ea3df8 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/statefulset.go +++ b/vendor/github.com/kcp-dev/client-go/informers/apps/v1beta2/statefulset.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v1/horizontalpodautoscaler.go b/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v1/horizontalpodautoscaler.go index c5198f5f159e2..20329694ad77b 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v1/horizontalpodautoscaler.go +++ b/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v1/horizontalpodautoscaler.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv1 "k8s.io/api/autoscaling/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v2/horizontalpodautoscaler.go b/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v2/horizontalpodautoscaler.go index 9f5e850f53707..0b97ac8c20906 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v2/horizontalpodautoscaler.go +++ b/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v2/horizontalpodautoscaler.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv2 "k8s.io/api/autoscaling/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v2beta1/horizontalpodautoscaler.go b/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v2beta1/horizontalpodautoscaler.go index ce289ee0fbaec..19d8abeb406f5 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v2beta1/horizontalpodautoscaler.go +++ b/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v2beta1/horizontalpodautoscaler.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv2beta1 "k8s.io/api/autoscaling/v2beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v2beta2/horizontalpodautoscaler.go b/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v2beta2/horizontalpodautoscaler.go index 41111e8119f51..10b94a37889a8 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v2beta2/horizontalpodautoscaler.go +++ b/vendor/github.com/kcp-dev/client-go/informers/autoscaling/v2beta2/horizontalpodautoscaler.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/batch/v1/cronjob.go b/vendor/github.com/kcp-dev/client-go/informers/batch/v1/cronjob.go index 4504a03772023..df0f0e38ab9d3 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/batch/v1/cronjob.go +++ b/vendor/github.com/kcp-dev/client-go/informers/batch/v1/cronjob.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" batchv1 "k8s.io/api/batch/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/batch/v1/job.go b/vendor/github.com/kcp-dev/client-go/informers/batch/v1/job.go index 844dc21648007..3123ebb6df0ec 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/batch/v1/job.go +++ b/vendor/github.com/kcp-dev/client-go/informers/batch/v1/job.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" batchv1 "k8s.io/api/batch/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/batch/v1beta1/cronjob.go b/vendor/github.com/kcp-dev/client-go/informers/batch/v1beta1/cronjob.go index 0889c58eff99a..8ede112ce0a8d 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/batch/v1beta1/cronjob.go +++ b/vendor/github.com/kcp-dev/client-go/informers/batch/v1beta1/cronjob.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" batchv1beta1 "k8s.io/api/batch/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/certificates/v1/certificatesigningrequest.go b/vendor/github.com/kcp-dev/client-go/informers/certificates/v1/certificatesigningrequest.go index 74948a0db7d32..3a622b81d9caf 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/certificates/v1/certificatesigningrequest.go +++ b/vendor/github.com/kcp-dev/client-go/informers/certificates/v1/certificatesigningrequest.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" certificatesv1 "k8s.io/api/certificates/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/certificates/v1beta1/certificatesigningrequest.go b/vendor/github.com/kcp-dev/client-go/informers/certificates/v1beta1/certificatesigningrequest.go index 9c833a6f43761..168216872514b 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/certificates/v1beta1/certificatesigningrequest.go +++ b/vendor/github.com/kcp-dev/client-go/informers/certificates/v1beta1/certificatesigningrequest.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" certificatesv1beta1 "k8s.io/api/certificates/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/coordination/v1/lease.go b/vendor/github.com/kcp-dev/client-go/informers/coordination/v1/lease.go index 17b6c74d81b1a..b93cac23fdf5c 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/coordination/v1/lease.go +++ b/vendor/github.com/kcp-dev/client-go/informers/coordination/v1/lease.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" coordinationv1 "k8s.io/api/coordination/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/coordination/v1beta1/lease.go b/vendor/github.com/kcp-dev/client-go/informers/coordination/v1beta1/lease.go index 9123ce3cd47fb..6fe1fc47dda62 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/coordination/v1beta1/lease.go +++ b/vendor/github.com/kcp-dev/client-go/informers/coordination/v1beta1/lease.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" coordinationv1beta1 "k8s.io/api/coordination/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/componentstatus.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/componentstatus.go index 16001c0b6fb72..0a8f4fa3cfcb0 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/componentstatus.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/componentstatus.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/configmap.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/configmap.go index cf29c1a2d0f79..0d23d0f5af9fa 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/configmap.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/configmap.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/endpoints.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/endpoints.go index ccfc47b60e2a5..ebdbe32bb6a0d 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/endpoints.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/endpoints.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/event.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/event.go index ce2a7df47391d..3391b26336df7 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/event.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/event.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/limitrange.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/limitrange.go index 00302f79157d9..0f91a04d13f81 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/limitrange.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/limitrange.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/namespace.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/namespace.go index 22a7330f89577..c5814d1523be4 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/namespace.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/namespace.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/node.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/node.go index ce4ebd720f467..78ce43aa1ffea 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/node.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/node.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/persistentvolume.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/persistentvolume.go index e519724581ed9..f02a4a289548d 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/persistentvolume.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/persistentvolume.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/persistentvolumeclaim.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/persistentvolumeclaim.go index 830865d7b1b79..7b2326c6a2c3a 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/persistentvolumeclaim.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/persistentvolumeclaim.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/pod.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/pod.go index bd2c487887ee5..e32b38a8aa560 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/pod.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/pod.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/podtemplate.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/podtemplate.go index ae8cb8b58e75b..4ee6c196864ea 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/podtemplate.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/podtemplate.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/replicationcontroller.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/replicationcontroller.go index 63e2bf37f8a51..672d822a506b8 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/replicationcontroller.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/replicationcontroller.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/resourcequota.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/resourcequota.go index 8213843b4a57a..fe5eac1ccae2b 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/resourcequota.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/resourcequota.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/secret.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/secret.go index f470f9f269cdc..2ad9e84ef3074 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/secret.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/secret.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/service.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/service.go index 3dcac41abbae9..691da62f537d6 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/service.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/service.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/core/v1/serviceaccount.go b/vendor/github.com/kcp-dev/client-go/informers/core/v1/serviceaccount.go index 355efdfd24d80..58ba5162f2dde 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/core/v1/serviceaccount.go +++ b/vendor/github.com/kcp-dev/client-go/informers/core/v1/serviceaccount.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/discovery/v1/endpointslice.go b/vendor/github.com/kcp-dev/client-go/informers/discovery/v1/endpointslice.go index 21af89c72d735..ec769ea21caa7 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/discovery/v1/endpointslice.go +++ b/vendor/github.com/kcp-dev/client-go/informers/discovery/v1/endpointslice.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" discoveryv1 "k8s.io/api/discovery/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/discovery/v1beta1/endpointslice.go b/vendor/github.com/kcp-dev/client-go/informers/discovery/v1beta1/endpointslice.go index 96a1441ff6e59..04d57417e6e54 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/discovery/v1beta1/endpointslice.go +++ b/vendor/github.com/kcp-dev/client-go/informers/discovery/v1beta1/endpointslice.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" discoveryv1beta1 "k8s.io/api/discovery/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/events/v1/event.go b/vendor/github.com/kcp-dev/client-go/informers/events/v1/event.go index c6a2dd3b1daaf..61616eeb6d616 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/events/v1/event.go +++ b/vendor/github.com/kcp-dev/client-go/informers/events/v1/event.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" eventsv1 "k8s.io/api/events/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/events/v1beta1/event.go b/vendor/github.com/kcp-dev/client-go/informers/events/v1beta1/event.go index 0de0a46ad1d1a..f547c5e9be064 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/events/v1beta1/event.go +++ b/vendor/github.com/kcp-dev/client-go/informers/events/v1beta1/event.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" eventsv1beta1 "k8s.io/api/events/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/daemonset.go b/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/daemonset.go index 46caec321b83a..957229b5d7164 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/daemonset.go +++ b/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/daemonset.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/deployment.go b/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/deployment.go index b040f9b2b5d2c..d679f7b9120e3 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/deployment.go +++ b/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/deployment.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/ingress.go b/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/ingress.go index 8c586bdb613c6..e4096284943d6 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/ingress.go +++ b/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/ingress.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/networkpolicy.go b/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/networkpolicy.go index 5866196dd99d8..43a76c200366d 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/networkpolicy.go +++ b/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/networkpolicy.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/podsecuritypolicy.go b/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/podsecuritypolicy.go index a9d2ce898dee0..3810e56f4ff51 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/podsecuritypolicy.go +++ b/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/podsecuritypolicy.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/replicaset.go b/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/replicaset.go index c26399956d600..4af9297b93c53 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/replicaset.go +++ b/vendor/github.com/kcp-dev/client-go/informers/extensions/v1beta1/replicaset.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/factory.go b/vendor/github.com/kcp-dev/client-go/informers/factory.go index 75a641b246cea..873d04f511357 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/factory.go +++ b/vendor/github.com/kcp-dev/client-go/informers/factory.go @@ -27,7 +27,7 @@ import ( "time" kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -58,7 +58,12 @@ import ( ) // SharedInformerOption defines the functional option type for SharedInformerFactory. -type SharedInformerOption func(*sharedInformerFactory) *sharedInformerFactory +type SharedInformerOption func(*SharedInformerOptions) *SharedInformerOptions + +type SharedInformerOptions struct { + customResync map[reflect.Type]time.Duration + tweakListOptions internalinterfaces.TweakListOptionsFunc +} type sharedInformerFactory struct { client clientset.ClusterInterface @@ -75,19 +80,19 @@ type sharedInformerFactory struct { // WithCustomResyncConfig sets a custom resync period for the specified informer types. func WithCustomResyncConfig(resyncConfig map[metav1.Object]time.Duration) SharedInformerOption { - return func(factory *sharedInformerFactory) *sharedInformerFactory { + return func(opts *SharedInformerOptions) *SharedInformerOptions { for k, v := range resyncConfig { - factory.customResync[reflect.TypeOf(k)] = v + opts.customResync[reflect.TypeOf(k)] = v } - return factory + return opts } } // WithTweakListOptions sets a custom filter on all listers of the configured SharedInformerFactory. func WithTweakListOptions(tweakListOptions internalinterfaces.TweakListOptionsFunc) SharedInformerOption { - return func(factory *sharedInformerFactory) *sharedInformerFactory { - factory.tweakListOptions = tweakListOptions - return factory + return func(opts *SharedInformerOptions) *SharedInformerOptions { + opts.tweakListOptions = tweakListOptions + return opts } } @@ -106,11 +111,19 @@ func NewSharedInformerFactoryWithOptions(client clientset.ClusterInterface, defa customResync: make(map[reflect.Type]time.Duration), } + opts := &SharedInformerOptions{ + customResync: make(map[reflect.Type]time.Duration), + } + // Apply all options for _, opt := range options { - factory = opt(factory) + opts = opt(opts) } + // Forward options to the factory + factory.customResync = opts.customResync + factory.tweakListOptions = opts.tweakListOptions + return factory } @@ -149,7 +162,7 @@ func (f *sharedInformerFactory) WaitForCacheSync(stopCh <-chan struct{}) map[ref return res } -// InternalInformerFor returns the SharedIndexInformer for obj using an internal +// InformerFor returns the SharedIndexInformer for obj using an internal // client. func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) kcpcache.ScopeableSharedIndexInformer { f.lock.Lock() diff --git a/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1alpha1/flowschema.go b/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1alpha1/flowschema.go index b3560fffbbf17..108d09c5d3d52 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1alpha1/flowschema.go +++ b/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1alpha1/flowschema.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1alpha1 "k8s.io/api/flowcontrol/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1alpha1/prioritylevelconfiguration.go b/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1alpha1/prioritylevelconfiguration.go index 757453f4c7674..32579b6b7368d 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1alpha1/prioritylevelconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1alpha1/prioritylevelconfiguration.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1alpha1 "k8s.io/api/flowcontrol/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta1/flowschema.go b/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta1/flowschema.go index 5b667624fc79d..56bdec7d72d6c 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta1/flowschema.go +++ b/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta1/flowschema.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta1/prioritylevelconfiguration.go b/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta1/prioritylevelconfiguration.go index c91e4f607061c..20e529c397ab4 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta1/prioritylevelconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta1/prioritylevelconfiguration.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta2/flowschema.go b/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta2/flowschema.go index b6e63df4e8326..619b3667aee41 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta2/flowschema.go +++ b/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta2/flowschema.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta2/prioritylevelconfiguration.go b/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta2/prioritylevelconfiguration.go index d5abd7a5489c2..35739e86e73c9 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta2/prioritylevelconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/informers/flowcontrol/v1beta2/prioritylevelconfiguration.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/generic.go b/vendor/github.com/kcp-dev/client-go/informers/generic.go index b12c33981275e..bfa04e2abd3ae 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/generic.go +++ b/vendor/github.com/kcp-dev/client-go/informers/generic.go @@ -25,7 +25,7 @@ import ( "fmt" kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/internalinterfaces/factory_interfaces.go b/vendor/github.com/kcp-dev/client-go/informers/internalinterfaces/factory_interfaces.go index d85899e95f8d0..7d8edfe8b15b1 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/internalinterfaces/factory_interfaces.go +++ b/vendor/github.com/kcp-dev/client-go/informers/internalinterfaces/factory_interfaces.go @@ -26,14 +26,14 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" - client "github.com/kcp-dev/client-go/kubernetes" + clientset "github.com/kcp-dev/client-go/kubernetes" ) -// NewInformerFunc takes client.ClusterInterface and time.Duration to return a ScopeableSharedIndexInformer. -type NewInformerFunc func(client.ClusterInterface, time.Duration) kcpcache.ScopeableSharedIndexInformer +// NewInformerFunc takes clientset.ClusterInterface and time.Duration to return a ScopeableSharedIndexInformer. +type NewInformerFunc func(clientset.ClusterInterface, time.Duration) kcpcache.ScopeableSharedIndexInformer // SharedInformerFactory a small interface to allow for adding an informer without an import cycle type SharedInformerFactory interface { @@ -41,5 +41,5 @@ type SharedInformerFactory interface { InformerFor(obj runtime.Object, newFunc NewInformerFunc) kcpcache.ScopeableSharedIndexInformer } -// TweakListOptionsFunc is a function that transforms a v1.ListOptions. -type TweakListOptionsFunc func(*v1.ListOptions) +// TweakListOptionsFunc is a function that transforms a metav1.ListOptions. +type TweakListOptionsFunc func(*metav1.ListOptions) diff --git a/vendor/github.com/kcp-dev/client-go/informers/networking/v1/ingress.go b/vendor/github.com/kcp-dev/client-go/informers/networking/v1/ingress.go index 7affd5ae5ca4c..33dc4bf726475 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/networking/v1/ingress.go +++ b/vendor/github.com/kcp-dev/client-go/informers/networking/v1/ingress.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/networking/v1/ingressclass.go b/vendor/github.com/kcp-dev/client-go/informers/networking/v1/ingressclass.go index e974adb7849c7..c7bfcce0d74d4 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/networking/v1/ingressclass.go +++ b/vendor/github.com/kcp-dev/client-go/informers/networking/v1/ingressclass.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/networking/v1/networkpolicy.go b/vendor/github.com/kcp-dev/client-go/informers/networking/v1/networkpolicy.go index 25fba37430682..e7f97b87a2d33 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/networking/v1/networkpolicy.go +++ b/vendor/github.com/kcp-dev/client-go/informers/networking/v1/networkpolicy.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/networking/v1beta1/ingress.go b/vendor/github.com/kcp-dev/client-go/informers/networking/v1beta1/ingress.go index 4c302706318ed..5b8aef20a7915 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/networking/v1beta1/ingress.go +++ b/vendor/github.com/kcp-dev/client-go/informers/networking/v1beta1/ingress.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1beta1 "k8s.io/api/networking/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/networking/v1beta1/ingressclass.go b/vendor/github.com/kcp-dev/client-go/informers/networking/v1beta1/ingressclass.go index 4c02f86da60b7..dd52cab72760d 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/networking/v1beta1/ingressclass.go +++ b/vendor/github.com/kcp-dev/client-go/informers/networking/v1beta1/ingressclass.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1beta1 "k8s.io/api/networking/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/node/v1/runtimeclass.go b/vendor/github.com/kcp-dev/client-go/informers/node/v1/runtimeclass.go index 9d5740e82b11e..4adc620d7bad9 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/node/v1/runtimeclass.go +++ b/vendor/github.com/kcp-dev/client-go/informers/node/v1/runtimeclass.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" nodev1 "k8s.io/api/node/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/node/v1alpha1/runtimeclass.go b/vendor/github.com/kcp-dev/client-go/informers/node/v1alpha1/runtimeclass.go index 6e908a327677d..6d88d24d9be8e 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/node/v1alpha1/runtimeclass.go +++ b/vendor/github.com/kcp-dev/client-go/informers/node/v1alpha1/runtimeclass.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" nodev1alpha1 "k8s.io/api/node/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/node/v1beta1/runtimeclass.go b/vendor/github.com/kcp-dev/client-go/informers/node/v1beta1/runtimeclass.go index 1dc62e78e9fa9..475effc635319 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/node/v1beta1/runtimeclass.go +++ b/vendor/github.com/kcp-dev/client-go/informers/node/v1beta1/runtimeclass.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" nodev1beta1 "k8s.io/api/node/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/policy/v1/poddisruptionbudget.go b/vendor/github.com/kcp-dev/client-go/informers/policy/v1/poddisruptionbudget.go index 58f5350a01be8..11abea11a18c2 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/policy/v1/poddisruptionbudget.go +++ b/vendor/github.com/kcp-dev/client-go/informers/policy/v1/poddisruptionbudget.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" policyv1 "k8s.io/api/policy/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/policy/v1beta1/poddisruptionbudget.go b/vendor/github.com/kcp-dev/client-go/informers/policy/v1beta1/poddisruptionbudget.go index 1984ffc69528f..18ade598f0f3b 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/policy/v1beta1/poddisruptionbudget.go +++ b/vendor/github.com/kcp-dev/client-go/informers/policy/v1beta1/poddisruptionbudget.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" policyv1beta1 "k8s.io/api/policy/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/policy/v1beta1/podsecuritypolicy.go b/vendor/github.com/kcp-dev/client-go/informers/policy/v1beta1/podsecuritypolicy.go index 5be8462790d20..ba7cc46f498d6 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/policy/v1beta1/podsecuritypolicy.go +++ b/vendor/github.com/kcp-dev/client-go/informers/policy/v1beta1/podsecuritypolicy.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" policyv1beta1 "k8s.io/api/policy/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/clusterrole.go b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/clusterrole.go index 7f4efb543f5b3..fa3aaddecf31a 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/clusterrole.go +++ b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/clusterrole.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/clusterrolebinding.go b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/clusterrolebinding.go index 558d8f7a3c098..ee541becd7c67 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/clusterrolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/clusterrolebinding.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/role.go b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/role.go index e2e8084cb8ce2..4a9a277bddfb9 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/role.go +++ b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/role.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/rolebinding.go b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/rolebinding.go index e599c26cbbd7d..ee58732a4b872 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/rolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1/rolebinding.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/clusterrole.go b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/clusterrole.go index ee0af44bb6e7e..bdbb7e8dc2871 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/clusterrole.go +++ b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/clusterrole.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/clusterrolebinding.go b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/clusterrolebinding.go index 37777853e5421..a8691ae1047bb 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/clusterrolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/clusterrolebinding.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/role.go b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/role.go index a8e202ce2b8fa..2e9e87662c437 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/role.go +++ b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/role.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/rolebinding.go b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/rolebinding.go index 253fb7b0fa878..a1abeea999e8c 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/rolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1alpha1/rolebinding.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/clusterrole.go b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/clusterrole.go index c4053cc6b10ea..ffa572aef0bbf 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/clusterrole.go +++ b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/clusterrole.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1beta1 "k8s.io/api/rbac/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/clusterrolebinding.go b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/clusterrolebinding.go index c79976cbb37a0..0f6d805b847ff 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/clusterrolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/clusterrolebinding.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1beta1 "k8s.io/api/rbac/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/role.go b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/role.go index f6264f2cd879a..acd87ea1ebf48 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/role.go +++ b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/role.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1beta1 "k8s.io/api/rbac/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/rolebinding.go b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/rolebinding.go index 178d83e37dd47..8a45c67e9404b 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/rolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/informers/rbac/v1beta1/rolebinding.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1beta1 "k8s.io/api/rbac/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/scheduling/v1/priorityclass.go b/vendor/github.com/kcp-dev/client-go/informers/scheduling/v1/priorityclass.go index 4c5d03ed3fc2f..6da9f950102fa 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/scheduling/v1/priorityclass.go +++ b/vendor/github.com/kcp-dev/client-go/informers/scheduling/v1/priorityclass.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" schedulingv1 "k8s.io/api/scheduling/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/scheduling/v1alpha1/priorityclass.go b/vendor/github.com/kcp-dev/client-go/informers/scheduling/v1alpha1/priorityclass.go index 9b34985383bc7..038152c95b6d5 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/scheduling/v1alpha1/priorityclass.go +++ b/vendor/github.com/kcp-dev/client-go/informers/scheduling/v1alpha1/priorityclass.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" schedulingv1alpha1 "k8s.io/api/scheduling/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/scheduling/v1beta1/priorityclass.go b/vendor/github.com/kcp-dev/client-go/informers/scheduling/v1beta1/priorityclass.go index 871c30b51d685..e5af66081db0e 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/scheduling/v1beta1/priorityclass.go +++ b/vendor/github.com/kcp-dev/client-go/informers/scheduling/v1beta1/priorityclass.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" schedulingv1beta1 "k8s.io/api/scheduling/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/storage/v1/csidriver.go b/vendor/github.com/kcp-dev/client-go/informers/storage/v1/csidriver.go index 5b92c936aa7d6..d56ca10cf82bc 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/storage/v1/csidriver.go +++ b/vendor/github.com/kcp-dev/client-go/informers/storage/v1/csidriver.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/storage/v1/csinode.go b/vendor/github.com/kcp-dev/client-go/informers/storage/v1/csinode.go index 03127aa65eaf3..9d0084959e146 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/storage/v1/csinode.go +++ b/vendor/github.com/kcp-dev/client-go/informers/storage/v1/csinode.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/storage/v1/csistoragecapacity.go b/vendor/github.com/kcp-dev/client-go/informers/storage/v1/csistoragecapacity.go index 0412371d29177..9ab74d505da40 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/storage/v1/csistoragecapacity.go +++ b/vendor/github.com/kcp-dev/client-go/informers/storage/v1/csistoragecapacity.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/storage/v1/storageclass.go b/vendor/github.com/kcp-dev/client-go/informers/storage/v1/storageclass.go index 081c48178ca6f..f728f67f00868 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/storage/v1/storageclass.go +++ b/vendor/github.com/kcp-dev/client-go/informers/storage/v1/storageclass.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/storage/v1/volumeattachment.go b/vendor/github.com/kcp-dev/client-go/informers/storage/v1/volumeattachment.go index 0b7380f244a24..d2d6619352eaa 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/storage/v1/volumeattachment.go +++ b/vendor/github.com/kcp-dev/client-go/informers/storage/v1/volumeattachment.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/storage/v1alpha1/csistoragecapacity.go b/vendor/github.com/kcp-dev/client-go/informers/storage/v1alpha1/csistoragecapacity.go index 8246072597fd3..623d689f050af 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/storage/v1alpha1/csistoragecapacity.go +++ b/vendor/github.com/kcp-dev/client-go/informers/storage/v1alpha1/csistoragecapacity.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1alpha1 "k8s.io/api/storage/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/storage/v1alpha1/volumeattachment.go b/vendor/github.com/kcp-dev/client-go/informers/storage/v1alpha1/volumeattachment.go index f864cb08843db..72680543bb0a2 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/storage/v1alpha1/volumeattachment.go +++ b/vendor/github.com/kcp-dev/client-go/informers/storage/v1alpha1/volumeattachment.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1alpha1 "k8s.io/api/storage/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/csidriver.go b/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/csidriver.go index 5a3ad7cf3401c..691710bc3427b 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/csidriver.go +++ b/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/csidriver.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/csinode.go b/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/csinode.go index ed42e92cd49ab..cc4ee1ea428b3 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/csinode.go +++ b/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/csinode.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/csistoragecapacity.go b/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/csistoragecapacity.go index cfd76279b82b8..fee540f90ef22 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/csistoragecapacity.go +++ b/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/csistoragecapacity.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/storageclass.go b/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/storageclass.go index 563fd2fa0b92a..c3c24dfbaec9d 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/storageclass.go +++ b/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/storageclass.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/volumeattachment.go b/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/volumeattachment.go index 3a74f5c2d62be..b03dcf2538ae7 100644 --- a/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/volumeattachment.go +++ b/vendor/github.com/kcp-dev/client-go/informers/storage/v1beta1/volumeattachment.go @@ -27,7 +27,7 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" kcpinformers "github.com/kcp-dev/apimachinery/third_party/informers" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/clientset.go b/vendor/github.com/kcp-dev/client-go/kubernetes/clientset.go index 2ab509c20089b..c81f14f0816a6 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/clientset.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/clientset.go @@ -26,7 +26,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" "k8s.io/client-go/discovery" client "k8s.io/client-go/kubernetes" @@ -81,7 +81,7 @@ import ( ) type ClusterInterface interface { - Cluster(logicalcluster.Name) client.Interface + Cluster(logicalcluster.Path) client.Interface Discovery() discovery.DiscoveryInterface AdmissionregistrationV1() admissionregistrationv1.AdmissionregistrationV1ClusterInterface AdmissionregistrationV1beta1() admissionregistrationv1beta1.AdmissionregistrationV1beta1ClusterInterface @@ -415,11 +415,11 @@ func (c *ClusterClientset) StorageV1beta1() storagev1beta1.StorageV1beta1Cluster } // Cluster scopes this clientset to one cluster. -func (c *ClusterClientset) Cluster(name logicalcluster.Name) client.Interface { - if name == logicalcluster.Wildcard { +func (c *ClusterClientset) Cluster(path logicalcluster.Path) client.Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } // NewForConfig creates a new ClusterClientset for the given config. diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1/admissionregistration_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1/admissionregistration_client.go index 0d49b0c69a803..78b9eb950c690 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1/admissionregistration_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1/admissionregistration_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1" "k8s.io/client-go/rest" @@ -38,18 +38,18 @@ type AdmissionregistrationV1ClusterInterface interface { } type AdmissionregistrationV1ClusterScoper interface { - Cluster(logicalcluster.Name) admissionregistrationv1.AdmissionregistrationV1Interface + Cluster(logicalcluster.Path) admissionregistrationv1.AdmissionregistrationV1Interface } type AdmissionregistrationV1ClusterClient struct { clientCache kcpclient.Cache[*admissionregistrationv1.AdmissionregistrationV1Client] } -func (c *AdmissionregistrationV1ClusterClient) Cluster(name logicalcluster.Name) admissionregistrationv1.AdmissionregistrationV1Interface { - if name == logicalcluster.Wildcard { +func (c *AdmissionregistrationV1ClusterClient) Cluster(path logicalcluster.Path) admissionregistrationv1.AdmissionregistrationV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *AdmissionregistrationV1ClusterClient) ValidatingWebhookConfigurations() ValidatingWebhookConfigurationClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1/mutatingwebhookconfiguration.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1/mutatingwebhookconfiguration.go index eb31314a64cc6..a9f9227515b35 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1/mutatingwebhookconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1/mutatingwebhookconfiguration.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type MutatingWebhookConfigurationsClusterGetter interface { // MutatingWebhookConfigurationClusterInterface can operate on MutatingWebhookConfigurations across all clusters, // or scope down to one cluster and return a admissionregistrationv1client.MutatingWebhookConfigurationInterface. type MutatingWebhookConfigurationClusterInterface interface { - Cluster(logicalcluster.Name) admissionregistrationv1client.MutatingWebhookConfigurationInterface + Cluster(logicalcluster.Path) admissionregistrationv1client.MutatingWebhookConfigurationInterface List(ctx context.Context, opts metav1.ListOptions) (*admissionregistrationv1.MutatingWebhookConfigurationList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type mutatingWebhookConfigurationsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *mutatingWebhookConfigurationsClusterInterface) Cluster(name logicalcluster.Name) admissionregistrationv1client.MutatingWebhookConfigurationInterface { - if name == logicalcluster.Wildcard { +func (c *mutatingWebhookConfigurationsClusterInterface) Cluster(path logicalcluster.Path) admissionregistrationv1client.MutatingWebhookConfigurationInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).MutatingWebhookConfigurations() + return c.clientCache.ClusterOrDie(path).MutatingWebhookConfigurations() } // List returns the entire collection of all MutatingWebhookConfigurations across all clusters. func (c *mutatingWebhookConfigurationsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*admissionregistrationv1.MutatingWebhookConfigurationList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).MutatingWebhookConfigurations().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).MutatingWebhookConfigurations().List(ctx, opts) } // Watch begins to watch all MutatingWebhookConfigurations across all clusters. func (c *mutatingWebhookConfigurationsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).MutatingWebhookConfigurations().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).MutatingWebhookConfigurations().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1/validatingwebhookconfiguration.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1/validatingwebhookconfiguration.go index 5a59a7fcd0ac0..6970fcad2220c 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1/validatingwebhookconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1/validatingwebhookconfiguration.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ValidatingWebhookConfigurationsClusterGetter interface { // ValidatingWebhookConfigurationClusterInterface can operate on ValidatingWebhookConfigurations across all clusters, // or scope down to one cluster and return a admissionregistrationv1client.ValidatingWebhookConfigurationInterface. type ValidatingWebhookConfigurationClusterInterface interface { - Cluster(logicalcluster.Name) admissionregistrationv1client.ValidatingWebhookConfigurationInterface + Cluster(logicalcluster.Path) admissionregistrationv1client.ValidatingWebhookConfigurationInterface List(ctx context.Context, opts metav1.ListOptions) (*admissionregistrationv1.ValidatingWebhookConfigurationList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type validatingWebhookConfigurationsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *validatingWebhookConfigurationsClusterInterface) Cluster(name logicalcluster.Name) admissionregistrationv1client.ValidatingWebhookConfigurationInterface { - if name == logicalcluster.Wildcard { +func (c *validatingWebhookConfigurationsClusterInterface) Cluster(path logicalcluster.Path) admissionregistrationv1client.ValidatingWebhookConfigurationInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).ValidatingWebhookConfigurations() + return c.clientCache.ClusterOrDie(path).ValidatingWebhookConfigurations() } // List returns the entire collection of all ValidatingWebhookConfigurations across all clusters. func (c *validatingWebhookConfigurationsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*admissionregistrationv1.ValidatingWebhookConfigurationList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ValidatingWebhookConfigurations().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ValidatingWebhookConfigurations().List(ctx, opts) } // Watch begins to watch all ValidatingWebhookConfigurations across all clusters. func (c *validatingWebhookConfigurationsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ValidatingWebhookConfigurations().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ValidatingWebhookConfigurations().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1beta1/admissionregistration_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1beta1/admissionregistration_client.go index 17dfbed3b54ce..ba95643cbd224 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1beta1/admissionregistration_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1beta1/admissionregistration_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1beta1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1" "k8s.io/client-go/rest" @@ -38,18 +38,18 @@ type AdmissionregistrationV1beta1ClusterInterface interface { } type AdmissionregistrationV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) admissionregistrationv1beta1.AdmissionregistrationV1beta1Interface + Cluster(logicalcluster.Path) admissionregistrationv1beta1.AdmissionregistrationV1beta1Interface } type AdmissionregistrationV1beta1ClusterClient struct { clientCache kcpclient.Cache[*admissionregistrationv1beta1.AdmissionregistrationV1beta1Client] } -func (c *AdmissionregistrationV1beta1ClusterClient) Cluster(name logicalcluster.Name) admissionregistrationv1beta1.AdmissionregistrationV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *AdmissionregistrationV1beta1ClusterClient) Cluster(path logicalcluster.Path) admissionregistrationv1beta1.AdmissionregistrationV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *AdmissionregistrationV1beta1ClusterClient) ValidatingWebhookConfigurations() ValidatingWebhookConfigurationClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1beta1/mutatingwebhookconfiguration.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1beta1/mutatingwebhookconfiguration.go index febd1726ee98c..f7ac093a32afd 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1beta1/mutatingwebhookconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1beta1/mutatingwebhookconfiguration.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type MutatingWebhookConfigurationsClusterGetter interface { // MutatingWebhookConfigurationClusterInterface can operate on MutatingWebhookConfigurations across all clusters, // or scope down to one cluster and return a admissionregistrationv1beta1client.MutatingWebhookConfigurationInterface. type MutatingWebhookConfigurationClusterInterface interface { - Cluster(logicalcluster.Name) admissionregistrationv1beta1client.MutatingWebhookConfigurationInterface + Cluster(logicalcluster.Path) admissionregistrationv1beta1client.MutatingWebhookConfigurationInterface List(ctx context.Context, opts metav1.ListOptions) (*admissionregistrationv1beta1.MutatingWebhookConfigurationList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type mutatingWebhookConfigurationsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *mutatingWebhookConfigurationsClusterInterface) Cluster(name logicalcluster.Name) admissionregistrationv1beta1client.MutatingWebhookConfigurationInterface { - if name == logicalcluster.Wildcard { +func (c *mutatingWebhookConfigurationsClusterInterface) Cluster(path logicalcluster.Path) admissionregistrationv1beta1client.MutatingWebhookConfigurationInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).MutatingWebhookConfigurations() + return c.clientCache.ClusterOrDie(path).MutatingWebhookConfigurations() } // List returns the entire collection of all MutatingWebhookConfigurations across all clusters. func (c *mutatingWebhookConfigurationsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*admissionregistrationv1beta1.MutatingWebhookConfigurationList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).MutatingWebhookConfigurations().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).MutatingWebhookConfigurations().List(ctx, opts) } // Watch begins to watch all MutatingWebhookConfigurations across all clusters. func (c *mutatingWebhookConfigurationsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).MutatingWebhookConfigurations().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).MutatingWebhookConfigurations().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingwebhookconfiguration.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingwebhookconfiguration.go index e3371acf42b57..f6d1aba779704 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingwebhookconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingwebhookconfiguration.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ValidatingWebhookConfigurationsClusterGetter interface { // ValidatingWebhookConfigurationClusterInterface can operate on ValidatingWebhookConfigurations across all clusters, // or scope down to one cluster and return a admissionregistrationv1beta1client.ValidatingWebhookConfigurationInterface. type ValidatingWebhookConfigurationClusterInterface interface { - Cluster(logicalcluster.Name) admissionregistrationv1beta1client.ValidatingWebhookConfigurationInterface + Cluster(logicalcluster.Path) admissionregistrationv1beta1client.ValidatingWebhookConfigurationInterface List(ctx context.Context, opts metav1.ListOptions) (*admissionregistrationv1beta1.ValidatingWebhookConfigurationList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type validatingWebhookConfigurationsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *validatingWebhookConfigurationsClusterInterface) Cluster(name logicalcluster.Name) admissionregistrationv1beta1client.ValidatingWebhookConfigurationInterface { - if name == logicalcluster.Wildcard { +func (c *validatingWebhookConfigurationsClusterInterface) Cluster(path logicalcluster.Path) admissionregistrationv1beta1client.ValidatingWebhookConfigurationInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).ValidatingWebhookConfigurations() + return c.clientCache.ClusterOrDie(path).ValidatingWebhookConfigurations() } // List returns the entire collection of all ValidatingWebhookConfigurations across all clusters. func (c *validatingWebhookConfigurationsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*admissionregistrationv1beta1.ValidatingWebhookConfigurationList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ValidatingWebhookConfigurations().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ValidatingWebhookConfigurations().List(ctx, opts) } // Watch begins to watch all ValidatingWebhookConfigurations across all clusters. func (c *validatingWebhookConfigurationsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ValidatingWebhookConfigurations().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ValidatingWebhookConfigurations().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apiserverinternal/v1alpha1/apiserverinternal_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apiserverinternal/v1alpha1/apiserverinternal_client.go index fc47eefd610fd..4ec8c214c5425 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apiserverinternal/v1alpha1/apiserverinternal_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apiserverinternal/v1alpha1/apiserverinternal_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" internalv1alpha1 "k8s.io/client-go/kubernetes/typed/apiserverinternal/v1alpha1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type InternalV1alpha1ClusterInterface interface { } type InternalV1alpha1ClusterScoper interface { - Cluster(logicalcluster.Name) internalv1alpha1.InternalV1alpha1Interface + Cluster(logicalcluster.Path) internalv1alpha1.InternalV1alpha1Interface } type InternalV1alpha1ClusterClient struct { clientCache kcpclient.Cache[*internalv1alpha1.InternalV1alpha1Client] } -func (c *InternalV1alpha1ClusterClient) Cluster(name logicalcluster.Name) internalv1alpha1.InternalV1alpha1Interface { - if name == logicalcluster.Wildcard { +func (c *InternalV1alpha1ClusterClient) Cluster(path logicalcluster.Path) internalv1alpha1.InternalV1alpha1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *InternalV1alpha1ClusterClient) StorageVersions() StorageVersionClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apiserverinternal/v1alpha1/storageversion.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apiserverinternal/v1alpha1/storageversion.go index 2ff85ef79d6f0..46e94b2e9a423 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apiserverinternal/v1alpha1/storageversion.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apiserverinternal/v1alpha1/storageversion.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" internalv1alpha1 "k8s.io/api/apiserverinternal/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type StorageVersionsClusterGetter interface { // StorageVersionClusterInterface can operate on StorageVersions across all clusters, // or scope down to one cluster and return a internalv1alpha1client.StorageVersionInterface. type StorageVersionClusterInterface interface { - Cluster(logicalcluster.Name) internalv1alpha1client.StorageVersionInterface + Cluster(logicalcluster.Path) internalv1alpha1client.StorageVersionInterface List(ctx context.Context, opts metav1.ListOptions) (*internalv1alpha1.StorageVersionList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type storageVersionsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *storageVersionsClusterInterface) Cluster(name logicalcluster.Name) internalv1alpha1client.StorageVersionInterface { - if name == logicalcluster.Wildcard { +func (c *storageVersionsClusterInterface) Cluster(path logicalcluster.Path) internalv1alpha1client.StorageVersionInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).StorageVersions() + return c.clientCache.ClusterOrDie(path).StorageVersions() } // List returns the entire collection of all StorageVersions across all clusters. func (c *storageVersionsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*internalv1alpha1.StorageVersionList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).StorageVersions().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).StorageVersions().List(ctx, opts) } // Watch begins to watch all StorageVersions across all clusters. func (c *storageVersionsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).StorageVersions().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).StorageVersions().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/apps_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/apps_client.go index ebf87bf28db9c..b6ff90210c9a6 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/apps_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/apps_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/client-go/kubernetes/typed/apps/v1" "k8s.io/client-go/rest" @@ -41,18 +41,18 @@ type AppsV1ClusterInterface interface { } type AppsV1ClusterScoper interface { - Cluster(logicalcluster.Name) appsv1.AppsV1Interface + Cluster(logicalcluster.Path) appsv1.AppsV1Interface } type AppsV1ClusterClient struct { clientCache kcpclient.Cache[*appsv1.AppsV1Client] } -func (c *AppsV1ClusterClient) Cluster(name logicalcluster.Name) appsv1.AppsV1Interface { - if name == logicalcluster.Wildcard { +func (c *AppsV1ClusterClient) Cluster(path logicalcluster.Path) appsv1.AppsV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *AppsV1ClusterClient) StatefulSets() StatefulSetClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/controllerrevision.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/controllerrevision.go index 1289e668bf3c8..34ed074468d99 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/controllerrevision.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/controllerrevision.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ControllerRevisionsClusterGetter interface { // ControllerRevisionClusterInterface can operate on ControllerRevisions across all clusters, // or scope down to one cluster and return a ControllerRevisionsNamespacer. type ControllerRevisionClusterInterface interface { - Cluster(logicalcluster.Name) ControllerRevisionsNamespacer + Cluster(logicalcluster.Path) ControllerRevisionsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*appsv1.ControllerRevisionList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type controllerRevisionsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *controllerRevisionsClusterInterface) Cluster(name logicalcluster.Name) ControllerRevisionsNamespacer { - if name == logicalcluster.Wildcard { +func (c *controllerRevisionsClusterInterface) Cluster(path logicalcluster.Path) ControllerRevisionsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &controllerRevisionsNamespacer{clientCache: c.clientCache, name: name} + return &controllerRevisionsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all ControllerRevisions across all clusters. func (c *controllerRevisionsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*appsv1.ControllerRevisionList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ControllerRevisions(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ControllerRevisions(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all ControllerRevisions across all clusters. func (c *controllerRevisionsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ControllerRevisions(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ControllerRevisions(metav1.NamespaceAll).Watch(ctx, opts) } // ControllerRevisionsNamespacer can scope to objects within a namespace, returning a appsv1client.ControllerRevisionInterface. @@ -77,9 +77,9 @@ type ControllerRevisionsNamespacer interface { type controllerRevisionsNamespacer struct { clientCache kcpclient.Cache[*appsv1client.AppsV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *controllerRevisionsNamespacer) Namespace(namespace string) appsv1client.ControllerRevisionInterface { - return n.clientCache.ClusterOrDie(n.name).ControllerRevisions(namespace) + return n.clientCache.ClusterOrDie(n.path).ControllerRevisions(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/daemonset.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/daemonset.go index 7867e797cb0bf..b3322b01256b3 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/daemonset.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/daemonset.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type DaemonSetsClusterGetter interface { // DaemonSetClusterInterface can operate on DaemonSets across all clusters, // or scope down to one cluster and return a DaemonSetsNamespacer. type DaemonSetClusterInterface interface { - Cluster(logicalcluster.Name) DaemonSetsNamespacer + Cluster(logicalcluster.Path) DaemonSetsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*appsv1.DaemonSetList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type daemonSetsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *daemonSetsClusterInterface) Cluster(name logicalcluster.Name) DaemonSetsNamespacer { - if name == logicalcluster.Wildcard { +func (c *daemonSetsClusterInterface) Cluster(path logicalcluster.Path) DaemonSetsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &daemonSetsNamespacer{clientCache: c.clientCache, name: name} + return &daemonSetsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all DaemonSets across all clusters. func (c *daemonSetsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*appsv1.DaemonSetList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).DaemonSets(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).DaemonSets(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all DaemonSets across all clusters. func (c *daemonSetsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).DaemonSets(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).DaemonSets(metav1.NamespaceAll).Watch(ctx, opts) } // DaemonSetsNamespacer can scope to objects within a namespace, returning a appsv1client.DaemonSetInterface. @@ -77,9 +77,9 @@ type DaemonSetsNamespacer interface { type daemonSetsNamespacer struct { clientCache kcpclient.Cache[*appsv1client.AppsV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *daemonSetsNamespacer) Namespace(namespace string) appsv1client.DaemonSetInterface { - return n.clientCache.ClusterOrDie(n.name).DaemonSets(namespace) + return n.clientCache.ClusterOrDie(n.path).DaemonSets(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/deployment.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/deployment.go index 5e660cd73b58c..495e8378e9eae 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/deployment.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/deployment.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type DeploymentsClusterGetter interface { // DeploymentClusterInterface can operate on Deployments across all clusters, // or scope down to one cluster and return a DeploymentsNamespacer. type DeploymentClusterInterface interface { - Cluster(logicalcluster.Name) DeploymentsNamespacer + Cluster(logicalcluster.Path) DeploymentsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*appsv1.DeploymentList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type deploymentsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *deploymentsClusterInterface) Cluster(name logicalcluster.Name) DeploymentsNamespacer { - if name == logicalcluster.Wildcard { +func (c *deploymentsClusterInterface) Cluster(path logicalcluster.Path) DeploymentsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &deploymentsNamespacer{clientCache: c.clientCache, name: name} + return &deploymentsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Deployments across all clusters. func (c *deploymentsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*appsv1.DeploymentList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Deployments(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Deployments(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Deployments across all clusters. func (c *deploymentsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Deployments(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Deployments(metav1.NamespaceAll).Watch(ctx, opts) } // DeploymentsNamespacer can scope to objects within a namespace, returning a appsv1client.DeploymentInterface. @@ -77,9 +77,9 @@ type DeploymentsNamespacer interface { type deploymentsNamespacer struct { clientCache kcpclient.Cache[*appsv1client.AppsV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *deploymentsNamespacer) Namespace(namespace string) appsv1client.DeploymentInterface { - return n.clientCache.ClusterOrDie(n.name).Deployments(namespace) + return n.clientCache.ClusterOrDie(n.path).Deployments(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/replicaset.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/replicaset.go index 9a5436663c542..cf77934583cd6 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/replicaset.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/replicaset.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ReplicaSetsClusterGetter interface { // ReplicaSetClusterInterface can operate on ReplicaSets across all clusters, // or scope down to one cluster and return a ReplicaSetsNamespacer. type ReplicaSetClusterInterface interface { - Cluster(logicalcluster.Name) ReplicaSetsNamespacer + Cluster(logicalcluster.Path) ReplicaSetsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*appsv1.ReplicaSetList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type replicaSetsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *replicaSetsClusterInterface) Cluster(name logicalcluster.Name) ReplicaSetsNamespacer { - if name == logicalcluster.Wildcard { +func (c *replicaSetsClusterInterface) Cluster(path logicalcluster.Path) ReplicaSetsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &replicaSetsNamespacer{clientCache: c.clientCache, name: name} + return &replicaSetsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all ReplicaSets across all clusters. func (c *replicaSetsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*appsv1.ReplicaSetList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ReplicaSets(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ReplicaSets(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all ReplicaSets across all clusters. func (c *replicaSetsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ReplicaSets(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ReplicaSets(metav1.NamespaceAll).Watch(ctx, opts) } // ReplicaSetsNamespacer can scope to objects within a namespace, returning a appsv1client.ReplicaSetInterface. @@ -77,9 +77,9 @@ type ReplicaSetsNamespacer interface { type replicaSetsNamespacer struct { clientCache kcpclient.Cache[*appsv1client.AppsV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *replicaSetsNamespacer) Namespace(namespace string) appsv1client.ReplicaSetInterface { - return n.clientCache.ClusterOrDie(n.name).ReplicaSets(namespace) + return n.clientCache.ClusterOrDie(n.path).ReplicaSets(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/statefulset.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/statefulset.go index 98afe4523b887..5a3d024c833c1 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/statefulset.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1/statefulset.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type StatefulSetsClusterGetter interface { // StatefulSetClusterInterface can operate on StatefulSets across all clusters, // or scope down to one cluster and return a StatefulSetsNamespacer. type StatefulSetClusterInterface interface { - Cluster(logicalcluster.Name) StatefulSetsNamespacer + Cluster(logicalcluster.Path) StatefulSetsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*appsv1.StatefulSetList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type statefulSetsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *statefulSetsClusterInterface) Cluster(name logicalcluster.Name) StatefulSetsNamespacer { - if name == logicalcluster.Wildcard { +func (c *statefulSetsClusterInterface) Cluster(path logicalcluster.Path) StatefulSetsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &statefulSetsNamespacer{clientCache: c.clientCache, name: name} + return &statefulSetsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all StatefulSets across all clusters. func (c *statefulSetsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*appsv1.StatefulSetList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).StatefulSets(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).StatefulSets(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all StatefulSets across all clusters. func (c *statefulSetsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).StatefulSets(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).StatefulSets(metav1.NamespaceAll).Watch(ctx, opts) } // StatefulSetsNamespacer can scope to objects within a namespace, returning a appsv1client.StatefulSetInterface. @@ -77,9 +77,9 @@ type StatefulSetsNamespacer interface { type statefulSetsNamespacer struct { clientCache kcpclient.Cache[*appsv1client.AppsV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *statefulSetsNamespacer) Namespace(namespace string) appsv1client.StatefulSetInterface { - return n.clientCache.ClusterOrDie(n.name).StatefulSets(namespace) + return n.clientCache.ClusterOrDie(n.path).StatefulSets(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/apps_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/apps_client.go index 1fa4de3998c3f..bb091698f09f9 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/apps_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/apps_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta1 "k8s.io/client-go/kubernetes/typed/apps/v1beta1" "k8s.io/client-go/rest" @@ -39,18 +39,18 @@ type AppsV1beta1ClusterInterface interface { } type AppsV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) appsv1beta1.AppsV1beta1Interface + Cluster(logicalcluster.Path) appsv1beta1.AppsV1beta1Interface } type AppsV1beta1ClusterClient struct { clientCache kcpclient.Cache[*appsv1beta1.AppsV1beta1Client] } -func (c *AppsV1beta1ClusterClient) Cluster(name logicalcluster.Name) appsv1beta1.AppsV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *AppsV1beta1ClusterClient) Cluster(path logicalcluster.Path) appsv1beta1.AppsV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *AppsV1beta1ClusterClient) StatefulSets() StatefulSetClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/controllerrevision.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/controllerrevision.go index 7747cb5803f76..423ff00708d77 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/controllerrevision.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/controllerrevision.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta1 "k8s.io/api/apps/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ControllerRevisionsClusterGetter interface { // ControllerRevisionClusterInterface can operate on ControllerRevisions across all clusters, // or scope down to one cluster and return a ControllerRevisionsNamespacer. type ControllerRevisionClusterInterface interface { - Cluster(logicalcluster.Name) ControllerRevisionsNamespacer + Cluster(logicalcluster.Path) ControllerRevisionsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta1.ControllerRevisionList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type controllerRevisionsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *controllerRevisionsClusterInterface) Cluster(name logicalcluster.Name) ControllerRevisionsNamespacer { - if name == logicalcluster.Wildcard { +func (c *controllerRevisionsClusterInterface) Cluster(path logicalcluster.Path) ControllerRevisionsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &controllerRevisionsNamespacer{clientCache: c.clientCache, name: name} + return &controllerRevisionsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all ControllerRevisions across all clusters. func (c *controllerRevisionsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta1.ControllerRevisionList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ControllerRevisions(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ControllerRevisions(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all ControllerRevisions across all clusters. func (c *controllerRevisionsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ControllerRevisions(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ControllerRevisions(metav1.NamespaceAll).Watch(ctx, opts) } // ControllerRevisionsNamespacer can scope to objects within a namespace, returning a appsv1beta1client.ControllerRevisionInterface. @@ -77,9 +77,9 @@ type ControllerRevisionsNamespacer interface { type controllerRevisionsNamespacer struct { clientCache kcpclient.Cache[*appsv1beta1client.AppsV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *controllerRevisionsNamespacer) Namespace(namespace string) appsv1beta1client.ControllerRevisionInterface { - return n.clientCache.ClusterOrDie(n.name).ControllerRevisions(namespace) + return n.clientCache.ClusterOrDie(n.path).ControllerRevisions(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/deployment.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/deployment.go index a06ccea87af6a..5cb79d2e2c892 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/deployment.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/deployment.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta1 "k8s.io/api/apps/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type DeploymentsClusterGetter interface { // DeploymentClusterInterface can operate on Deployments across all clusters, // or scope down to one cluster and return a DeploymentsNamespacer. type DeploymentClusterInterface interface { - Cluster(logicalcluster.Name) DeploymentsNamespacer + Cluster(logicalcluster.Path) DeploymentsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta1.DeploymentList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type deploymentsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *deploymentsClusterInterface) Cluster(name logicalcluster.Name) DeploymentsNamespacer { - if name == logicalcluster.Wildcard { +func (c *deploymentsClusterInterface) Cluster(path logicalcluster.Path) DeploymentsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &deploymentsNamespacer{clientCache: c.clientCache, name: name} + return &deploymentsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Deployments across all clusters. func (c *deploymentsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta1.DeploymentList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Deployments(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Deployments(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Deployments across all clusters. func (c *deploymentsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Deployments(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Deployments(metav1.NamespaceAll).Watch(ctx, opts) } // DeploymentsNamespacer can scope to objects within a namespace, returning a appsv1beta1client.DeploymentInterface. @@ -77,9 +77,9 @@ type DeploymentsNamespacer interface { type deploymentsNamespacer struct { clientCache kcpclient.Cache[*appsv1beta1client.AppsV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *deploymentsNamespacer) Namespace(namespace string) appsv1beta1client.DeploymentInterface { - return n.clientCache.ClusterOrDie(n.name).Deployments(namespace) + return n.clientCache.ClusterOrDie(n.path).Deployments(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/statefulset.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/statefulset.go index 9383ca537b74d..f8ee6b969ef54 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/statefulset.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta1/statefulset.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta1 "k8s.io/api/apps/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type StatefulSetsClusterGetter interface { // StatefulSetClusterInterface can operate on StatefulSets across all clusters, // or scope down to one cluster and return a StatefulSetsNamespacer. type StatefulSetClusterInterface interface { - Cluster(logicalcluster.Name) StatefulSetsNamespacer + Cluster(logicalcluster.Path) StatefulSetsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta1.StatefulSetList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type statefulSetsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *statefulSetsClusterInterface) Cluster(name logicalcluster.Name) StatefulSetsNamespacer { - if name == logicalcluster.Wildcard { +func (c *statefulSetsClusterInterface) Cluster(path logicalcluster.Path) StatefulSetsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &statefulSetsNamespacer{clientCache: c.clientCache, name: name} + return &statefulSetsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all StatefulSets across all clusters. func (c *statefulSetsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta1.StatefulSetList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).StatefulSets(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).StatefulSets(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all StatefulSets across all clusters. func (c *statefulSetsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).StatefulSets(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).StatefulSets(metav1.NamespaceAll).Watch(ctx, opts) } // StatefulSetsNamespacer can scope to objects within a namespace, returning a appsv1beta1client.StatefulSetInterface. @@ -77,9 +77,9 @@ type StatefulSetsNamespacer interface { type statefulSetsNamespacer struct { clientCache kcpclient.Cache[*appsv1beta1client.AppsV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *statefulSetsNamespacer) Namespace(namespace string) appsv1beta1client.StatefulSetInterface { - return n.clientCache.ClusterOrDie(n.name).StatefulSets(namespace) + return n.clientCache.ClusterOrDie(n.path).StatefulSets(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/apps_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/apps_client.go index de63cffd5bfc2..82c81e84ee764 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/apps_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/apps_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/client-go/kubernetes/typed/apps/v1beta2" "k8s.io/client-go/rest" @@ -41,18 +41,18 @@ type AppsV1beta2ClusterInterface interface { } type AppsV1beta2ClusterScoper interface { - Cluster(logicalcluster.Name) appsv1beta2.AppsV1beta2Interface + Cluster(logicalcluster.Path) appsv1beta2.AppsV1beta2Interface } type AppsV1beta2ClusterClient struct { clientCache kcpclient.Cache[*appsv1beta2.AppsV1beta2Client] } -func (c *AppsV1beta2ClusterClient) Cluster(name logicalcluster.Name) appsv1beta2.AppsV1beta2Interface { - if name == logicalcluster.Wildcard { +func (c *AppsV1beta2ClusterClient) Cluster(path logicalcluster.Path) appsv1beta2.AppsV1beta2Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *AppsV1beta2ClusterClient) StatefulSets() StatefulSetClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/controllerrevision.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/controllerrevision.go index 35b12a3059936..199d037b784c0 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/controllerrevision.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/controllerrevision.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ControllerRevisionsClusterGetter interface { // ControllerRevisionClusterInterface can operate on ControllerRevisions across all clusters, // or scope down to one cluster and return a ControllerRevisionsNamespacer. type ControllerRevisionClusterInterface interface { - Cluster(logicalcluster.Name) ControllerRevisionsNamespacer + Cluster(logicalcluster.Path) ControllerRevisionsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta2.ControllerRevisionList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type controllerRevisionsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *controllerRevisionsClusterInterface) Cluster(name logicalcluster.Name) ControllerRevisionsNamespacer { - if name == logicalcluster.Wildcard { +func (c *controllerRevisionsClusterInterface) Cluster(path logicalcluster.Path) ControllerRevisionsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &controllerRevisionsNamespacer{clientCache: c.clientCache, name: name} + return &controllerRevisionsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all ControllerRevisions across all clusters. func (c *controllerRevisionsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta2.ControllerRevisionList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ControllerRevisions(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ControllerRevisions(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all ControllerRevisions across all clusters. func (c *controllerRevisionsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ControllerRevisions(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ControllerRevisions(metav1.NamespaceAll).Watch(ctx, opts) } // ControllerRevisionsNamespacer can scope to objects within a namespace, returning a appsv1beta2client.ControllerRevisionInterface. @@ -77,9 +77,9 @@ type ControllerRevisionsNamespacer interface { type controllerRevisionsNamespacer struct { clientCache kcpclient.Cache[*appsv1beta2client.AppsV1beta2Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *controllerRevisionsNamespacer) Namespace(namespace string) appsv1beta2client.ControllerRevisionInterface { - return n.clientCache.ClusterOrDie(n.name).ControllerRevisions(namespace) + return n.clientCache.ClusterOrDie(n.path).ControllerRevisions(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/daemonset.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/daemonset.go index a085cab4395ed..9a59be9dff9a2 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/daemonset.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/daemonset.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type DaemonSetsClusterGetter interface { // DaemonSetClusterInterface can operate on DaemonSets across all clusters, // or scope down to one cluster and return a DaemonSetsNamespacer. type DaemonSetClusterInterface interface { - Cluster(logicalcluster.Name) DaemonSetsNamespacer + Cluster(logicalcluster.Path) DaemonSetsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta2.DaemonSetList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type daemonSetsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *daemonSetsClusterInterface) Cluster(name logicalcluster.Name) DaemonSetsNamespacer { - if name == logicalcluster.Wildcard { +func (c *daemonSetsClusterInterface) Cluster(path logicalcluster.Path) DaemonSetsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &daemonSetsNamespacer{clientCache: c.clientCache, name: name} + return &daemonSetsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all DaemonSets across all clusters. func (c *daemonSetsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta2.DaemonSetList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).DaemonSets(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).DaemonSets(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all DaemonSets across all clusters. func (c *daemonSetsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).DaemonSets(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).DaemonSets(metav1.NamespaceAll).Watch(ctx, opts) } // DaemonSetsNamespacer can scope to objects within a namespace, returning a appsv1beta2client.DaemonSetInterface. @@ -77,9 +77,9 @@ type DaemonSetsNamespacer interface { type daemonSetsNamespacer struct { clientCache kcpclient.Cache[*appsv1beta2client.AppsV1beta2Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *daemonSetsNamespacer) Namespace(namespace string) appsv1beta2client.DaemonSetInterface { - return n.clientCache.ClusterOrDie(n.name).DaemonSets(namespace) + return n.clientCache.ClusterOrDie(n.path).DaemonSets(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/deployment.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/deployment.go index 0d6d95bcfcd90..b372f08e7f822 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/deployment.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/deployment.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type DeploymentsClusterGetter interface { // DeploymentClusterInterface can operate on Deployments across all clusters, // or scope down to one cluster and return a DeploymentsNamespacer. type DeploymentClusterInterface interface { - Cluster(logicalcluster.Name) DeploymentsNamespacer + Cluster(logicalcluster.Path) DeploymentsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta2.DeploymentList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type deploymentsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *deploymentsClusterInterface) Cluster(name logicalcluster.Name) DeploymentsNamespacer { - if name == logicalcluster.Wildcard { +func (c *deploymentsClusterInterface) Cluster(path logicalcluster.Path) DeploymentsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &deploymentsNamespacer{clientCache: c.clientCache, name: name} + return &deploymentsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Deployments across all clusters. func (c *deploymentsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta2.DeploymentList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Deployments(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Deployments(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Deployments across all clusters. func (c *deploymentsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Deployments(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Deployments(metav1.NamespaceAll).Watch(ctx, opts) } // DeploymentsNamespacer can scope to objects within a namespace, returning a appsv1beta2client.DeploymentInterface. @@ -77,9 +77,9 @@ type DeploymentsNamespacer interface { type deploymentsNamespacer struct { clientCache kcpclient.Cache[*appsv1beta2client.AppsV1beta2Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *deploymentsNamespacer) Namespace(namespace string) appsv1beta2client.DeploymentInterface { - return n.clientCache.ClusterOrDie(n.name).Deployments(namespace) + return n.clientCache.ClusterOrDie(n.path).Deployments(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/replicaset.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/replicaset.go index 0bccacd85e355..bf5db2335c87e 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/replicaset.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/replicaset.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ReplicaSetsClusterGetter interface { // ReplicaSetClusterInterface can operate on ReplicaSets across all clusters, // or scope down to one cluster and return a ReplicaSetsNamespacer. type ReplicaSetClusterInterface interface { - Cluster(logicalcluster.Name) ReplicaSetsNamespacer + Cluster(logicalcluster.Path) ReplicaSetsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta2.ReplicaSetList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type replicaSetsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *replicaSetsClusterInterface) Cluster(name logicalcluster.Name) ReplicaSetsNamespacer { - if name == logicalcluster.Wildcard { +func (c *replicaSetsClusterInterface) Cluster(path logicalcluster.Path) ReplicaSetsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &replicaSetsNamespacer{clientCache: c.clientCache, name: name} + return &replicaSetsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all ReplicaSets across all clusters. func (c *replicaSetsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta2.ReplicaSetList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ReplicaSets(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ReplicaSets(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all ReplicaSets across all clusters. func (c *replicaSetsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ReplicaSets(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ReplicaSets(metav1.NamespaceAll).Watch(ctx, opts) } // ReplicaSetsNamespacer can scope to objects within a namespace, returning a appsv1beta2client.ReplicaSetInterface. @@ -77,9 +77,9 @@ type ReplicaSetsNamespacer interface { type replicaSetsNamespacer struct { clientCache kcpclient.Cache[*appsv1beta2client.AppsV1beta2Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *replicaSetsNamespacer) Namespace(namespace string) appsv1beta2client.ReplicaSetInterface { - return n.clientCache.ClusterOrDie(n.name).ReplicaSets(namespace) + return n.clientCache.ClusterOrDie(n.path).ReplicaSets(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/statefulset.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/statefulset.go index cbb48da85e974..ce014b13d583e 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/statefulset.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/apps/v1beta2/statefulset.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type StatefulSetsClusterGetter interface { // StatefulSetClusterInterface can operate on StatefulSets across all clusters, // or scope down to one cluster and return a StatefulSetsNamespacer. type StatefulSetClusterInterface interface { - Cluster(logicalcluster.Name) StatefulSetsNamespacer + Cluster(logicalcluster.Path) StatefulSetsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta2.StatefulSetList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type statefulSetsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *statefulSetsClusterInterface) Cluster(name logicalcluster.Name) StatefulSetsNamespacer { - if name == logicalcluster.Wildcard { +func (c *statefulSetsClusterInterface) Cluster(path logicalcluster.Path) StatefulSetsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &statefulSetsNamespacer{clientCache: c.clientCache, name: name} + return &statefulSetsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all StatefulSets across all clusters. func (c *statefulSetsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*appsv1beta2.StatefulSetList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).StatefulSets(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).StatefulSets(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all StatefulSets across all clusters. func (c *statefulSetsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).StatefulSets(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).StatefulSets(metav1.NamespaceAll).Watch(ctx, opts) } // StatefulSetsNamespacer can scope to objects within a namespace, returning a appsv1beta2client.StatefulSetInterface. @@ -77,9 +77,9 @@ type StatefulSetsNamespacer interface { type statefulSetsNamespacer struct { clientCache kcpclient.Cache[*appsv1beta2client.AppsV1beta2Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *statefulSetsNamespacer) Namespace(namespace string) appsv1beta2client.StatefulSetInterface { - return n.clientCache.ClusterOrDie(n.name).StatefulSets(namespace) + return n.clientCache.ClusterOrDie(n.path).StatefulSets(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1/authentication_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1/authentication_client.go index 0f0ea613f5f20..4fc581296d7a1 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1/authentication_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1/authentication_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" authenticationv1 "k8s.io/client-go/kubernetes/typed/authentication/v1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type AuthenticationV1ClusterInterface interface { } type AuthenticationV1ClusterScoper interface { - Cluster(logicalcluster.Name) authenticationv1.AuthenticationV1Interface + Cluster(logicalcluster.Path) authenticationv1.AuthenticationV1Interface } type AuthenticationV1ClusterClient struct { clientCache kcpclient.Cache[*authenticationv1.AuthenticationV1Client] } -func (c *AuthenticationV1ClusterClient) Cluster(name logicalcluster.Name) authenticationv1.AuthenticationV1Interface { - if name == logicalcluster.Wildcard { +func (c *AuthenticationV1ClusterClient) Cluster(path logicalcluster.Path) authenticationv1.AuthenticationV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *AuthenticationV1ClusterClient) TokenReviews() TokenReviewClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1/tokenreview.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1/tokenreview.go index 6addb88ec4c06..4d32372aff8ec 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1/tokenreview.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1/tokenreview.go @@ -23,7 +23,7 @@ package v1 import ( kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" authenticationv1client "k8s.io/client-go/kubernetes/typed/authentication/v1" ) @@ -36,7 +36,7 @@ type TokenReviewsClusterGetter interface { // TokenReviewClusterInterface can scope down to one cluster and return a authenticationv1client.TokenReviewInterface. type TokenReviewClusterInterface interface { - Cluster(logicalcluster.Name) authenticationv1client.TokenReviewInterface + Cluster(logicalcluster.Path) authenticationv1client.TokenReviewInterface } type tokenReviewsClusterInterface struct { @@ -44,10 +44,10 @@ type tokenReviewsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *tokenReviewsClusterInterface) Cluster(name logicalcluster.Name) authenticationv1client.TokenReviewInterface { - if name == logicalcluster.Wildcard { +func (c *tokenReviewsClusterInterface) Cluster(path logicalcluster.Path) authenticationv1client.TokenReviewInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).TokenReviews() + return c.clientCache.ClusterOrDie(path).TokenReviews() } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1beta1/authentication_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1beta1/authentication_client.go index 8de5d003d09e3..fa8e54d484fdb 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1beta1/authentication_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1beta1/authentication_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" authenticationv1beta1 "k8s.io/client-go/kubernetes/typed/authentication/v1beta1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type AuthenticationV1beta1ClusterInterface interface { } type AuthenticationV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) authenticationv1beta1.AuthenticationV1beta1Interface + Cluster(logicalcluster.Path) authenticationv1beta1.AuthenticationV1beta1Interface } type AuthenticationV1beta1ClusterClient struct { clientCache kcpclient.Cache[*authenticationv1beta1.AuthenticationV1beta1Client] } -func (c *AuthenticationV1beta1ClusterClient) Cluster(name logicalcluster.Name) authenticationv1beta1.AuthenticationV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *AuthenticationV1beta1ClusterClient) Cluster(path logicalcluster.Path) authenticationv1beta1.AuthenticationV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *AuthenticationV1beta1ClusterClient) TokenReviews() TokenReviewClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1beta1/tokenreview.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1beta1/tokenreview.go index f1e4b6af932f4..c5abf13403ad6 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1beta1/tokenreview.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authentication/v1beta1/tokenreview.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" authenticationv1beta1client "k8s.io/client-go/kubernetes/typed/authentication/v1beta1" ) @@ -36,7 +36,7 @@ type TokenReviewsClusterGetter interface { // TokenReviewClusterInterface can scope down to one cluster and return a authenticationv1beta1client.TokenReviewInterface. type TokenReviewClusterInterface interface { - Cluster(logicalcluster.Name) authenticationv1beta1client.TokenReviewInterface + Cluster(logicalcluster.Path) authenticationv1beta1client.TokenReviewInterface } type tokenReviewsClusterInterface struct { @@ -44,10 +44,10 @@ type tokenReviewsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *tokenReviewsClusterInterface) Cluster(name logicalcluster.Name) authenticationv1beta1client.TokenReviewInterface { - if name == logicalcluster.Wildcard { +func (c *tokenReviewsClusterInterface) Cluster(path logicalcluster.Path) authenticationv1beta1client.TokenReviewInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).TokenReviews() + return c.clientCache.ClusterOrDie(path).TokenReviews() } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/authorization_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/authorization_client.go index b8511646b8b7b..2a8a89996d798 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/authorization_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/authorization_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" authorizationv1 "k8s.io/client-go/kubernetes/typed/authorization/v1" "k8s.io/client-go/rest" @@ -40,18 +40,18 @@ type AuthorizationV1ClusterInterface interface { } type AuthorizationV1ClusterScoper interface { - Cluster(logicalcluster.Name) authorizationv1.AuthorizationV1Interface + Cluster(logicalcluster.Path) authorizationv1.AuthorizationV1Interface } type AuthorizationV1ClusterClient struct { clientCache kcpclient.Cache[*authorizationv1.AuthorizationV1Client] } -func (c *AuthorizationV1ClusterClient) Cluster(name logicalcluster.Name) authorizationv1.AuthorizationV1Interface { - if name == logicalcluster.Wildcard { +func (c *AuthorizationV1ClusterClient) Cluster(path logicalcluster.Path) authorizationv1.AuthorizationV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *AuthorizationV1ClusterClient) SubjectAccessReviews() SubjectAccessReviewClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/localsubjectaccessreview.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/localsubjectaccessreview.go index 25fbf0a719794..7b0f5be8d7ffb 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/localsubjectaccessreview.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/localsubjectaccessreview.go @@ -23,7 +23,7 @@ package v1 import ( kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" authorizationv1client "k8s.io/client-go/kubernetes/typed/authorization/v1" ) @@ -36,7 +36,7 @@ type LocalSubjectAccessReviewsClusterGetter interface { // LocalSubjectAccessReviewClusterInterface can scope down to one cluster and return a LocalSubjectAccessReviewsNamespacer. type LocalSubjectAccessReviewClusterInterface interface { - Cluster(logicalcluster.Name) LocalSubjectAccessReviewsNamespacer + Cluster(logicalcluster.Path) LocalSubjectAccessReviewsNamespacer } type localSubjectAccessReviewsClusterInterface struct { @@ -44,12 +44,12 @@ type localSubjectAccessReviewsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *localSubjectAccessReviewsClusterInterface) Cluster(name logicalcluster.Name) LocalSubjectAccessReviewsNamespacer { - if name == logicalcluster.Wildcard { +func (c *localSubjectAccessReviewsClusterInterface) Cluster(path logicalcluster.Path) LocalSubjectAccessReviewsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &localSubjectAccessReviewsNamespacer{clientCache: c.clientCache, name: name} + return &localSubjectAccessReviewsNamespacer{clientCache: c.clientCache, path: path} } // LocalSubjectAccessReviewsNamespacer can scope to objects within a namespace, returning a authorizationv1client.LocalSubjectAccessReviewInterface. @@ -59,9 +59,9 @@ type LocalSubjectAccessReviewsNamespacer interface { type localSubjectAccessReviewsNamespacer struct { clientCache kcpclient.Cache[*authorizationv1client.AuthorizationV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *localSubjectAccessReviewsNamespacer) Namespace(namespace string) authorizationv1client.LocalSubjectAccessReviewInterface { - return n.clientCache.ClusterOrDie(n.name).LocalSubjectAccessReviews(namespace) + return n.clientCache.ClusterOrDie(n.path).LocalSubjectAccessReviews(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/selfsubjectaccessreview.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/selfsubjectaccessreview.go index 6e0c669703a17..b3327a3214652 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/selfsubjectaccessreview.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/selfsubjectaccessreview.go @@ -23,7 +23,7 @@ package v1 import ( kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" authorizationv1client "k8s.io/client-go/kubernetes/typed/authorization/v1" ) @@ -36,7 +36,7 @@ type SelfSubjectAccessReviewsClusterGetter interface { // SelfSubjectAccessReviewClusterInterface can scope down to one cluster and return a authorizationv1client.SelfSubjectAccessReviewInterface. type SelfSubjectAccessReviewClusterInterface interface { - Cluster(logicalcluster.Name) authorizationv1client.SelfSubjectAccessReviewInterface + Cluster(logicalcluster.Path) authorizationv1client.SelfSubjectAccessReviewInterface } type selfSubjectAccessReviewsClusterInterface struct { @@ -44,10 +44,10 @@ type selfSubjectAccessReviewsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *selfSubjectAccessReviewsClusterInterface) Cluster(name logicalcluster.Name) authorizationv1client.SelfSubjectAccessReviewInterface { - if name == logicalcluster.Wildcard { +func (c *selfSubjectAccessReviewsClusterInterface) Cluster(path logicalcluster.Path) authorizationv1client.SelfSubjectAccessReviewInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).SelfSubjectAccessReviews() + return c.clientCache.ClusterOrDie(path).SelfSubjectAccessReviews() } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/selfsubjectrulesreview.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/selfsubjectrulesreview.go index aec5944c30fae..82aa6e9743eb3 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/selfsubjectrulesreview.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/selfsubjectrulesreview.go @@ -23,7 +23,7 @@ package v1 import ( kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" authorizationv1client "k8s.io/client-go/kubernetes/typed/authorization/v1" ) @@ -36,7 +36,7 @@ type SelfSubjectRulesReviewsClusterGetter interface { // SelfSubjectRulesReviewClusterInterface can scope down to one cluster and return a authorizationv1client.SelfSubjectRulesReviewInterface. type SelfSubjectRulesReviewClusterInterface interface { - Cluster(logicalcluster.Name) authorizationv1client.SelfSubjectRulesReviewInterface + Cluster(logicalcluster.Path) authorizationv1client.SelfSubjectRulesReviewInterface } type selfSubjectRulesReviewsClusterInterface struct { @@ -44,10 +44,10 @@ type selfSubjectRulesReviewsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *selfSubjectRulesReviewsClusterInterface) Cluster(name logicalcluster.Name) authorizationv1client.SelfSubjectRulesReviewInterface { - if name == logicalcluster.Wildcard { +func (c *selfSubjectRulesReviewsClusterInterface) Cluster(path logicalcluster.Path) authorizationv1client.SelfSubjectRulesReviewInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).SelfSubjectRulesReviews() + return c.clientCache.ClusterOrDie(path).SelfSubjectRulesReviews() } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/subjectaccessreview.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/subjectaccessreview.go index fd4142cb50aab..3370e3b765dc4 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/subjectaccessreview.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1/subjectaccessreview.go @@ -23,7 +23,7 @@ package v1 import ( kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" authorizationv1client "k8s.io/client-go/kubernetes/typed/authorization/v1" ) @@ -36,7 +36,7 @@ type SubjectAccessReviewsClusterGetter interface { // SubjectAccessReviewClusterInterface can scope down to one cluster and return a authorizationv1client.SubjectAccessReviewInterface. type SubjectAccessReviewClusterInterface interface { - Cluster(logicalcluster.Name) authorizationv1client.SubjectAccessReviewInterface + Cluster(logicalcluster.Path) authorizationv1client.SubjectAccessReviewInterface } type subjectAccessReviewsClusterInterface struct { @@ -44,10 +44,10 @@ type subjectAccessReviewsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *subjectAccessReviewsClusterInterface) Cluster(name logicalcluster.Name) authorizationv1client.SubjectAccessReviewInterface { - if name == logicalcluster.Wildcard { +func (c *subjectAccessReviewsClusterInterface) Cluster(path logicalcluster.Path) authorizationv1client.SubjectAccessReviewInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).SubjectAccessReviews() + return c.clientCache.ClusterOrDie(path).SubjectAccessReviews() } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/authorization_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/authorization_client.go index 85142bfff77e0..0adf323a28c1b 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/authorization_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/authorization_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" authorizationv1beta1 "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" "k8s.io/client-go/rest" @@ -40,18 +40,18 @@ type AuthorizationV1beta1ClusterInterface interface { } type AuthorizationV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) authorizationv1beta1.AuthorizationV1beta1Interface + Cluster(logicalcluster.Path) authorizationv1beta1.AuthorizationV1beta1Interface } type AuthorizationV1beta1ClusterClient struct { clientCache kcpclient.Cache[*authorizationv1beta1.AuthorizationV1beta1Client] } -func (c *AuthorizationV1beta1ClusterClient) Cluster(name logicalcluster.Name) authorizationv1beta1.AuthorizationV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *AuthorizationV1beta1ClusterClient) Cluster(path logicalcluster.Path) authorizationv1beta1.AuthorizationV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *AuthorizationV1beta1ClusterClient) SubjectAccessReviews() SubjectAccessReviewClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview.go index cdac742bfa7aa..9904f50b621cd 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" authorizationv1beta1client "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" ) @@ -36,7 +36,7 @@ type LocalSubjectAccessReviewsClusterGetter interface { // LocalSubjectAccessReviewClusterInterface can scope down to one cluster and return a LocalSubjectAccessReviewsNamespacer. type LocalSubjectAccessReviewClusterInterface interface { - Cluster(logicalcluster.Name) LocalSubjectAccessReviewsNamespacer + Cluster(logicalcluster.Path) LocalSubjectAccessReviewsNamespacer } type localSubjectAccessReviewsClusterInterface struct { @@ -44,12 +44,12 @@ type localSubjectAccessReviewsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *localSubjectAccessReviewsClusterInterface) Cluster(name logicalcluster.Name) LocalSubjectAccessReviewsNamespacer { - if name == logicalcluster.Wildcard { +func (c *localSubjectAccessReviewsClusterInterface) Cluster(path logicalcluster.Path) LocalSubjectAccessReviewsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &localSubjectAccessReviewsNamespacer{clientCache: c.clientCache, name: name} + return &localSubjectAccessReviewsNamespacer{clientCache: c.clientCache, path: path} } // LocalSubjectAccessReviewsNamespacer can scope to objects within a namespace, returning a authorizationv1beta1client.LocalSubjectAccessReviewInterface. @@ -59,9 +59,9 @@ type LocalSubjectAccessReviewsNamespacer interface { type localSubjectAccessReviewsNamespacer struct { clientCache kcpclient.Cache[*authorizationv1beta1client.AuthorizationV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *localSubjectAccessReviewsNamespacer) Namespace(namespace string) authorizationv1beta1client.LocalSubjectAccessReviewInterface { - return n.clientCache.ClusterOrDie(n.name).LocalSubjectAccessReviews(namespace) + return n.clientCache.ClusterOrDie(n.path).LocalSubjectAccessReviews(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview.go index 37877cf3b76cc..1b5e716620393 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" authorizationv1beta1client "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" ) @@ -36,7 +36,7 @@ type SelfSubjectAccessReviewsClusterGetter interface { // SelfSubjectAccessReviewClusterInterface can scope down to one cluster and return a authorizationv1beta1client.SelfSubjectAccessReviewInterface. type SelfSubjectAccessReviewClusterInterface interface { - Cluster(logicalcluster.Name) authorizationv1beta1client.SelfSubjectAccessReviewInterface + Cluster(logicalcluster.Path) authorizationv1beta1client.SelfSubjectAccessReviewInterface } type selfSubjectAccessReviewsClusterInterface struct { @@ -44,10 +44,10 @@ type selfSubjectAccessReviewsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *selfSubjectAccessReviewsClusterInterface) Cluster(name logicalcluster.Name) authorizationv1beta1client.SelfSubjectAccessReviewInterface { - if name == logicalcluster.Wildcard { +func (c *selfSubjectAccessReviewsClusterInterface) Cluster(path logicalcluster.Path) authorizationv1beta1client.SelfSubjectAccessReviewInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).SelfSubjectAccessReviews() + return c.clientCache.ClusterOrDie(path).SelfSubjectAccessReviews() } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectrulesreview.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectrulesreview.go index 80eb46874564e..d372da2bd4177 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectrulesreview.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectrulesreview.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" authorizationv1beta1client "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" ) @@ -36,7 +36,7 @@ type SelfSubjectRulesReviewsClusterGetter interface { // SelfSubjectRulesReviewClusterInterface can scope down to one cluster and return a authorizationv1beta1client.SelfSubjectRulesReviewInterface. type SelfSubjectRulesReviewClusterInterface interface { - Cluster(logicalcluster.Name) authorizationv1beta1client.SelfSubjectRulesReviewInterface + Cluster(logicalcluster.Path) authorizationv1beta1client.SelfSubjectRulesReviewInterface } type selfSubjectRulesReviewsClusterInterface struct { @@ -44,10 +44,10 @@ type selfSubjectRulesReviewsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *selfSubjectRulesReviewsClusterInterface) Cluster(name logicalcluster.Name) authorizationv1beta1client.SelfSubjectRulesReviewInterface { - if name == logicalcluster.Wildcard { +func (c *selfSubjectRulesReviewsClusterInterface) Cluster(path logicalcluster.Path) authorizationv1beta1client.SelfSubjectRulesReviewInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).SelfSubjectRulesReviews() + return c.clientCache.ClusterOrDie(path).SelfSubjectRulesReviews() } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/subjectaccessreview.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/subjectaccessreview.go index 8e69f33aae211..8d699e79930bb 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/subjectaccessreview.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/authorization/v1beta1/subjectaccessreview.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" authorizationv1beta1client "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" ) @@ -36,7 +36,7 @@ type SubjectAccessReviewsClusterGetter interface { // SubjectAccessReviewClusterInterface can scope down to one cluster and return a authorizationv1beta1client.SubjectAccessReviewInterface. type SubjectAccessReviewClusterInterface interface { - Cluster(logicalcluster.Name) authorizationv1beta1client.SubjectAccessReviewInterface + Cluster(logicalcluster.Path) authorizationv1beta1client.SubjectAccessReviewInterface } type subjectAccessReviewsClusterInterface struct { @@ -44,10 +44,10 @@ type subjectAccessReviewsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *subjectAccessReviewsClusterInterface) Cluster(name logicalcluster.Name) authorizationv1beta1client.SubjectAccessReviewInterface { - if name == logicalcluster.Wildcard { +func (c *subjectAccessReviewsClusterInterface) Cluster(path logicalcluster.Path) authorizationv1beta1client.SubjectAccessReviewInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).SubjectAccessReviews() + return c.clientCache.ClusterOrDie(path).SubjectAccessReviews() } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v1/autoscaling_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v1/autoscaling_client.go index c4362da5d0e94..233565408948f 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v1/autoscaling_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v1/autoscaling_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv1 "k8s.io/client-go/kubernetes/typed/autoscaling/v1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type AutoscalingV1ClusterInterface interface { } type AutoscalingV1ClusterScoper interface { - Cluster(logicalcluster.Name) autoscalingv1.AutoscalingV1Interface + Cluster(logicalcluster.Path) autoscalingv1.AutoscalingV1Interface } type AutoscalingV1ClusterClient struct { clientCache kcpclient.Cache[*autoscalingv1.AutoscalingV1Client] } -func (c *AutoscalingV1ClusterClient) Cluster(name logicalcluster.Name) autoscalingv1.AutoscalingV1Interface { - if name == logicalcluster.Wildcard { +func (c *AutoscalingV1ClusterClient) Cluster(path logicalcluster.Path) autoscalingv1.AutoscalingV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *AutoscalingV1ClusterClient) HorizontalPodAutoscalers() HorizontalPodAutoscalerClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go index b25216a6c4bf1..a3a06b4a4a095 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv1 "k8s.io/api/autoscaling/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type HorizontalPodAutoscalersClusterGetter interface { // HorizontalPodAutoscalerClusterInterface can operate on HorizontalPodAutoscalers across all clusters, // or scope down to one cluster and return a HorizontalPodAutoscalersNamespacer. type HorizontalPodAutoscalerClusterInterface interface { - Cluster(logicalcluster.Name) HorizontalPodAutoscalersNamespacer + Cluster(logicalcluster.Path) HorizontalPodAutoscalersNamespacer List(ctx context.Context, opts metav1.ListOptions) (*autoscalingv1.HorizontalPodAutoscalerList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type horizontalPodAutoscalersClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *horizontalPodAutoscalersClusterInterface) Cluster(name logicalcluster.Name) HorizontalPodAutoscalersNamespacer { - if name == logicalcluster.Wildcard { +func (c *horizontalPodAutoscalersClusterInterface) Cluster(path logicalcluster.Path) HorizontalPodAutoscalersNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &horizontalPodAutoscalersNamespacer{clientCache: c.clientCache, name: name} + return &horizontalPodAutoscalersNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all HorizontalPodAutoscalers across all clusters. func (c *horizontalPodAutoscalersClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*autoscalingv1.HorizontalPodAutoscalerList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).HorizontalPodAutoscalers(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).HorizontalPodAutoscalers(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all HorizontalPodAutoscalers across all clusters. func (c *horizontalPodAutoscalersClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).HorizontalPodAutoscalers(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).HorizontalPodAutoscalers(metav1.NamespaceAll).Watch(ctx, opts) } // HorizontalPodAutoscalersNamespacer can scope to objects within a namespace, returning a autoscalingv1client.HorizontalPodAutoscalerInterface. @@ -77,9 +77,9 @@ type HorizontalPodAutoscalersNamespacer interface { type horizontalPodAutoscalersNamespacer struct { clientCache kcpclient.Cache[*autoscalingv1client.AutoscalingV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *horizontalPodAutoscalersNamespacer) Namespace(namespace string) autoscalingv1client.HorizontalPodAutoscalerInterface { - return n.clientCache.ClusterOrDie(n.name).HorizontalPodAutoscalers(namespace) + return n.clientCache.ClusterOrDie(n.path).HorizontalPodAutoscalers(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2/autoscaling_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2/autoscaling_client.go index be0133b2696aa..36300ed12253d 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2/autoscaling_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2/autoscaling_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv2 "k8s.io/client-go/kubernetes/typed/autoscaling/v2" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type AutoscalingV2ClusterInterface interface { } type AutoscalingV2ClusterScoper interface { - Cluster(logicalcluster.Name) autoscalingv2.AutoscalingV2Interface + Cluster(logicalcluster.Path) autoscalingv2.AutoscalingV2Interface } type AutoscalingV2ClusterClient struct { clientCache kcpclient.Cache[*autoscalingv2.AutoscalingV2Client] } -func (c *AutoscalingV2ClusterClient) Cluster(name logicalcluster.Name) autoscalingv2.AutoscalingV2Interface { - if name == logicalcluster.Wildcard { +func (c *AutoscalingV2ClusterClient) Cluster(path logicalcluster.Path) autoscalingv2.AutoscalingV2Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *AutoscalingV2ClusterClient) HorizontalPodAutoscalers() HorizontalPodAutoscalerClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2/horizontalpodautoscaler.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2/horizontalpodautoscaler.go index 878b8566569ca..72895ab31cf9b 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2/horizontalpodautoscaler.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2/horizontalpodautoscaler.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv2 "k8s.io/api/autoscaling/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type HorizontalPodAutoscalersClusterGetter interface { // HorizontalPodAutoscalerClusterInterface can operate on HorizontalPodAutoscalers across all clusters, // or scope down to one cluster and return a HorizontalPodAutoscalersNamespacer. type HorizontalPodAutoscalerClusterInterface interface { - Cluster(logicalcluster.Name) HorizontalPodAutoscalersNamespacer + Cluster(logicalcluster.Path) HorizontalPodAutoscalersNamespacer List(ctx context.Context, opts metav1.ListOptions) (*autoscalingv2.HorizontalPodAutoscalerList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type horizontalPodAutoscalersClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *horizontalPodAutoscalersClusterInterface) Cluster(name logicalcluster.Name) HorizontalPodAutoscalersNamespacer { - if name == logicalcluster.Wildcard { +func (c *horizontalPodAutoscalersClusterInterface) Cluster(path logicalcluster.Path) HorizontalPodAutoscalersNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &horizontalPodAutoscalersNamespacer{clientCache: c.clientCache, name: name} + return &horizontalPodAutoscalersNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all HorizontalPodAutoscalers across all clusters. func (c *horizontalPodAutoscalersClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*autoscalingv2.HorizontalPodAutoscalerList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).HorizontalPodAutoscalers(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).HorizontalPodAutoscalers(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all HorizontalPodAutoscalers across all clusters. func (c *horizontalPodAutoscalersClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).HorizontalPodAutoscalers(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).HorizontalPodAutoscalers(metav1.NamespaceAll).Watch(ctx, opts) } // HorizontalPodAutoscalersNamespacer can scope to objects within a namespace, returning a autoscalingv2client.HorizontalPodAutoscalerInterface. @@ -77,9 +77,9 @@ type HorizontalPodAutoscalersNamespacer interface { type horizontalPodAutoscalersNamespacer struct { clientCache kcpclient.Cache[*autoscalingv2client.AutoscalingV2Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *horizontalPodAutoscalersNamespacer) Namespace(namespace string) autoscalingv2client.HorizontalPodAutoscalerInterface { - return n.clientCache.ClusterOrDie(n.name).HorizontalPodAutoscalers(namespace) + return n.clientCache.ClusterOrDie(n.path).HorizontalPodAutoscalers(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta1/autoscaling_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta1/autoscaling_client.go index f0bea6c5a0b5b..dfc8c9995b6be 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta1/autoscaling_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta1/autoscaling_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv2beta1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type AutoscalingV2beta1ClusterInterface interface { } type AutoscalingV2beta1ClusterScoper interface { - Cluster(logicalcluster.Name) autoscalingv2beta1.AutoscalingV2beta1Interface + Cluster(logicalcluster.Path) autoscalingv2beta1.AutoscalingV2beta1Interface } type AutoscalingV2beta1ClusterClient struct { clientCache kcpclient.Cache[*autoscalingv2beta1.AutoscalingV2beta1Client] } -func (c *AutoscalingV2beta1ClusterClient) Cluster(name logicalcluster.Name) autoscalingv2beta1.AutoscalingV2beta1Interface { - if name == logicalcluster.Wildcard { +func (c *AutoscalingV2beta1ClusterClient) Cluster(path logicalcluster.Path) autoscalingv2beta1.AutoscalingV2beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *AutoscalingV2beta1ClusterClient) HorizontalPodAutoscalers() HorizontalPodAutoscalerClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta1/horizontalpodautoscaler.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta1/horizontalpodautoscaler.go index 9bba45fe0112b..ba4fe135c2cda 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta1/horizontalpodautoscaler.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta1/horizontalpodautoscaler.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv2beta1 "k8s.io/api/autoscaling/v2beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type HorizontalPodAutoscalersClusterGetter interface { // HorizontalPodAutoscalerClusterInterface can operate on HorizontalPodAutoscalers across all clusters, // or scope down to one cluster and return a HorizontalPodAutoscalersNamespacer. type HorizontalPodAutoscalerClusterInterface interface { - Cluster(logicalcluster.Name) HorizontalPodAutoscalersNamespacer + Cluster(logicalcluster.Path) HorizontalPodAutoscalersNamespacer List(ctx context.Context, opts metav1.ListOptions) (*autoscalingv2beta1.HorizontalPodAutoscalerList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type horizontalPodAutoscalersClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *horizontalPodAutoscalersClusterInterface) Cluster(name logicalcluster.Name) HorizontalPodAutoscalersNamespacer { - if name == logicalcluster.Wildcard { +func (c *horizontalPodAutoscalersClusterInterface) Cluster(path logicalcluster.Path) HorizontalPodAutoscalersNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &horizontalPodAutoscalersNamespacer{clientCache: c.clientCache, name: name} + return &horizontalPodAutoscalersNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all HorizontalPodAutoscalers across all clusters. func (c *horizontalPodAutoscalersClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*autoscalingv2beta1.HorizontalPodAutoscalerList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).HorizontalPodAutoscalers(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).HorizontalPodAutoscalers(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all HorizontalPodAutoscalers across all clusters. func (c *horizontalPodAutoscalersClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).HorizontalPodAutoscalers(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).HorizontalPodAutoscalers(metav1.NamespaceAll).Watch(ctx, opts) } // HorizontalPodAutoscalersNamespacer can scope to objects within a namespace, returning a autoscalingv2beta1client.HorizontalPodAutoscalerInterface. @@ -77,9 +77,9 @@ type HorizontalPodAutoscalersNamespacer interface { type horizontalPodAutoscalersNamespacer struct { clientCache kcpclient.Cache[*autoscalingv2beta1client.AutoscalingV2beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *horizontalPodAutoscalersNamespacer) Namespace(namespace string) autoscalingv2beta1client.HorizontalPodAutoscalerInterface { - return n.clientCache.ClusterOrDie(n.name).HorizontalPodAutoscalers(namespace) + return n.clientCache.ClusterOrDie(n.path).HorizontalPodAutoscalers(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta2/autoscaling_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta2/autoscaling_client.go index f61ccdffd3fb1..db362354a8842 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta2/autoscaling_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta2/autoscaling_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv2beta2 "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type AutoscalingV2beta2ClusterInterface interface { } type AutoscalingV2beta2ClusterScoper interface { - Cluster(logicalcluster.Name) autoscalingv2beta2.AutoscalingV2beta2Interface + Cluster(logicalcluster.Path) autoscalingv2beta2.AutoscalingV2beta2Interface } type AutoscalingV2beta2ClusterClient struct { clientCache kcpclient.Cache[*autoscalingv2beta2.AutoscalingV2beta2Client] } -func (c *AutoscalingV2beta2ClusterClient) Cluster(name logicalcluster.Name) autoscalingv2beta2.AutoscalingV2beta2Interface { - if name == logicalcluster.Wildcard { +func (c *AutoscalingV2beta2ClusterClient) Cluster(path logicalcluster.Path) autoscalingv2beta2.AutoscalingV2beta2Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *AutoscalingV2beta2ClusterClient) HorizontalPodAutoscalers() HorizontalPodAutoscalerClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta2/horizontalpodautoscaler.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta2/horizontalpodautoscaler.go index a1f056f8cd388..27343a4bd2f8f 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta2/horizontalpodautoscaler.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/autoscaling/v2beta2/horizontalpodautoscaler.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type HorizontalPodAutoscalersClusterGetter interface { // HorizontalPodAutoscalerClusterInterface can operate on HorizontalPodAutoscalers across all clusters, // or scope down to one cluster and return a HorizontalPodAutoscalersNamespacer. type HorizontalPodAutoscalerClusterInterface interface { - Cluster(logicalcluster.Name) HorizontalPodAutoscalersNamespacer + Cluster(logicalcluster.Path) HorizontalPodAutoscalersNamespacer List(ctx context.Context, opts metav1.ListOptions) (*autoscalingv2beta2.HorizontalPodAutoscalerList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type horizontalPodAutoscalersClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *horizontalPodAutoscalersClusterInterface) Cluster(name logicalcluster.Name) HorizontalPodAutoscalersNamespacer { - if name == logicalcluster.Wildcard { +func (c *horizontalPodAutoscalersClusterInterface) Cluster(path logicalcluster.Path) HorizontalPodAutoscalersNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &horizontalPodAutoscalersNamespacer{clientCache: c.clientCache, name: name} + return &horizontalPodAutoscalersNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all HorizontalPodAutoscalers across all clusters. func (c *horizontalPodAutoscalersClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*autoscalingv2beta2.HorizontalPodAutoscalerList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).HorizontalPodAutoscalers(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).HorizontalPodAutoscalers(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all HorizontalPodAutoscalers across all clusters. func (c *horizontalPodAutoscalersClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).HorizontalPodAutoscalers(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).HorizontalPodAutoscalers(metav1.NamespaceAll).Watch(ctx, opts) } // HorizontalPodAutoscalersNamespacer can scope to objects within a namespace, returning a autoscalingv2beta2client.HorizontalPodAutoscalerInterface. @@ -77,9 +77,9 @@ type HorizontalPodAutoscalersNamespacer interface { type horizontalPodAutoscalersNamespacer struct { clientCache kcpclient.Cache[*autoscalingv2beta2client.AutoscalingV2beta2Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *horizontalPodAutoscalersNamespacer) Namespace(namespace string) autoscalingv2beta2client.HorizontalPodAutoscalerInterface { - return n.clientCache.ClusterOrDie(n.name).HorizontalPodAutoscalers(namespace) + return n.clientCache.ClusterOrDie(n.path).HorizontalPodAutoscalers(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1/batch_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1/batch_client.go index e37f77846251f..b399fedf2d792 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1/batch_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1/batch_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" batchv1 "k8s.io/client-go/kubernetes/typed/batch/v1" "k8s.io/client-go/rest" @@ -38,18 +38,18 @@ type BatchV1ClusterInterface interface { } type BatchV1ClusterScoper interface { - Cluster(logicalcluster.Name) batchv1.BatchV1Interface + Cluster(logicalcluster.Path) batchv1.BatchV1Interface } type BatchV1ClusterClient struct { clientCache kcpclient.Cache[*batchv1.BatchV1Client] } -func (c *BatchV1ClusterClient) Cluster(name logicalcluster.Name) batchv1.BatchV1Interface { - if name == logicalcluster.Wildcard { +func (c *BatchV1ClusterClient) Cluster(path logicalcluster.Path) batchv1.BatchV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *BatchV1ClusterClient) Jobs() JobClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1/cronjob.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1/cronjob.go index 0467dd564f630..75ce163d25d62 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1/cronjob.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1/cronjob.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" batchv1 "k8s.io/api/batch/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type CronJobsClusterGetter interface { // CronJobClusterInterface can operate on CronJobs across all clusters, // or scope down to one cluster and return a CronJobsNamespacer. type CronJobClusterInterface interface { - Cluster(logicalcluster.Name) CronJobsNamespacer + Cluster(logicalcluster.Path) CronJobsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*batchv1.CronJobList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type cronJobsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *cronJobsClusterInterface) Cluster(name logicalcluster.Name) CronJobsNamespacer { - if name == logicalcluster.Wildcard { +func (c *cronJobsClusterInterface) Cluster(path logicalcluster.Path) CronJobsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &cronJobsNamespacer{clientCache: c.clientCache, name: name} + return &cronJobsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all CronJobs across all clusters. func (c *cronJobsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*batchv1.CronJobList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CronJobs(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CronJobs(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all CronJobs across all clusters. func (c *cronJobsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CronJobs(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CronJobs(metav1.NamespaceAll).Watch(ctx, opts) } // CronJobsNamespacer can scope to objects within a namespace, returning a batchv1client.CronJobInterface. @@ -77,9 +77,9 @@ type CronJobsNamespacer interface { type cronJobsNamespacer struct { clientCache kcpclient.Cache[*batchv1client.BatchV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *cronJobsNamespacer) Namespace(namespace string) batchv1client.CronJobInterface { - return n.clientCache.ClusterOrDie(n.name).CronJobs(namespace) + return n.clientCache.ClusterOrDie(n.path).CronJobs(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1/job.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1/job.go index c7b211c07ba06..cd76a314c83fb 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1/job.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1/job.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" batchv1 "k8s.io/api/batch/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type JobsClusterGetter interface { // JobClusterInterface can operate on Jobs across all clusters, // or scope down to one cluster and return a JobsNamespacer. type JobClusterInterface interface { - Cluster(logicalcluster.Name) JobsNamespacer + Cluster(logicalcluster.Path) JobsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*batchv1.JobList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type jobsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *jobsClusterInterface) Cluster(name logicalcluster.Name) JobsNamespacer { - if name == logicalcluster.Wildcard { +func (c *jobsClusterInterface) Cluster(path logicalcluster.Path) JobsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &jobsNamespacer{clientCache: c.clientCache, name: name} + return &jobsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Jobs across all clusters. func (c *jobsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*batchv1.JobList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Jobs(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Jobs(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Jobs across all clusters. func (c *jobsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Jobs(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Jobs(metav1.NamespaceAll).Watch(ctx, opts) } // JobsNamespacer can scope to objects within a namespace, returning a batchv1client.JobInterface. @@ -77,9 +77,9 @@ type JobsNamespacer interface { type jobsNamespacer struct { clientCache kcpclient.Cache[*batchv1client.BatchV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *jobsNamespacer) Namespace(namespace string) batchv1client.JobInterface { - return n.clientCache.ClusterOrDie(n.name).Jobs(namespace) + return n.clientCache.ClusterOrDie(n.path).Jobs(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1beta1/batch_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1beta1/batch_client.go index ac9654975cb02..9f7fba975e05a 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1beta1/batch_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1beta1/batch_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" batchv1beta1 "k8s.io/client-go/kubernetes/typed/batch/v1beta1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type BatchV1beta1ClusterInterface interface { } type BatchV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) batchv1beta1.BatchV1beta1Interface + Cluster(logicalcluster.Path) batchv1beta1.BatchV1beta1Interface } type BatchV1beta1ClusterClient struct { clientCache kcpclient.Cache[*batchv1beta1.BatchV1beta1Client] } -func (c *BatchV1beta1ClusterClient) Cluster(name logicalcluster.Name) batchv1beta1.BatchV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *BatchV1beta1ClusterClient) Cluster(path logicalcluster.Path) batchv1beta1.BatchV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *BatchV1beta1ClusterClient) CronJobs() CronJobClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1beta1/cronjob.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1beta1/cronjob.go index 8677231f8f136..d65ea4cff8ef1 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1beta1/cronjob.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/batch/v1beta1/cronjob.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" batchv1beta1 "k8s.io/api/batch/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type CronJobsClusterGetter interface { // CronJobClusterInterface can operate on CronJobs across all clusters, // or scope down to one cluster and return a CronJobsNamespacer. type CronJobClusterInterface interface { - Cluster(logicalcluster.Name) CronJobsNamespacer + Cluster(logicalcluster.Path) CronJobsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*batchv1beta1.CronJobList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type cronJobsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *cronJobsClusterInterface) Cluster(name logicalcluster.Name) CronJobsNamespacer { - if name == logicalcluster.Wildcard { +func (c *cronJobsClusterInterface) Cluster(path logicalcluster.Path) CronJobsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &cronJobsNamespacer{clientCache: c.clientCache, name: name} + return &cronJobsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all CronJobs across all clusters. func (c *cronJobsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*batchv1beta1.CronJobList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CronJobs(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CronJobs(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all CronJobs across all clusters. func (c *cronJobsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CronJobs(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CronJobs(metav1.NamespaceAll).Watch(ctx, opts) } // CronJobsNamespacer can scope to objects within a namespace, returning a batchv1beta1client.CronJobInterface. @@ -77,9 +77,9 @@ type CronJobsNamespacer interface { type cronJobsNamespacer struct { clientCache kcpclient.Cache[*batchv1beta1client.BatchV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *cronJobsNamespacer) Namespace(namespace string) batchv1beta1client.CronJobInterface { - return n.clientCache.ClusterOrDie(n.name).CronJobs(namespace) + return n.clientCache.ClusterOrDie(n.path).CronJobs(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1/certificates_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1/certificates_client.go index c8c9cb06b015a..6c092229f58ee 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1/certificates_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1/certificates_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" certificatesv1 "k8s.io/client-go/kubernetes/typed/certificates/v1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type CertificatesV1ClusterInterface interface { } type CertificatesV1ClusterScoper interface { - Cluster(logicalcluster.Name) certificatesv1.CertificatesV1Interface + Cluster(logicalcluster.Path) certificatesv1.CertificatesV1Interface } type CertificatesV1ClusterClient struct { clientCache kcpclient.Cache[*certificatesv1.CertificatesV1Client] } -func (c *CertificatesV1ClusterClient) Cluster(name logicalcluster.Name) certificatesv1.CertificatesV1Interface { - if name == logicalcluster.Wildcard { +func (c *CertificatesV1ClusterClient) Cluster(path logicalcluster.Path) certificatesv1.CertificatesV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *CertificatesV1ClusterClient) CertificateSigningRequests() CertificateSigningRequestClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1/certificatesigningrequest.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1/certificatesigningrequest.go index c3eefb343ea41..6f1c42612967c 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1/certificatesigningrequest.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1/certificatesigningrequest.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" certificatesv1 "k8s.io/api/certificates/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type CertificateSigningRequestsClusterGetter interface { // CertificateSigningRequestClusterInterface can operate on CertificateSigningRequests across all clusters, // or scope down to one cluster and return a certificatesv1client.CertificateSigningRequestInterface. type CertificateSigningRequestClusterInterface interface { - Cluster(logicalcluster.Name) certificatesv1client.CertificateSigningRequestInterface + Cluster(logicalcluster.Path) certificatesv1client.CertificateSigningRequestInterface List(ctx context.Context, opts metav1.ListOptions) (*certificatesv1.CertificateSigningRequestList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type certificateSigningRequestsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *certificateSigningRequestsClusterInterface) Cluster(name logicalcluster.Name) certificatesv1client.CertificateSigningRequestInterface { - if name == logicalcluster.Wildcard { +func (c *certificateSigningRequestsClusterInterface) Cluster(path logicalcluster.Path) certificatesv1client.CertificateSigningRequestInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).CertificateSigningRequests() + return c.clientCache.ClusterOrDie(path).CertificateSigningRequests() } // List returns the entire collection of all CertificateSigningRequests across all clusters. func (c *certificateSigningRequestsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*certificatesv1.CertificateSigningRequestList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CertificateSigningRequests().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CertificateSigningRequests().List(ctx, opts) } // Watch begins to watch all CertificateSigningRequests across all clusters. func (c *certificateSigningRequestsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CertificateSigningRequests().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CertificateSigningRequests().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1beta1/certificates_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1beta1/certificates_client.go index 53b72b81be22b..7fafa6a9df60a 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1beta1/certificates_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1beta1/certificates_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" certificatesv1beta1 "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type CertificatesV1beta1ClusterInterface interface { } type CertificatesV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) certificatesv1beta1.CertificatesV1beta1Interface + Cluster(logicalcluster.Path) certificatesv1beta1.CertificatesV1beta1Interface } type CertificatesV1beta1ClusterClient struct { clientCache kcpclient.Cache[*certificatesv1beta1.CertificatesV1beta1Client] } -func (c *CertificatesV1beta1ClusterClient) Cluster(name logicalcluster.Name) certificatesv1beta1.CertificatesV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *CertificatesV1beta1ClusterClient) Cluster(path logicalcluster.Path) certificatesv1beta1.CertificatesV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *CertificatesV1beta1ClusterClient) CertificateSigningRequests() CertificateSigningRequestClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go index f21b64cc0e08f..042b86cd478f8 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" certificatesv1beta1 "k8s.io/api/certificates/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type CertificateSigningRequestsClusterGetter interface { // CertificateSigningRequestClusterInterface can operate on CertificateSigningRequests across all clusters, // or scope down to one cluster and return a certificatesv1beta1client.CertificateSigningRequestInterface. type CertificateSigningRequestClusterInterface interface { - Cluster(logicalcluster.Name) certificatesv1beta1client.CertificateSigningRequestInterface + Cluster(logicalcluster.Path) certificatesv1beta1client.CertificateSigningRequestInterface List(ctx context.Context, opts metav1.ListOptions) (*certificatesv1beta1.CertificateSigningRequestList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type certificateSigningRequestsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *certificateSigningRequestsClusterInterface) Cluster(name logicalcluster.Name) certificatesv1beta1client.CertificateSigningRequestInterface { - if name == logicalcluster.Wildcard { +func (c *certificateSigningRequestsClusterInterface) Cluster(path logicalcluster.Path) certificatesv1beta1client.CertificateSigningRequestInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).CertificateSigningRequests() + return c.clientCache.ClusterOrDie(path).CertificateSigningRequests() } // List returns the entire collection of all CertificateSigningRequests across all clusters. func (c *certificateSigningRequestsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*certificatesv1beta1.CertificateSigningRequestList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CertificateSigningRequests().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CertificateSigningRequests().List(ctx, opts) } // Watch begins to watch all CertificateSigningRequests across all clusters. func (c *certificateSigningRequestsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CertificateSigningRequests().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CertificateSigningRequests().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1/coordination_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1/coordination_client.go index d23beeef2a9b7..369c56c5d84c2 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1/coordination_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1/coordination_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" coordinationv1 "k8s.io/client-go/kubernetes/typed/coordination/v1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type CoordinationV1ClusterInterface interface { } type CoordinationV1ClusterScoper interface { - Cluster(logicalcluster.Name) coordinationv1.CoordinationV1Interface + Cluster(logicalcluster.Path) coordinationv1.CoordinationV1Interface } type CoordinationV1ClusterClient struct { clientCache kcpclient.Cache[*coordinationv1.CoordinationV1Client] } -func (c *CoordinationV1ClusterClient) Cluster(name logicalcluster.Name) coordinationv1.CoordinationV1Interface { - if name == logicalcluster.Wildcard { +func (c *CoordinationV1ClusterClient) Cluster(path logicalcluster.Path) coordinationv1.CoordinationV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *CoordinationV1ClusterClient) Leases() LeaseClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1/lease.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1/lease.go index af8f5720d74c2..7eb2751203734 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1/lease.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1/lease.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" coordinationv1 "k8s.io/api/coordination/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type LeasesClusterGetter interface { // LeaseClusterInterface can operate on Leases across all clusters, // or scope down to one cluster and return a LeasesNamespacer. type LeaseClusterInterface interface { - Cluster(logicalcluster.Name) LeasesNamespacer + Cluster(logicalcluster.Path) LeasesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*coordinationv1.LeaseList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type leasesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *leasesClusterInterface) Cluster(name logicalcluster.Name) LeasesNamespacer { - if name == logicalcluster.Wildcard { +func (c *leasesClusterInterface) Cluster(path logicalcluster.Path) LeasesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &leasesNamespacer{clientCache: c.clientCache, name: name} + return &leasesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Leases across all clusters. func (c *leasesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*coordinationv1.LeaseList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Leases(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Leases(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Leases across all clusters. func (c *leasesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Leases(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Leases(metav1.NamespaceAll).Watch(ctx, opts) } // LeasesNamespacer can scope to objects within a namespace, returning a coordinationv1client.LeaseInterface. @@ -77,9 +77,9 @@ type LeasesNamespacer interface { type leasesNamespacer struct { clientCache kcpclient.Cache[*coordinationv1client.CoordinationV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *leasesNamespacer) Namespace(namespace string) coordinationv1client.LeaseInterface { - return n.clientCache.ClusterOrDie(n.name).Leases(namespace) + return n.clientCache.ClusterOrDie(n.path).Leases(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1beta1/coordination_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1beta1/coordination_client.go index 10ae2eb359c0c..d65fa3654d744 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1beta1/coordination_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1beta1/coordination_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" coordinationv1beta1 "k8s.io/client-go/kubernetes/typed/coordination/v1beta1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type CoordinationV1beta1ClusterInterface interface { } type CoordinationV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) coordinationv1beta1.CoordinationV1beta1Interface + Cluster(logicalcluster.Path) coordinationv1beta1.CoordinationV1beta1Interface } type CoordinationV1beta1ClusterClient struct { clientCache kcpclient.Cache[*coordinationv1beta1.CoordinationV1beta1Client] } -func (c *CoordinationV1beta1ClusterClient) Cluster(name logicalcluster.Name) coordinationv1beta1.CoordinationV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *CoordinationV1beta1ClusterClient) Cluster(path logicalcluster.Path) coordinationv1beta1.CoordinationV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *CoordinationV1beta1ClusterClient) Leases() LeaseClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1beta1/lease.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1beta1/lease.go index 09d3e0b4f389a..b40a50f908032 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1beta1/lease.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/coordination/v1beta1/lease.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" coordinationv1beta1 "k8s.io/api/coordination/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type LeasesClusterGetter interface { // LeaseClusterInterface can operate on Leases across all clusters, // or scope down to one cluster and return a LeasesNamespacer. type LeaseClusterInterface interface { - Cluster(logicalcluster.Name) LeasesNamespacer + Cluster(logicalcluster.Path) LeasesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*coordinationv1beta1.LeaseList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type leasesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *leasesClusterInterface) Cluster(name logicalcluster.Name) LeasesNamespacer { - if name == logicalcluster.Wildcard { +func (c *leasesClusterInterface) Cluster(path logicalcluster.Path) LeasesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &leasesNamespacer{clientCache: c.clientCache, name: name} + return &leasesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Leases across all clusters. func (c *leasesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*coordinationv1beta1.LeaseList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Leases(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Leases(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Leases across all clusters. func (c *leasesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Leases(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Leases(metav1.NamespaceAll).Watch(ctx, opts) } // LeasesNamespacer can scope to objects within a namespace, returning a coordinationv1beta1client.LeaseInterface. @@ -77,9 +77,9 @@ type LeasesNamespacer interface { type leasesNamespacer struct { clientCache kcpclient.Cache[*coordinationv1beta1client.CoordinationV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *leasesNamespacer) Namespace(namespace string) coordinationv1beta1client.LeaseInterface { - return n.clientCache.ClusterOrDie(n.name).Leases(namespace) + return n.clientCache.ClusterOrDie(n.path).Leases(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/componentstatus.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/componentstatus.go index 1c633a9b9af6c..6b98595e3bc77 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/componentstatus.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/componentstatus.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ComponentStatusesClusterGetter interface { // ComponentStatusClusterInterface can operate on ComponentStatuses across all clusters, // or scope down to one cluster and return a corev1client.ComponentStatusInterface. type ComponentStatusClusterInterface interface { - Cluster(logicalcluster.Name) corev1client.ComponentStatusInterface + Cluster(logicalcluster.Path) corev1client.ComponentStatusInterface List(ctx context.Context, opts metav1.ListOptions) (*corev1.ComponentStatusList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type componentStatusesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *componentStatusesClusterInterface) Cluster(name logicalcluster.Name) corev1client.ComponentStatusInterface { - if name == logicalcluster.Wildcard { +func (c *componentStatusesClusterInterface) Cluster(path logicalcluster.Path) corev1client.ComponentStatusInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).ComponentStatuses() + return c.clientCache.ClusterOrDie(path).ComponentStatuses() } // List returns the entire collection of all ComponentStatuses across all clusters. func (c *componentStatusesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.ComponentStatusList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ComponentStatuses().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ComponentStatuses().List(ctx, opts) } // Watch begins to watch all ComponentStatuses across all clusters. func (c *componentStatusesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ComponentStatuses().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ComponentStatuses().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/configmap.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/configmap.go index fb523f6534bd2..a06006fd7c47a 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/configmap.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/configmap.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ConfigMapsClusterGetter interface { // ConfigMapClusterInterface can operate on ConfigMaps across all clusters, // or scope down to one cluster and return a ConfigMapsNamespacer. type ConfigMapClusterInterface interface { - Cluster(logicalcluster.Name) ConfigMapsNamespacer + Cluster(logicalcluster.Path) ConfigMapsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*corev1.ConfigMapList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type configMapsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *configMapsClusterInterface) Cluster(name logicalcluster.Name) ConfigMapsNamespacer { - if name == logicalcluster.Wildcard { +func (c *configMapsClusterInterface) Cluster(path logicalcluster.Path) ConfigMapsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &configMapsNamespacer{clientCache: c.clientCache, name: name} + return &configMapsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all ConfigMaps across all clusters. func (c *configMapsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.ConfigMapList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ConfigMaps(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ConfigMaps(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all ConfigMaps across all clusters. func (c *configMapsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ConfigMaps(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ConfigMaps(metav1.NamespaceAll).Watch(ctx, opts) } // ConfigMapsNamespacer can scope to objects within a namespace, returning a corev1client.ConfigMapInterface. @@ -77,9 +77,9 @@ type ConfigMapsNamespacer interface { type configMapsNamespacer struct { clientCache kcpclient.Cache[*corev1client.CoreV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *configMapsNamespacer) Namespace(namespace string) corev1client.ConfigMapInterface { - return n.clientCache.ClusterOrDie(n.name).ConfigMaps(namespace) + return n.clientCache.ClusterOrDie(n.path).ConfigMaps(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/core_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/core_client.go index 43bcdbea96364..5e5633c9f7af3 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/core_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/core_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/rest" @@ -52,18 +52,18 @@ type CoreV1ClusterInterface interface { } type CoreV1ClusterScoper interface { - Cluster(logicalcluster.Name) corev1.CoreV1Interface + Cluster(logicalcluster.Path) corev1.CoreV1Interface } type CoreV1ClusterClient struct { clientCache kcpclient.Cache[*corev1.CoreV1Client] } -func (c *CoreV1ClusterClient) Cluster(name logicalcluster.Name) corev1.CoreV1Interface { - if name == logicalcluster.Wildcard { +func (c *CoreV1ClusterClient) Cluster(path logicalcluster.Path) corev1.CoreV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *CoreV1ClusterClient) PersistentVolumes() PersistentVolumeClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/endpoints.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/endpoints.go index 17c87c8bce2e6..eb8a4612df093 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/endpoints.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/endpoints.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type EndpointsClusterGetter interface { // EndpointsClusterInterface can operate on Endpoints across all clusters, // or scope down to one cluster and return a EndpointsNamespacer. type EndpointsClusterInterface interface { - Cluster(logicalcluster.Name) EndpointsNamespacer + Cluster(logicalcluster.Path) EndpointsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*corev1.EndpointsList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type endpointsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *endpointsClusterInterface) Cluster(name logicalcluster.Name) EndpointsNamespacer { - if name == logicalcluster.Wildcard { +func (c *endpointsClusterInterface) Cluster(path logicalcluster.Path) EndpointsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &endpointsNamespacer{clientCache: c.clientCache, name: name} + return &endpointsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Endpoints across all clusters. func (c *endpointsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.EndpointsList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Endpoints(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Endpoints(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Endpoints across all clusters. func (c *endpointsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Endpoints(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Endpoints(metav1.NamespaceAll).Watch(ctx, opts) } // EndpointsNamespacer can scope to objects within a namespace, returning a corev1client.EndpointsInterface. @@ -77,9 +77,9 @@ type EndpointsNamespacer interface { type endpointsNamespacer struct { clientCache kcpclient.Cache[*corev1client.CoreV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *endpointsNamespacer) Namespace(namespace string) corev1client.EndpointsInterface { - return n.clientCache.ClusterOrDie(n.name).Endpoints(namespace) + return n.clientCache.ClusterOrDie(n.path).Endpoints(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/event.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/event.go index fbc2a2c23a7aa..56985ef4b8368 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/event.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/event.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type EventsClusterGetter interface { // EventClusterInterface can operate on Events across all clusters, // or scope down to one cluster and return a EventsNamespacer. type EventClusterInterface interface { - Cluster(logicalcluster.Name) EventsNamespacer + Cluster(logicalcluster.Path) EventsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*corev1.EventList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type eventsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *eventsClusterInterface) Cluster(name logicalcluster.Name) EventsNamespacer { - if name == logicalcluster.Wildcard { +func (c *eventsClusterInterface) Cluster(path logicalcluster.Path) EventsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &eventsNamespacer{clientCache: c.clientCache, name: name} + return &eventsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Events across all clusters. func (c *eventsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.EventList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Events(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Events(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Events across all clusters. func (c *eventsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Events(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Events(metav1.NamespaceAll).Watch(ctx, opts) } // EventsNamespacer can scope to objects within a namespace, returning a corev1client.EventInterface. @@ -77,9 +77,9 @@ type EventsNamespacer interface { type eventsNamespacer struct { clientCache kcpclient.Cache[*corev1client.CoreV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *eventsNamespacer) Namespace(namespace string) corev1client.EventInterface { - return n.clientCache.ClusterOrDie(n.name).Events(namespace) + return n.clientCache.ClusterOrDie(n.path).Events(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/limitrange.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/limitrange.go index 516659c7bf490..9d13773e48622 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/limitrange.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/limitrange.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type LimitRangesClusterGetter interface { // LimitRangeClusterInterface can operate on LimitRanges across all clusters, // or scope down to one cluster and return a LimitRangesNamespacer. type LimitRangeClusterInterface interface { - Cluster(logicalcluster.Name) LimitRangesNamespacer + Cluster(logicalcluster.Path) LimitRangesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*corev1.LimitRangeList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type limitRangesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *limitRangesClusterInterface) Cluster(name logicalcluster.Name) LimitRangesNamespacer { - if name == logicalcluster.Wildcard { +func (c *limitRangesClusterInterface) Cluster(path logicalcluster.Path) LimitRangesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &limitRangesNamespacer{clientCache: c.clientCache, name: name} + return &limitRangesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all LimitRanges across all clusters. func (c *limitRangesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.LimitRangeList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).LimitRanges(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).LimitRanges(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all LimitRanges across all clusters. func (c *limitRangesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).LimitRanges(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).LimitRanges(metav1.NamespaceAll).Watch(ctx, opts) } // LimitRangesNamespacer can scope to objects within a namespace, returning a corev1client.LimitRangeInterface. @@ -77,9 +77,9 @@ type LimitRangesNamespacer interface { type limitRangesNamespacer struct { clientCache kcpclient.Cache[*corev1client.CoreV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *limitRangesNamespacer) Namespace(namespace string) corev1client.LimitRangeInterface { - return n.clientCache.ClusterOrDie(n.name).LimitRanges(namespace) + return n.clientCache.ClusterOrDie(n.path).LimitRanges(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/namespace.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/namespace.go index 5e669d66d9a84..18e5551bcdcad 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/namespace.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/namespace.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type NamespacesClusterGetter interface { // NamespaceClusterInterface can operate on Namespaces across all clusters, // or scope down to one cluster and return a corev1client.NamespaceInterface. type NamespaceClusterInterface interface { - Cluster(logicalcluster.Name) corev1client.NamespaceInterface + Cluster(logicalcluster.Path) corev1client.NamespaceInterface List(ctx context.Context, opts metav1.ListOptions) (*corev1.NamespaceList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type namespacesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *namespacesClusterInterface) Cluster(name logicalcluster.Name) corev1client.NamespaceInterface { - if name == logicalcluster.Wildcard { +func (c *namespacesClusterInterface) Cluster(path logicalcluster.Path) corev1client.NamespaceInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).Namespaces() + return c.clientCache.ClusterOrDie(path).Namespaces() } // List returns the entire collection of all Namespaces across all clusters. func (c *namespacesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.NamespaceList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Namespaces().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Namespaces().List(ctx, opts) } // Watch begins to watch all Namespaces across all clusters. func (c *namespacesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Namespaces().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Namespaces().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/node.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/node.go index f64fa1828a17f..f4e916688f6c5 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/node.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/node.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type NodesClusterGetter interface { // NodeClusterInterface can operate on Nodes across all clusters, // or scope down to one cluster and return a corev1client.NodeInterface. type NodeClusterInterface interface { - Cluster(logicalcluster.Name) corev1client.NodeInterface + Cluster(logicalcluster.Path) corev1client.NodeInterface List(ctx context.Context, opts metav1.ListOptions) (*corev1.NodeList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type nodesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *nodesClusterInterface) Cluster(name logicalcluster.Name) corev1client.NodeInterface { - if name == logicalcluster.Wildcard { +func (c *nodesClusterInterface) Cluster(path logicalcluster.Path) corev1client.NodeInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).Nodes() + return c.clientCache.ClusterOrDie(path).Nodes() } // List returns the entire collection of all Nodes across all clusters. func (c *nodesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.NodeList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Nodes().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Nodes().List(ctx, opts) } // Watch begins to watch all Nodes across all clusters. func (c *nodesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Nodes().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Nodes().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/persistentvolume.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/persistentvolume.go index cd3a0b663cef2..f732cf9e7528c 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/persistentvolume.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/persistentvolume.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type PersistentVolumesClusterGetter interface { // PersistentVolumeClusterInterface can operate on PersistentVolumes across all clusters, // or scope down to one cluster and return a corev1client.PersistentVolumeInterface. type PersistentVolumeClusterInterface interface { - Cluster(logicalcluster.Name) corev1client.PersistentVolumeInterface + Cluster(logicalcluster.Path) corev1client.PersistentVolumeInterface List(ctx context.Context, opts metav1.ListOptions) (*corev1.PersistentVolumeList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type persistentVolumesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *persistentVolumesClusterInterface) Cluster(name logicalcluster.Name) corev1client.PersistentVolumeInterface { - if name == logicalcluster.Wildcard { +func (c *persistentVolumesClusterInterface) Cluster(path logicalcluster.Path) corev1client.PersistentVolumeInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).PersistentVolumes() + return c.clientCache.ClusterOrDie(path).PersistentVolumes() } // List returns the entire collection of all PersistentVolumes across all clusters. func (c *persistentVolumesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.PersistentVolumeList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PersistentVolumes().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PersistentVolumes().List(ctx, opts) } // Watch begins to watch all PersistentVolumes across all clusters. func (c *persistentVolumesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PersistentVolumes().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PersistentVolumes().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/persistentvolumeclaim.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/persistentvolumeclaim.go index 408f60d8b4149..4a5e65997e0d1 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/persistentvolumeclaim.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/persistentvolumeclaim.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type PersistentVolumeClaimsClusterGetter interface { // PersistentVolumeClaimClusterInterface can operate on PersistentVolumeClaims across all clusters, // or scope down to one cluster and return a PersistentVolumeClaimsNamespacer. type PersistentVolumeClaimClusterInterface interface { - Cluster(logicalcluster.Name) PersistentVolumeClaimsNamespacer + Cluster(logicalcluster.Path) PersistentVolumeClaimsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*corev1.PersistentVolumeClaimList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type persistentVolumeClaimsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *persistentVolumeClaimsClusterInterface) Cluster(name logicalcluster.Name) PersistentVolumeClaimsNamespacer { - if name == logicalcluster.Wildcard { +func (c *persistentVolumeClaimsClusterInterface) Cluster(path logicalcluster.Path) PersistentVolumeClaimsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &persistentVolumeClaimsNamespacer{clientCache: c.clientCache, name: name} + return &persistentVolumeClaimsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all PersistentVolumeClaims across all clusters. func (c *persistentVolumeClaimsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.PersistentVolumeClaimList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PersistentVolumeClaims(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PersistentVolumeClaims(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all PersistentVolumeClaims across all clusters. func (c *persistentVolumeClaimsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PersistentVolumeClaims(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PersistentVolumeClaims(metav1.NamespaceAll).Watch(ctx, opts) } // PersistentVolumeClaimsNamespacer can scope to objects within a namespace, returning a corev1client.PersistentVolumeClaimInterface. @@ -77,9 +77,9 @@ type PersistentVolumeClaimsNamespacer interface { type persistentVolumeClaimsNamespacer struct { clientCache kcpclient.Cache[*corev1client.CoreV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *persistentVolumeClaimsNamespacer) Namespace(namespace string) corev1client.PersistentVolumeClaimInterface { - return n.clientCache.ClusterOrDie(n.name).PersistentVolumeClaims(namespace) + return n.clientCache.ClusterOrDie(n.path).PersistentVolumeClaims(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/pod.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/pod.go index 87acf2ed00acf..ee6b3b0942f95 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/pod.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/pod.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type PodsClusterGetter interface { // PodClusterInterface can operate on Pods across all clusters, // or scope down to one cluster and return a PodsNamespacer. type PodClusterInterface interface { - Cluster(logicalcluster.Name) PodsNamespacer + Cluster(logicalcluster.Path) PodsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*corev1.PodList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type podsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *podsClusterInterface) Cluster(name logicalcluster.Name) PodsNamespacer { - if name == logicalcluster.Wildcard { +func (c *podsClusterInterface) Cluster(path logicalcluster.Path) PodsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &podsNamespacer{clientCache: c.clientCache, name: name} + return &podsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Pods across all clusters. func (c *podsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.PodList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Pods(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Pods(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Pods across all clusters. func (c *podsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Pods(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Pods(metav1.NamespaceAll).Watch(ctx, opts) } // PodsNamespacer can scope to objects within a namespace, returning a corev1client.PodInterface. @@ -77,9 +77,9 @@ type PodsNamespacer interface { type podsNamespacer struct { clientCache kcpclient.Cache[*corev1client.CoreV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *podsNamespacer) Namespace(namespace string) corev1client.PodInterface { - return n.clientCache.ClusterOrDie(n.name).Pods(namespace) + return n.clientCache.ClusterOrDie(n.path).Pods(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/podtemplate.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/podtemplate.go index cf025bc62f8cb..39ff67d789e36 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/podtemplate.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/podtemplate.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type PodTemplatesClusterGetter interface { // PodTemplateClusterInterface can operate on PodTemplates across all clusters, // or scope down to one cluster and return a PodTemplatesNamespacer. type PodTemplateClusterInterface interface { - Cluster(logicalcluster.Name) PodTemplatesNamespacer + Cluster(logicalcluster.Path) PodTemplatesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*corev1.PodTemplateList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type podTemplatesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *podTemplatesClusterInterface) Cluster(name logicalcluster.Name) PodTemplatesNamespacer { - if name == logicalcluster.Wildcard { +func (c *podTemplatesClusterInterface) Cluster(path logicalcluster.Path) PodTemplatesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &podTemplatesNamespacer{clientCache: c.clientCache, name: name} + return &podTemplatesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all PodTemplates across all clusters. func (c *podTemplatesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.PodTemplateList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PodTemplates(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PodTemplates(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all PodTemplates across all clusters. func (c *podTemplatesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PodTemplates(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PodTemplates(metav1.NamespaceAll).Watch(ctx, opts) } // PodTemplatesNamespacer can scope to objects within a namespace, returning a corev1client.PodTemplateInterface. @@ -77,9 +77,9 @@ type PodTemplatesNamespacer interface { type podTemplatesNamespacer struct { clientCache kcpclient.Cache[*corev1client.CoreV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *podTemplatesNamespacer) Namespace(namespace string) corev1client.PodTemplateInterface { - return n.clientCache.ClusterOrDie(n.name).PodTemplates(namespace) + return n.clientCache.ClusterOrDie(n.path).PodTemplates(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/replicationcontroller.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/replicationcontroller.go index 7538d30597a6d..d559ef67888a8 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/replicationcontroller.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/replicationcontroller.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ReplicationControllersClusterGetter interface { // ReplicationControllerClusterInterface can operate on ReplicationControllers across all clusters, // or scope down to one cluster and return a ReplicationControllersNamespacer. type ReplicationControllerClusterInterface interface { - Cluster(logicalcluster.Name) ReplicationControllersNamespacer + Cluster(logicalcluster.Path) ReplicationControllersNamespacer List(ctx context.Context, opts metav1.ListOptions) (*corev1.ReplicationControllerList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type replicationControllersClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *replicationControllersClusterInterface) Cluster(name logicalcluster.Name) ReplicationControllersNamespacer { - if name == logicalcluster.Wildcard { +func (c *replicationControllersClusterInterface) Cluster(path logicalcluster.Path) ReplicationControllersNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &replicationControllersNamespacer{clientCache: c.clientCache, name: name} + return &replicationControllersNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all ReplicationControllers across all clusters. func (c *replicationControllersClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.ReplicationControllerList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ReplicationControllers(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ReplicationControllers(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all ReplicationControllers across all clusters. func (c *replicationControllersClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ReplicationControllers(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ReplicationControllers(metav1.NamespaceAll).Watch(ctx, opts) } // ReplicationControllersNamespacer can scope to objects within a namespace, returning a corev1client.ReplicationControllerInterface. @@ -77,9 +77,9 @@ type ReplicationControllersNamespacer interface { type replicationControllersNamespacer struct { clientCache kcpclient.Cache[*corev1client.CoreV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *replicationControllersNamespacer) Namespace(namespace string) corev1client.ReplicationControllerInterface { - return n.clientCache.ClusterOrDie(n.name).ReplicationControllers(namespace) + return n.clientCache.ClusterOrDie(n.path).ReplicationControllers(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/resourcequota.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/resourcequota.go index e7140a68cb623..034563f661dc7 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/resourcequota.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/resourcequota.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ResourceQuotasClusterGetter interface { // ResourceQuotaClusterInterface can operate on ResourceQuotas across all clusters, // or scope down to one cluster and return a ResourceQuotasNamespacer. type ResourceQuotaClusterInterface interface { - Cluster(logicalcluster.Name) ResourceQuotasNamespacer + Cluster(logicalcluster.Path) ResourceQuotasNamespacer List(ctx context.Context, opts metav1.ListOptions) (*corev1.ResourceQuotaList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type resourceQuotasClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *resourceQuotasClusterInterface) Cluster(name logicalcluster.Name) ResourceQuotasNamespacer { - if name == logicalcluster.Wildcard { +func (c *resourceQuotasClusterInterface) Cluster(path logicalcluster.Path) ResourceQuotasNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &resourceQuotasNamespacer{clientCache: c.clientCache, name: name} + return &resourceQuotasNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all ResourceQuotas across all clusters. func (c *resourceQuotasClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.ResourceQuotaList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ResourceQuotas(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ResourceQuotas(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all ResourceQuotas across all clusters. func (c *resourceQuotasClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ResourceQuotas(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ResourceQuotas(metav1.NamespaceAll).Watch(ctx, opts) } // ResourceQuotasNamespacer can scope to objects within a namespace, returning a corev1client.ResourceQuotaInterface. @@ -77,9 +77,9 @@ type ResourceQuotasNamespacer interface { type resourceQuotasNamespacer struct { clientCache kcpclient.Cache[*corev1client.CoreV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *resourceQuotasNamespacer) Namespace(namespace string) corev1client.ResourceQuotaInterface { - return n.clientCache.ClusterOrDie(n.name).ResourceQuotas(namespace) + return n.clientCache.ClusterOrDie(n.path).ResourceQuotas(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/secret.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/secret.go index 044f0df96d7df..a9c1b26bd3c6a 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/secret.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/secret.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type SecretsClusterGetter interface { // SecretClusterInterface can operate on Secrets across all clusters, // or scope down to one cluster and return a SecretsNamespacer. type SecretClusterInterface interface { - Cluster(logicalcluster.Name) SecretsNamespacer + Cluster(logicalcluster.Path) SecretsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*corev1.SecretList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type secretsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *secretsClusterInterface) Cluster(name logicalcluster.Name) SecretsNamespacer { - if name == logicalcluster.Wildcard { +func (c *secretsClusterInterface) Cluster(path logicalcluster.Path) SecretsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &secretsNamespacer{clientCache: c.clientCache, name: name} + return &secretsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Secrets across all clusters. func (c *secretsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.SecretList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Secrets(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Secrets(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Secrets across all clusters. func (c *secretsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Secrets(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Secrets(metav1.NamespaceAll).Watch(ctx, opts) } // SecretsNamespacer can scope to objects within a namespace, returning a corev1client.SecretInterface. @@ -77,9 +77,9 @@ type SecretsNamespacer interface { type secretsNamespacer struct { clientCache kcpclient.Cache[*corev1client.CoreV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *secretsNamespacer) Namespace(namespace string) corev1client.SecretInterface { - return n.clientCache.ClusterOrDie(n.name).Secrets(namespace) + return n.clientCache.ClusterOrDie(n.path).Secrets(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/service.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/service.go index f4c7757999b37..2b19049fa7ed9 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/service.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/service.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ServicesClusterGetter interface { // ServiceClusterInterface can operate on Services across all clusters, // or scope down to one cluster and return a ServicesNamespacer. type ServiceClusterInterface interface { - Cluster(logicalcluster.Name) ServicesNamespacer + Cluster(logicalcluster.Path) ServicesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*corev1.ServiceList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type servicesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *servicesClusterInterface) Cluster(name logicalcluster.Name) ServicesNamespacer { - if name == logicalcluster.Wildcard { +func (c *servicesClusterInterface) Cluster(path logicalcluster.Path) ServicesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &servicesNamespacer{clientCache: c.clientCache, name: name} + return &servicesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Services across all clusters. func (c *servicesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.ServiceList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Services(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Services(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Services across all clusters. func (c *servicesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Services(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Services(metav1.NamespaceAll).Watch(ctx, opts) } // ServicesNamespacer can scope to objects within a namespace, returning a corev1client.ServiceInterface. @@ -77,9 +77,9 @@ type ServicesNamespacer interface { type servicesNamespacer struct { clientCache kcpclient.Cache[*corev1client.CoreV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *servicesNamespacer) Namespace(namespace string) corev1client.ServiceInterface { - return n.clientCache.ClusterOrDie(n.name).Services(namespace) + return n.clientCache.ClusterOrDie(n.path).Services(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/serviceaccount.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/serviceaccount.go index 08bb47dc80a49..8e7cd04e24131 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/serviceaccount.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/core/v1/serviceaccount.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ServiceAccountsClusterGetter interface { // ServiceAccountClusterInterface can operate on ServiceAccounts across all clusters, // or scope down to one cluster and return a ServiceAccountsNamespacer. type ServiceAccountClusterInterface interface { - Cluster(logicalcluster.Name) ServiceAccountsNamespacer + Cluster(logicalcluster.Path) ServiceAccountsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*corev1.ServiceAccountList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type serviceAccountsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *serviceAccountsClusterInterface) Cluster(name logicalcluster.Name) ServiceAccountsNamespacer { - if name == logicalcluster.Wildcard { +func (c *serviceAccountsClusterInterface) Cluster(path logicalcluster.Path) ServiceAccountsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &serviceAccountsNamespacer{clientCache: c.clientCache, name: name} + return &serviceAccountsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all ServiceAccounts across all clusters. func (c *serviceAccountsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*corev1.ServiceAccountList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ServiceAccounts(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ServiceAccounts(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all ServiceAccounts across all clusters. func (c *serviceAccountsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ServiceAccounts(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ServiceAccounts(metav1.NamespaceAll).Watch(ctx, opts) } // ServiceAccountsNamespacer can scope to objects within a namespace, returning a corev1client.ServiceAccountInterface. @@ -77,9 +77,9 @@ type ServiceAccountsNamespacer interface { type serviceAccountsNamespacer struct { clientCache kcpclient.Cache[*corev1client.CoreV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *serviceAccountsNamespacer) Namespace(namespace string) corev1client.ServiceAccountInterface { - return n.clientCache.ClusterOrDie(n.name).ServiceAccounts(namespace) + return n.clientCache.ClusterOrDie(n.path).ServiceAccounts(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1/discovery_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1/discovery_client.go index b9634c263e993..a39a2c06bd95e 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1/discovery_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1/discovery_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" discoveryv1 "k8s.io/client-go/kubernetes/typed/discovery/v1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type DiscoveryV1ClusterInterface interface { } type DiscoveryV1ClusterScoper interface { - Cluster(logicalcluster.Name) discoveryv1.DiscoveryV1Interface + Cluster(logicalcluster.Path) discoveryv1.DiscoveryV1Interface } type DiscoveryV1ClusterClient struct { clientCache kcpclient.Cache[*discoveryv1.DiscoveryV1Client] } -func (c *DiscoveryV1ClusterClient) Cluster(name logicalcluster.Name) discoveryv1.DiscoveryV1Interface { - if name == logicalcluster.Wildcard { +func (c *DiscoveryV1ClusterClient) Cluster(path logicalcluster.Path) discoveryv1.DiscoveryV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *DiscoveryV1ClusterClient) EndpointSlices() EndpointSliceClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1/endpointslice.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1/endpointslice.go index 20182cd96c68c..46932cef7a668 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1/endpointslice.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1/endpointslice.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" discoveryv1 "k8s.io/api/discovery/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type EndpointSlicesClusterGetter interface { // EndpointSliceClusterInterface can operate on EndpointSlices across all clusters, // or scope down to one cluster and return a EndpointSlicesNamespacer. type EndpointSliceClusterInterface interface { - Cluster(logicalcluster.Name) EndpointSlicesNamespacer + Cluster(logicalcluster.Path) EndpointSlicesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*discoveryv1.EndpointSliceList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type endpointSlicesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *endpointSlicesClusterInterface) Cluster(name logicalcluster.Name) EndpointSlicesNamespacer { - if name == logicalcluster.Wildcard { +func (c *endpointSlicesClusterInterface) Cluster(path logicalcluster.Path) EndpointSlicesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &endpointSlicesNamespacer{clientCache: c.clientCache, name: name} + return &endpointSlicesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all EndpointSlices across all clusters. func (c *endpointSlicesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*discoveryv1.EndpointSliceList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).EndpointSlices(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).EndpointSlices(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all EndpointSlices across all clusters. func (c *endpointSlicesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).EndpointSlices(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).EndpointSlices(metav1.NamespaceAll).Watch(ctx, opts) } // EndpointSlicesNamespacer can scope to objects within a namespace, returning a discoveryv1client.EndpointSliceInterface. @@ -77,9 +77,9 @@ type EndpointSlicesNamespacer interface { type endpointSlicesNamespacer struct { clientCache kcpclient.Cache[*discoveryv1client.DiscoveryV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *endpointSlicesNamespacer) Namespace(namespace string) discoveryv1client.EndpointSliceInterface { - return n.clientCache.ClusterOrDie(n.name).EndpointSlices(namespace) + return n.clientCache.ClusterOrDie(n.path).EndpointSlices(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1beta1/discovery_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1beta1/discovery_client.go index bc7b3dec3b63b..76ec739f7d38b 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1beta1/discovery_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1beta1/discovery_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" discoveryv1beta1 "k8s.io/client-go/kubernetes/typed/discovery/v1beta1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type DiscoveryV1beta1ClusterInterface interface { } type DiscoveryV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) discoveryv1beta1.DiscoveryV1beta1Interface + Cluster(logicalcluster.Path) discoveryv1beta1.DiscoveryV1beta1Interface } type DiscoveryV1beta1ClusterClient struct { clientCache kcpclient.Cache[*discoveryv1beta1.DiscoveryV1beta1Client] } -func (c *DiscoveryV1beta1ClusterClient) Cluster(name logicalcluster.Name) discoveryv1beta1.DiscoveryV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *DiscoveryV1beta1ClusterClient) Cluster(path logicalcluster.Path) discoveryv1beta1.DiscoveryV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *DiscoveryV1beta1ClusterClient) EndpointSlices() EndpointSliceClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1beta1/endpointslice.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1beta1/endpointslice.go index 35da89d2ccee8..729a5a417de9b 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1beta1/endpointslice.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/discovery/v1beta1/endpointslice.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" discoveryv1beta1 "k8s.io/api/discovery/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type EndpointSlicesClusterGetter interface { // EndpointSliceClusterInterface can operate on EndpointSlices across all clusters, // or scope down to one cluster and return a EndpointSlicesNamespacer. type EndpointSliceClusterInterface interface { - Cluster(logicalcluster.Name) EndpointSlicesNamespacer + Cluster(logicalcluster.Path) EndpointSlicesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*discoveryv1beta1.EndpointSliceList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type endpointSlicesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *endpointSlicesClusterInterface) Cluster(name logicalcluster.Name) EndpointSlicesNamespacer { - if name == logicalcluster.Wildcard { +func (c *endpointSlicesClusterInterface) Cluster(path logicalcluster.Path) EndpointSlicesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &endpointSlicesNamespacer{clientCache: c.clientCache, name: name} + return &endpointSlicesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all EndpointSlices across all clusters. func (c *endpointSlicesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*discoveryv1beta1.EndpointSliceList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).EndpointSlices(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).EndpointSlices(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all EndpointSlices across all clusters. func (c *endpointSlicesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).EndpointSlices(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).EndpointSlices(metav1.NamespaceAll).Watch(ctx, opts) } // EndpointSlicesNamespacer can scope to objects within a namespace, returning a discoveryv1beta1client.EndpointSliceInterface. @@ -77,9 +77,9 @@ type EndpointSlicesNamespacer interface { type endpointSlicesNamespacer struct { clientCache kcpclient.Cache[*discoveryv1beta1client.DiscoveryV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *endpointSlicesNamespacer) Namespace(namespace string) discoveryv1beta1client.EndpointSliceInterface { - return n.clientCache.ClusterOrDie(n.name).EndpointSlices(namespace) + return n.clientCache.ClusterOrDie(n.path).EndpointSlices(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1/event.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1/event.go index d9dfe87fdcfa0..c87556b0ad1f8 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1/event.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1/event.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" eventsv1 "k8s.io/api/events/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type EventsClusterGetter interface { // EventClusterInterface can operate on Events across all clusters, // or scope down to one cluster and return a EventsNamespacer. type EventClusterInterface interface { - Cluster(logicalcluster.Name) EventsNamespacer + Cluster(logicalcluster.Path) EventsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*eventsv1.EventList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type eventsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *eventsClusterInterface) Cluster(name logicalcluster.Name) EventsNamespacer { - if name == logicalcluster.Wildcard { +func (c *eventsClusterInterface) Cluster(path logicalcluster.Path) EventsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &eventsNamespacer{clientCache: c.clientCache, name: name} + return &eventsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Events across all clusters. func (c *eventsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*eventsv1.EventList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Events(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Events(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Events across all clusters. func (c *eventsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Events(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Events(metav1.NamespaceAll).Watch(ctx, opts) } // EventsNamespacer can scope to objects within a namespace, returning a eventsv1client.EventInterface. @@ -77,9 +77,9 @@ type EventsNamespacer interface { type eventsNamespacer struct { clientCache kcpclient.Cache[*eventsv1client.EventsV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *eventsNamespacer) Namespace(namespace string) eventsv1client.EventInterface { - return n.clientCache.ClusterOrDie(n.name).Events(namespace) + return n.clientCache.ClusterOrDie(n.path).Events(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1/events_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1/events_client.go index 845c4ac7962b5..f6011f0b06596 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1/events_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1/events_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" eventsv1 "k8s.io/client-go/kubernetes/typed/events/v1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type EventsV1ClusterInterface interface { } type EventsV1ClusterScoper interface { - Cluster(logicalcluster.Name) eventsv1.EventsV1Interface + Cluster(logicalcluster.Path) eventsv1.EventsV1Interface } type EventsV1ClusterClient struct { clientCache kcpclient.Cache[*eventsv1.EventsV1Client] } -func (c *EventsV1ClusterClient) Cluster(name logicalcluster.Name) eventsv1.EventsV1Interface { - if name == logicalcluster.Wildcard { +func (c *EventsV1ClusterClient) Cluster(path logicalcluster.Path) eventsv1.EventsV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *EventsV1ClusterClient) Events() EventClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1beta1/event.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1beta1/event.go index 9cd96beeedf2d..4461f3fd74343 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1beta1/event.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1beta1/event.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" eventsv1beta1 "k8s.io/api/events/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type EventsClusterGetter interface { // EventClusterInterface can operate on Events across all clusters, // or scope down to one cluster and return a EventsNamespacer. type EventClusterInterface interface { - Cluster(logicalcluster.Name) EventsNamespacer + Cluster(logicalcluster.Path) EventsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*eventsv1beta1.EventList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type eventsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *eventsClusterInterface) Cluster(name logicalcluster.Name) EventsNamespacer { - if name == logicalcluster.Wildcard { +func (c *eventsClusterInterface) Cluster(path logicalcluster.Path) EventsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &eventsNamespacer{clientCache: c.clientCache, name: name} + return &eventsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Events across all clusters. func (c *eventsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*eventsv1beta1.EventList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Events(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Events(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Events across all clusters. func (c *eventsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Events(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Events(metav1.NamespaceAll).Watch(ctx, opts) } // EventsNamespacer can scope to objects within a namespace, returning a eventsv1beta1client.EventInterface. @@ -77,9 +77,9 @@ type EventsNamespacer interface { type eventsNamespacer struct { clientCache kcpclient.Cache[*eventsv1beta1client.EventsV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *eventsNamespacer) Namespace(namespace string) eventsv1beta1client.EventInterface { - return n.clientCache.ClusterOrDie(n.name).Events(namespace) + return n.clientCache.ClusterOrDie(n.path).Events(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1beta1/events_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1beta1/events_client.go index 4bee25a1550c9..68cc656ffa3ea 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1beta1/events_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/events/v1beta1/events_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" eventsv1beta1 "k8s.io/client-go/kubernetes/typed/events/v1beta1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type EventsV1beta1ClusterInterface interface { } type EventsV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) eventsv1beta1.EventsV1beta1Interface + Cluster(logicalcluster.Path) eventsv1beta1.EventsV1beta1Interface } type EventsV1beta1ClusterClient struct { clientCache kcpclient.Cache[*eventsv1beta1.EventsV1beta1Client] } -func (c *EventsV1beta1ClusterClient) Cluster(name logicalcluster.Name) eventsv1beta1.EventsV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *EventsV1beta1ClusterClient) Cluster(path logicalcluster.Path) eventsv1beta1.EventsV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *EventsV1beta1ClusterClient) Events() EventClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/daemonset.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/daemonset.go index 7f37b41262b9e..1c8bd600479ec 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/daemonset.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/daemonset.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type DaemonSetsClusterGetter interface { // DaemonSetClusterInterface can operate on DaemonSets across all clusters, // or scope down to one cluster and return a DaemonSetsNamespacer. type DaemonSetClusterInterface interface { - Cluster(logicalcluster.Name) DaemonSetsNamespacer + Cluster(logicalcluster.Path) DaemonSetsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*extensionsv1beta1.DaemonSetList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type daemonSetsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *daemonSetsClusterInterface) Cluster(name logicalcluster.Name) DaemonSetsNamespacer { - if name == logicalcluster.Wildcard { +func (c *daemonSetsClusterInterface) Cluster(path logicalcluster.Path) DaemonSetsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &daemonSetsNamespacer{clientCache: c.clientCache, name: name} + return &daemonSetsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all DaemonSets across all clusters. func (c *daemonSetsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*extensionsv1beta1.DaemonSetList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).DaemonSets(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).DaemonSets(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all DaemonSets across all clusters. func (c *daemonSetsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).DaemonSets(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).DaemonSets(metav1.NamespaceAll).Watch(ctx, opts) } // DaemonSetsNamespacer can scope to objects within a namespace, returning a extensionsv1beta1client.DaemonSetInterface. @@ -77,9 +77,9 @@ type DaemonSetsNamespacer interface { type daemonSetsNamespacer struct { clientCache kcpclient.Cache[*extensionsv1beta1client.ExtensionsV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *daemonSetsNamespacer) Namespace(namespace string) extensionsv1beta1client.DaemonSetInterface { - return n.clientCache.ClusterOrDie(n.name).DaemonSets(namespace) + return n.clientCache.ClusterOrDie(n.path).DaemonSets(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/deployment.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/deployment.go index 25fc6f0b96b9b..8e0bd2a7f2eb5 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/deployment.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/deployment.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type DeploymentsClusterGetter interface { // DeploymentClusterInterface can operate on Deployments across all clusters, // or scope down to one cluster and return a DeploymentsNamespacer. type DeploymentClusterInterface interface { - Cluster(logicalcluster.Name) DeploymentsNamespacer + Cluster(logicalcluster.Path) DeploymentsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*extensionsv1beta1.DeploymentList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type deploymentsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *deploymentsClusterInterface) Cluster(name logicalcluster.Name) DeploymentsNamespacer { - if name == logicalcluster.Wildcard { +func (c *deploymentsClusterInterface) Cluster(path logicalcluster.Path) DeploymentsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &deploymentsNamespacer{clientCache: c.clientCache, name: name} + return &deploymentsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Deployments across all clusters. func (c *deploymentsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*extensionsv1beta1.DeploymentList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Deployments(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Deployments(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Deployments across all clusters. func (c *deploymentsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Deployments(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Deployments(metav1.NamespaceAll).Watch(ctx, opts) } // DeploymentsNamespacer can scope to objects within a namespace, returning a extensionsv1beta1client.DeploymentInterface. @@ -77,9 +77,9 @@ type DeploymentsNamespacer interface { type deploymentsNamespacer struct { clientCache kcpclient.Cache[*extensionsv1beta1client.ExtensionsV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *deploymentsNamespacer) Namespace(namespace string) extensionsv1beta1client.DeploymentInterface { - return n.clientCache.ClusterOrDie(n.name).Deployments(namespace) + return n.clientCache.ClusterOrDie(n.path).Deployments(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/extensions_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/extensions_client.go index f99494902d669..bac00b4a8ea51 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/extensions_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/extensions_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/client-go/kubernetes/typed/extensions/v1beta1" "k8s.io/client-go/rest" @@ -42,18 +42,18 @@ type ExtensionsV1beta1ClusterInterface interface { } type ExtensionsV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) extensionsv1beta1.ExtensionsV1beta1Interface + Cluster(logicalcluster.Path) extensionsv1beta1.ExtensionsV1beta1Interface } type ExtensionsV1beta1ClusterClient struct { clientCache kcpclient.Cache[*extensionsv1beta1.ExtensionsV1beta1Client] } -func (c *ExtensionsV1beta1ClusterClient) Cluster(name logicalcluster.Name) extensionsv1beta1.ExtensionsV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *ExtensionsV1beta1ClusterClient) Cluster(path logicalcluster.Path) extensionsv1beta1.ExtensionsV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *ExtensionsV1beta1ClusterClient) Deployments() DeploymentClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/ingress.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/ingress.go index ea65c900c92eb..6f79c54fc0eca 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/ingress.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/ingress.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type IngressesClusterGetter interface { // IngressClusterInterface can operate on Ingresses across all clusters, // or scope down to one cluster and return a IngressesNamespacer. type IngressClusterInterface interface { - Cluster(logicalcluster.Name) IngressesNamespacer + Cluster(logicalcluster.Path) IngressesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*extensionsv1beta1.IngressList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type ingressesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *ingressesClusterInterface) Cluster(name logicalcluster.Name) IngressesNamespacer { - if name == logicalcluster.Wildcard { +func (c *ingressesClusterInterface) Cluster(path logicalcluster.Path) IngressesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &ingressesNamespacer{clientCache: c.clientCache, name: name} + return &ingressesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Ingresses across all clusters. func (c *ingressesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*extensionsv1beta1.IngressList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Ingresses(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Ingresses(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Ingresses across all clusters. func (c *ingressesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Ingresses(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Ingresses(metav1.NamespaceAll).Watch(ctx, opts) } // IngressesNamespacer can scope to objects within a namespace, returning a extensionsv1beta1client.IngressInterface. @@ -77,9 +77,9 @@ type IngressesNamespacer interface { type ingressesNamespacer struct { clientCache kcpclient.Cache[*extensionsv1beta1client.ExtensionsV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *ingressesNamespacer) Namespace(namespace string) extensionsv1beta1client.IngressInterface { - return n.clientCache.ClusterOrDie(n.name).Ingresses(namespace) + return n.clientCache.ClusterOrDie(n.path).Ingresses(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/networkpolicy.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/networkpolicy.go index c01b05ff406e6..6391722963443 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/networkpolicy.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/networkpolicy.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type NetworkPoliciesClusterGetter interface { // NetworkPolicyClusterInterface can operate on NetworkPolicies across all clusters, // or scope down to one cluster and return a NetworkPoliciesNamespacer. type NetworkPolicyClusterInterface interface { - Cluster(logicalcluster.Name) NetworkPoliciesNamespacer + Cluster(logicalcluster.Path) NetworkPoliciesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*extensionsv1beta1.NetworkPolicyList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type networkPoliciesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *networkPoliciesClusterInterface) Cluster(name logicalcluster.Name) NetworkPoliciesNamespacer { - if name == logicalcluster.Wildcard { +func (c *networkPoliciesClusterInterface) Cluster(path logicalcluster.Path) NetworkPoliciesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &networkPoliciesNamespacer{clientCache: c.clientCache, name: name} + return &networkPoliciesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all NetworkPolicies across all clusters. func (c *networkPoliciesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*extensionsv1beta1.NetworkPolicyList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).NetworkPolicies(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).NetworkPolicies(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all NetworkPolicies across all clusters. func (c *networkPoliciesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).NetworkPolicies(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).NetworkPolicies(metav1.NamespaceAll).Watch(ctx, opts) } // NetworkPoliciesNamespacer can scope to objects within a namespace, returning a extensionsv1beta1client.NetworkPolicyInterface. @@ -77,9 +77,9 @@ type NetworkPoliciesNamespacer interface { type networkPoliciesNamespacer struct { clientCache kcpclient.Cache[*extensionsv1beta1client.ExtensionsV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *networkPoliciesNamespacer) Namespace(namespace string) extensionsv1beta1client.NetworkPolicyInterface { - return n.clientCache.ClusterOrDie(n.name).NetworkPolicies(namespace) + return n.clientCache.ClusterOrDie(n.path).NetworkPolicies(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/podsecuritypolicy.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/podsecuritypolicy.go index b1ac789347d50..6a089bfd1df80 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/podsecuritypolicy.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/podsecuritypolicy.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type PodSecurityPoliciesClusterGetter interface { // PodSecurityPolicyClusterInterface can operate on PodSecurityPolicies across all clusters, // or scope down to one cluster and return a extensionsv1beta1client.PodSecurityPolicyInterface. type PodSecurityPolicyClusterInterface interface { - Cluster(logicalcluster.Name) extensionsv1beta1client.PodSecurityPolicyInterface + Cluster(logicalcluster.Path) extensionsv1beta1client.PodSecurityPolicyInterface List(ctx context.Context, opts metav1.ListOptions) (*extensionsv1beta1.PodSecurityPolicyList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type podSecurityPoliciesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *podSecurityPoliciesClusterInterface) Cluster(name logicalcluster.Name) extensionsv1beta1client.PodSecurityPolicyInterface { - if name == logicalcluster.Wildcard { +func (c *podSecurityPoliciesClusterInterface) Cluster(path logicalcluster.Path) extensionsv1beta1client.PodSecurityPolicyInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).PodSecurityPolicies() + return c.clientCache.ClusterOrDie(path).PodSecurityPolicies() } // List returns the entire collection of all PodSecurityPolicies across all clusters. func (c *podSecurityPoliciesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*extensionsv1beta1.PodSecurityPolicyList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PodSecurityPolicies().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PodSecurityPolicies().List(ctx, opts) } // Watch begins to watch all PodSecurityPolicies across all clusters. func (c *podSecurityPoliciesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PodSecurityPolicies().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PodSecurityPolicies().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go index 62fa53f10670d..3212933852ff0 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ReplicaSetsClusterGetter interface { // ReplicaSetClusterInterface can operate on ReplicaSets across all clusters, // or scope down to one cluster and return a ReplicaSetsNamespacer. type ReplicaSetClusterInterface interface { - Cluster(logicalcluster.Name) ReplicaSetsNamespacer + Cluster(logicalcluster.Path) ReplicaSetsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*extensionsv1beta1.ReplicaSetList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type replicaSetsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *replicaSetsClusterInterface) Cluster(name logicalcluster.Name) ReplicaSetsNamespacer { - if name == logicalcluster.Wildcard { +func (c *replicaSetsClusterInterface) Cluster(path logicalcluster.Path) ReplicaSetsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &replicaSetsNamespacer{clientCache: c.clientCache, name: name} + return &replicaSetsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all ReplicaSets across all clusters. func (c *replicaSetsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*extensionsv1beta1.ReplicaSetList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ReplicaSets(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ReplicaSets(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all ReplicaSets across all clusters. func (c *replicaSetsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ReplicaSets(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ReplicaSets(metav1.NamespaceAll).Watch(ctx, opts) } // ReplicaSetsNamespacer can scope to objects within a namespace, returning a extensionsv1beta1client.ReplicaSetInterface. @@ -77,9 +77,9 @@ type ReplicaSetsNamespacer interface { type replicaSetsNamespacer struct { clientCache kcpclient.Cache[*extensionsv1beta1client.ExtensionsV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *replicaSetsNamespacer) Namespace(namespace string) extensionsv1beta1client.ReplicaSetInterface { - return n.clientCache.ClusterOrDie(n.name).ReplicaSets(namespace) + return n.clientCache.ClusterOrDie(n.path).ReplicaSets(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1alpha1/flowcontrol_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1alpha1/flowcontrol_client.go index 56ab654e12bbe..03b8701367dac 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1alpha1/flowcontrol_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1alpha1/flowcontrol_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1alpha1 "k8s.io/client-go/kubernetes/typed/flowcontrol/v1alpha1" "k8s.io/client-go/rest" @@ -38,18 +38,18 @@ type FlowcontrolV1alpha1ClusterInterface interface { } type FlowcontrolV1alpha1ClusterScoper interface { - Cluster(logicalcluster.Name) flowcontrolv1alpha1.FlowcontrolV1alpha1Interface + Cluster(logicalcluster.Path) flowcontrolv1alpha1.FlowcontrolV1alpha1Interface } type FlowcontrolV1alpha1ClusterClient struct { clientCache kcpclient.Cache[*flowcontrolv1alpha1.FlowcontrolV1alpha1Client] } -func (c *FlowcontrolV1alpha1ClusterClient) Cluster(name logicalcluster.Name) flowcontrolv1alpha1.FlowcontrolV1alpha1Interface { - if name == logicalcluster.Wildcard { +func (c *FlowcontrolV1alpha1ClusterClient) Cluster(path logicalcluster.Path) flowcontrolv1alpha1.FlowcontrolV1alpha1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *FlowcontrolV1alpha1ClusterClient) FlowSchemas() FlowSchemaClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1alpha1/flowschema.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1alpha1/flowschema.go index 82ff13d28ec3d..45b9f3bdc2793 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1alpha1/flowschema.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1alpha1/flowschema.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1alpha1 "k8s.io/api/flowcontrol/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type FlowSchemasClusterGetter interface { // FlowSchemaClusterInterface can operate on FlowSchemas across all clusters, // or scope down to one cluster and return a flowcontrolv1alpha1client.FlowSchemaInterface. type FlowSchemaClusterInterface interface { - Cluster(logicalcluster.Name) flowcontrolv1alpha1client.FlowSchemaInterface + Cluster(logicalcluster.Path) flowcontrolv1alpha1client.FlowSchemaInterface List(ctx context.Context, opts metav1.ListOptions) (*flowcontrolv1alpha1.FlowSchemaList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type flowSchemasClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *flowSchemasClusterInterface) Cluster(name logicalcluster.Name) flowcontrolv1alpha1client.FlowSchemaInterface { - if name == logicalcluster.Wildcard { +func (c *flowSchemasClusterInterface) Cluster(path logicalcluster.Path) flowcontrolv1alpha1client.FlowSchemaInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).FlowSchemas() + return c.clientCache.ClusterOrDie(path).FlowSchemas() } // List returns the entire collection of all FlowSchemas across all clusters. func (c *flowSchemasClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*flowcontrolv1alpha1.FlowSchemaList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).FlowSchemas().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).FlowSchemas().List(ctx, opts) } // Watch begins to watch all FlowSchemas across all clusters. func (c *flowSchemasClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).FlowSchemas().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).FlowSchemas().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1alpha1/prioritylevelconfiguration.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1alpha1/prioritylevelconfiguration.go index b763d3f1d72ce..192acd67b4ab4 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1alpha1/prioritylevelconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1alpha1/prioritylevelconfiguration.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1alpha1 "k8s.io/api/flowcontrol/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type PriorityLevelConfigurationsClusterGetter interface { // PriorityLevelConfigurationClusterInterface can operate on PriorityLevelConfigurations across all clusters, // or scope down to one cluster and return a flowcontrolv1alpha1client.PriorityLevelConfigurationInterface. type PriorityLevelConfigurationClusterInterface interface { - Cluster(logicalcluster.Name) flowcontrolv1alpha1client.PriorityLevelConfigurationInterface + Cluster(logicalcluster.Path) flowcontrolv1alpha1client.PriorityLevelConfigurationInterface List(ctx context.Context, opts metav1.ListOptions) (*flowcontrolv1alpha1.PriorityLevelConfigurationList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type priorityLevelConfigurationsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *priorityLevelConfigurationsClusterInterface) Cluster(name logicalcluster.Name) flowcontrolv1alpha1client.PriorityLevelConfigurationInterface { - if name == logicalcluster.Wildcard { +func (c *priorityLevelConfigurationsClusterInterface) Cluster(path logicalcluster.Path) flowcontrolv1alpha1client.PriorityLevelConfigurationInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).PriorityLevelConfigurations() + return c.clientCache.ClusterOrDie(path).PriorityLevelConfigurations() } // List returns the entire collection of all PriorityLevelConfigurations across all clusters. func (c *priorityLevelConfigurationsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*flowcontrolv1alpha1.PriorityLevelConfigurationList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PriorityLevelConfigurations().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PriorityLevelConfigurations().List(ctx, opts) } // Watch begins to watch all PriorityLevelConfigurations across all clusters. func (c *priorityLevelConfigurationsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PriorityLevelConfigurations().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PriorityLevelConfigurations().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta1/flowcontrol_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta1/flowcontrol_client.go index 9d2beaa1d23bb..ee45f153aa4aa 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta1/flowcontrol_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta1/flowcontrol_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1beta1 "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1" "k8s.io/client-go/rest" @@ -38,18 +38,18 @@ type FlowcontrolV1beta1ClusterInterface interface { } type FlowcontrolV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) flowcontrolv1beta1.FlowcontrolV1beta1Interface + Cluster(logicalcluster.Path) flowcontrolv1beta1.FlowcontrolV1beta1Interface } type FlowcontrolV1beta1ClusterClient struct { clientCache kcpclient.Cache[*flowcontrolv1beta1.FlowcontrolV1beta1Client] } -func (c *FlowcontrolV1beta1ClusterClient) Cluster(name logicalcluster.Name) flowcontrolv1beta1.FlowcontrolV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *FlowcontrolV1beta1ClusterClient) Cluster(path logicalcluster.Path) flowcontrolv1beta1.FlowcontrolV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *FlowcontrolV1beta1ClusterClient) FlowSchemas() FlowSchemaClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta1/flowschema.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta1/flowschema.go index f0f53e79b4784..c8d6e214adfdc 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta1/flowschema.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta1/flowschema.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type FlowSchemasClusterGetter interface { // FlowSchemaClusterInterface can operate on FlowSchemas across all clusters, // or scope down to one cluster and return a flowcontrolv1beta1client.FlowSchemaInterface. type FlowSchemaClusterInterface interface { - Cluster(logicalcluster.Name) flowcontrolv1beta1client.FlowSchemaInterface + Cluster(logicalcluster.Path) flowcontrolv1beta1client.FlowSchemaInterface List(ctx context.Context, opts metav1.ListOptions) (*flowcontrolv1beta1.FlowSchemaList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type flowSchemasClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *flowSchemasClusterInterface) Cluster(name logicalcluster.Name) flowcontrolv1beta1client.FlowSchemaInterface { - if name == logicalcluster.Wildcard { +func (c *flowSchemasClusterInterface) Cluster(path logicalcluster.Path) flowcontrolv1beta1client.FlowSchemaInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).FlowSchemas() + return c.clientCache.ClusterOrDie(path).FlowSchemas() } // List returns the entire collection of all FlowSchemas across all clusters. func (c *flowSchemasClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*flowcontrolv1beta1.FlowSchemaList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).FlowSchemas().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).FlowSchemas().List(ctx, opts) } // Watch begins to watch all FlowSchemas across all clusters. func (c *flowSchemasClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).FlowSchemas().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).FlowSchemas().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta1/prioritylevelconfiguration.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta1/prioritylevelconfiguration.go index 3589af611db54..9d24ee8c2565e 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta1/prioritylevelconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta1/prioritylevelconfiguration.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type PriorityLevelConfigurationsClusterGetter interface { // PriorityLevelConfigurationClusterInterface can operate on PriorityLevelConfigurations across all clusters, // or scope down to one cluster and return a flowcontrolv1beta1client.PriorityLevelConfigurationInterface. type PriorityLevelConfigurationClusterInterface interface { - Cluster(logicalcluster.Name) flowcontrolv1beta1client.PriorityLevelConfigurationInterface + Cluster(logicalcluster.Path) flowcontrolv1beta1client.PriorityLevelConfigurationInterface List(ctx context.Context, opts metav1.ListOptions) (*flowcontrolv1beta1.PriorityLevelConfigurationList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type priorityLevelConfigurationsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *priorityLevelConfigurationsClusterInterface) Cluster(name logicalcluster.Name) flowcontrolv1beta1client.PriorityLevelConfigurationInterface { - if name == logicalcluster.Wildcard { +func (c *priorityLevelConfigurationsClusterInterface) Cluster(path logicalcluster.Path) flowcontrolv1beta1client.PriorityLevelConfigurationInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).PriorityLevelConfigurations() + return c.clientCache.ClusterOrDie(path).PriorityLevelConfigurations() } // List returns the entire collection of all PriorityLevelConfigurations across all clusters. func (c *priorityLevelConfigurationsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*flowcontrolv1beta1.PriorityLevelConfigurationList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PriorityLevelConfigurations().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PriorityLevelConfigurations().List(ctx, opts) } // Watch begins to watch all PriorityLevelConfigurations across all clusters. func (c *priorityLevelConfigurationsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PriorityLevelConfigurations().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PriorityLevelConfigurations().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta2/flowcontrol_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta2/flowcontrol_client.go index 5c673c1f0cad9..43492062ee902 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta2/flowcontrol_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta2/flowcontrol_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1beta2 "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2" "k8s.io/client-go/rest" @@ -38,18 +38,18 @@ type FlowcontrolV1beta2ClusterInterface interface { } type FlowcontrolV1beta2ClusterScoper interface { - Cluster(logicalcluster.Name) flowcontrolv1beta2.FlowcontrolV1beta2Interface + Cluster(logicalcluster.Path) flowcontrolv1beta2.FlowcontrolV1beta2Interface } type FlowcontrolV1beta2ClusterClient struct { clientCache kcpclient.Cache[*flowcontrolv1beta2.FlowcontrolV1beta2Client] } -func (c *FlowcontrolV1beta2ClusterClient) Cluster(name logicalcluster.Name) flowcontrolv1beta2.FlowcontrolV1beta2Interface { - if name == logicalcluster.Wildcard { +func (c *FlowcontrolV1beta2ClusterClient) Cluster(path logicalcluster.Path) flowcontrolv1beta2.FlowcontrolV1beta2Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *FlowcontrolV1beta2ClusterClient) FlowSchemas() FlowSchemaClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta2/flowschema.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta2/flowschema.go index d418e59a921ac..dd62da9be1d6c 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta2/flowschema.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta2/flowschema.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type FlowSchemasClusterGetter interface { // FlowSchemaClusterInterface can operate on FlowSchemas across all clusters, // or scope down to one cluster and return a flowcontrolv1beta2client.FlowSchemaInterface. type FlowSchemaClusterInterface interface { - Cluster(logicalcluster.Name) flowcontrolv1beta2client.FlowSchemaInterface + Cluster(logicalcluster.Path) flowcontrolv1beta2client.FlowSchemaInterface List(ctx context.Context, opts metav1.ListOptions) (*flowcontrolv1beta2.FlowSchemaList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type flowSchemasClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *flowSchemasClusterInterface) Cluster(name logicalcluster.Name) flowcontrolv1beta2client.FlowSchemaInterface { - if name == logicalcluster.Wildcard { +func (c *flowSchemasClusterInterface) Cluster(path logicalcluster.Path) flowcontrolv1beta2client.FlowSchemaInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).FlowSchemas() + return c.clientCache.ClusterOrDie(path).FlowSchemas() } // List returns the entire collection of all FlowSchemas across all clusters. func (c *flowSchemasClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*flowcontrolv1beta2.FlowSchemaList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).FlowSchemas().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).FlowSchemas().List(ctx, opts) } // Watch begins to watch all FlowSchemas across all clusters. func (c *flowSchemasClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).FlowSchemas().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).FlowSchemas().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta2/prioritylevelconfiguration.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta2/prioritylevelconfiguration.go index 5bbf468ee519c..e8f486105b35f 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta2/prioritylevelconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/flowcontrol/v1beta2/prioritylevelconfiguration.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type PriorityLevelConfigurationsClusterGetter interface { // PriorityLevelConfigurationClusterInterface can operate on PriorityLevelConfigurations across all clusters, // or scope down to one cluster and return a flowcontrolv1beta2client.PriorityLevelConfigurationInterface. type PriorityLevelConfigurationClusterInterface interface { - Cluster(logicalcluster.Name) flowcontrolv1beta2client.PriorityLevelConfigurationInterface + Cluster(logicalcluster.Path) flowcontrolv1beta2client.PriorityLevelConfigurationInterface List(ctx context.Context, opts metav1.ListOptions) (*flowcontrolv1beta2.PriorityLevelConfigurationList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type priorityLevelConfigurationsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *priorityLevelConfigurationsClusterInterface) Cluster(name logicalcluster.Name) flowcontrolv1beta2client.PriorityLevelConfigurationInterface { - if name == logicalcluster.Wildcard { +func (c *priorityLevelConfigurationsClusterInterface) Cluster(path logicalcluster.Path) flowcontrolv1beta2client.PriorityLevelConfigurationInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).PriorityLevelConfigurations() + return c.clientCache.ClusterOrDie(path).PriorityLevelConfigurations() } // List returns the entire collection of all PriorityLevelConfigurations across all clusters. func (c *priorityLevelConfigurationsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*flowcontrolv1beta2.PriorityLevelConfigurationList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PriorityLevelConfigurations().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PriorityLevelConfigurations().List(ctx, opts) } // Watch begins to watch all PriorityLevelConfigurations across all clusters. func (c *priorityLevelConfigurationsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PriorityLevelConfigurations().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PriorityLevelConfigurations().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/ingress.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/ingress.go index fb59f7a03d7fd..28fc29b2d6b6c 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/ingress.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/ingress.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type IngressesClusterGetter interface { // IngressClusterInterface can operate on Ingresses across all clusters, // or scope down to one cluster and return a IngressesNamespacer. type IngressClusterInterface interface { - Cluster(logicalcluster.Name) IngressesNamespacer + Cluster(logicalcluster.Path) IngressesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*networkingv1.IngressList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type ingressesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *ingressesClusterInterface) Cluster(name logicalcluster.Name) IngressesNamespacer { - if name == logicalcluster.Wildcard { +func (c *ingressesClusterInterface) Cluster(path logicalcluster.Path) IngressesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &ingressesNamespacer{clientCache: c.clientCache, name: name} + return &ingressesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Ingresses across all clusters. func (c *ingressesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*networkingv1.IngressList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Ingresses(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Ingresses(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Ingresses across all clusters. func (c *ingressesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Ingresses(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Ingresses(metav1.NamespaceAll).Watch(ctx, opts) } // IngressesNamespacer can scope to objects within a namespace, returning a networkingv1client.IngressInterface. @@ -77,9 +77,9 @@ type IngressesNamespacer interface { type ingressesNamespacer struct { clientCache kcpclient.Cache[*networkingv1client.NetworkingV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *ingressesNamespacer) Namespace(namespace string) networkingv1client.IngressInterface { - return n.clientCache.ClusterOrDie(n.name).Ingresses(namespace) + return n.clientCache.ClusterOrDie(n.path).Ingresses(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/ingressclass.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/ingressclass.go index 97504271f9210..c01e21f852cb8 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/ingressclass.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/ingressclass.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type IngressClassesClusterGetter interface { // IngressClassClusterInterface can operate on IngressClasses across all clusters, // or scope down to one cluster and return a networkingv1client.IngressClassInterface. type IngressClassClusterInterface interface { - Cluster(logicalcluster.Name) networkingv1client.IngressClassInterface + Cluster(logicalcluster.Path) networkingv1client.IngressClassInterface List(ctx context.Context, opts metav1.ListOptions) (*networkingv1.IngressClassList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type ingressClassesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *ingressClassesClusterInterface) Cluster(name logicalcluster.Name) networkingv1client.IngressClassInterface { - if name == logicalcluster.Wildcard { +func (c *ingressClassesClusterInterface) Cluster(path logicalcluster.Path) networkingv1client.IngressClassInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).IngressClasses() + return c.clientCache.ClusterOrDie(path).IngressClasses() } // List returns the entire collection of all IngressClasses across all clusters. func (c *ingressClassesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*networkingv1.IngressClassList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).IngressClasses().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).IngressClasses().List(ctx, opts) } // Watch begins to watch all IngressClasses across all clusters. func (c *ingressClassesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).IngressClasses().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).IngressClasses().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/networking_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/networking_client.go index 57ba4a880221a..db3913260961f 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/networking_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/networking_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1 "k8s.io/client-go/kubernetes/typed/networking/v1" "k8s.io/client-go/rest" @@ -39,18 +39,18 @@ type NetworkingV1ClusterInterface interface { } type NetworkingV1ClusterScoper interface { - Cluster(logicalcluster.Name) networkingv1.NetworkingV1Interface + Cluster(logicalcluster.Path) networkingv1.NetworkingV1Interface } type NetworkingV1ClusterClient struct { clientCache kcpclient.Cache[*networkingv1.NetworkingV1Client] } -func (c *NetworkingV1ClusterClient) Cluster(name logicalcluster.Name) networkingv1.NetworkingV1Interface { - if name == logicalcluster.Wildcard { +func (c *NetworkingV1ClusterClient) Cluster(path logicalcluster.Path) networkingv1.NetworkingV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *NetworkingV1ClusterClient) NetworkPolicies() NetworkPolicyClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/networkpolicy.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/networkpolicy.go index 93eaa7cdf3f51..c0a43cbea4776 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/networkpolicy.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1/networkpolicy.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type NetworkPoliciesClusterGetter interface { // NetworkPolicyClusterInterface can operate on NetworkPolicies across all clusters, // or scope down to one cluster and return a NetworkPoliciesNamespacer. type NetworkPolicyClusterInterface interface { - Cluster(logicalcluster.Name) NetworkPoliciesNamespacer + Cluster(logicalcluster.Path) NetworkPoliciesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*networkingv1.NetworkPolicyList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type networkPoliciesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *networkPoliciesClusterInterface) Cluster(name logicalcluster.Name) NetworkPoliciesNamespacer { - if name == logicalcluster.Wildcard { +func (c *networkPoliciesClusterInterface) Cluster(path logicalcluster.Path) NetworkPoliciesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &networkPoliciesNamespacer{clientCache: c.clientCache, name: name} + return &networkPoliciesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all NetworkPolicies across all clusters. func (c *networkPoliciesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*networkingv1.NetworkPolicyList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).NetworkPolicies(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).NetworkPolicies(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all NetworkPolicies across all clusters. func (c *networkPoliciesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).NetworkPolicies(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).NetworkPolicies(metav1.NamespaceAll).Watch(ctx, opts) } // NetworkPoliciesNamespacer can scope to objects within a namespace, returning a networkingv1client.NetworkPolicyInterface. @@ -77,9 +77,9 @@ type NetworkPoliciesNamespacer interface { type networkPoliciesNamespacer struct { clientCache kcpclient.Cache[*networkingv1client.NetworkingV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *networkPoliciesNamespacer) Namespace(namespace string) networkingv1client.NetworkPolicyInterface { - return n.clientCache.ClusterOrDie(n.name).NetworkPolicies(namespace) + return n.clientCache.ClusterOrDie(n.path).NetworkPolicies(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1beta1/ingress.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1beta1/ingress.go index 99d73169f66c5..f8a90addf621f 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1beta1/ingress.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1beta1/ingress.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1beta1 "k8s.io/api/networking/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type IngressesClusterGetter interface { // IngressClusterInterface can operate on Ingresses across all clusters, // or scope down to one cluster and return a IngressesNamespacer. type IngressClusterInterface interface { - Cluster(logicalcluster.Name) IngressesNamespacer + Cluster(logicalcluster.Path) IngressesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*networkingv1beta1.IngressList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type ingressesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *ingressesClusterInterface) Cluster(name logicalcluster.Name) IngressesNamespacer { - if name == logicalcluster.Wildcard { +func (c *ingressesClusterInterface) Cluster(path logicalcluster.Path) IngressesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &ingressesNamespacer{clientCache: c.clientCache, name: name} + return &ingressesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Ingresses across all clusters. func (c *ingressesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*networkingv1beta1.IngressList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Ingresses(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Ingresses(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Ingresses across all clusters. func (c *ingressesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Ingresses(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Ingresses(metav1.NamespaceAll).Watch(ctx, opts) } // IngressesNamespacer can scope to objects within a namespace, returning a networkingv1beta1client.IngressInterface. @@ -77,9 +77,9 @@ type IngressesNamespacer interface { type ingressesNamespacer struct { clientCache kcpclient.Cache[*networkingv1beta1client.NetworkingV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *ingressesNamespacer) Namespace(namespace string) networkingv1beta1client.IngressInterface { - return n.clientCache.ClusterOrDie(n.name).Ingresses(namespace) + return n.clientCache.ClusterOrDie(n.path).Ingresses(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1beta1/ingressclass.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1beta1/ingressclass.go index edf2b87f763a0..f5a7c0913f91a 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1beta1/ingressclass.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1beta1/ingressclass.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1beta1 "k8s.io/api/networking/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type IngressClassesClusterGetter interface { // IngressClassClusterInterface can operate on IngressClasses across all clusters, // or scope down to one cluster and return a networkingv1beta1client.IngressClassInterface. type IngressClassClusterInterface interface { - Cluster(logicalcluster.Name) networkingv1beta1client.IngressClassInterface + Cluster(logicalcluster.Path) networkingv1beta1client.IngressClassInterface List(ctx context.Context, opts metav1.ListOptions) (*networkingv1beta1.IngressClassList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type ingressClassesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *ingressClassesClusterInterface) Cluster(name logicalcluster.Name) networkingv1beta1client.IngressClassInterface { - if name == logicalcluster.Wildcard { +func (c *ingressClassesClusterInterface) Cluster(path logicalcluster.Path) networkingv1beta1client.IngressClassInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).IngressClasses() + return c.clientCache.ClusterOrDie(path).IngressClasses() } // List returns the entire collection of all IngressClasses across all clusters. func (c *ingressClassesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*networkingv1beta1.IngressClassList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).IngressClasses().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).IngressClasses().List(ctx, opts) } // Watch begins to watch all IngressClasses across all clusters. func (c *ingressClassesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).IngressClasses().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).IngressClasses().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1beta1/networking_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1beta1/networking_client.go index 08a0b8cc08fb4..18ad17620ef4f 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1beta1/networking_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/networking/v1beta1/networking_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1beta1 "k8s.io/client-go/kubernetes/typed/networking/v1beta1" "k8s.io/client-go/rest" @@ -38,18 +38,18 @@ type NetworkingV1beta1ClusterInterface interface { } type NetworkingV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) networkingv1beta1.NetworkingV1beta1Interface + Cluster(logicalcluster.Path) networkingv1beta1.NetworkingV1beta1Interface } type NetworkingV1beta1ClusterClient struct { clientCache kcpclient.Cache[*networkingv1beta1.NetworkingV1beta1Client] } -func (c *NetworkingV1beta1ClusterClient) Cluster(name logicalcluster.Name) networkingv1beta1.NetworkingV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *NetworkingV1beta1ClusterClient) Cluster(path logicalcluster.Path) networkingv1beta1.NetworkingV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *NetworkingV1beta1ClusterClient) Ingresses() IngressClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1/node_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1/node_client.go index 09799aae98746..70baea542ac84 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1/node_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1/node_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" nodev1 "k8s.io/client-go/kubernetes/typed/node/v1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type NodeV1ClusterInterface interface { } type NodeV1ClusterScoper interface { - Cluster(logicalcluster.Name) nodev1.NodeV1Interface + Cluster(logicalcluster.Path) nodev1.NodeV1Interface } type NodeV1ClusterClient struct { clientCache kcpclient.Cache[*nodev1.NodeV1Client] } -func (c *NodeV1ClusterClient) Cluster(name logicalcluster.Name) nodev1.NodeV1Interface { - if name == logicalcluster.Wildcard { +func (c *NodeV1ClusterClient) Cluster(path logicalcluster.Path) nodev1.NodeV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *NodeV1ClusterClient) RuntimeClasses() RuntimeClassClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1/runtimeclass.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1/runtimeclass.go index 7ac7360026a42..4be09c0ed6b2f 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1/runtimeclass.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1/runtimeclass.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" nodev1 "k8s.io/api/node/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type RuntimeClassesClusterGetter interface { // RuntimeClassClusterInterface can operate on RuntimeClasses across all clusters, // or scope down to one cluster and return a nodev1client.RuntimeClassInterface. type RuntimeClassClusterInterface interface { - Cluster(logicalcluster.Name) nodev1client.RuntimeClassInterface + Cluster(logicalcluster.Path) nodev1client.RuntimeClassInterface List(ctx context.Context, opts metav1.ListOptions) (*nodev1.RuntimeClassList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type runtimeClassesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *runtimeClassesClusterInterface) Cluster(name logicalcluster.Name) nodev1client.RuntimeClassInterface { - if name == logicalcluster.Wildcard { +func (c *runtimeClassesClusterInterface) Cluster(path logicalcluster.Path) nodev1client.RuntimeClassInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).RuntimeClasses() + return c.clientCache.ClusterOrDie(path).RuntimeClasses() } // List returns the entire collection of all RuntimeClasses across all clusters. func (c *runtimeClassesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*nodev1.RuntimeClassList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).RuntimeClasses().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).RuntimeClasses().List(ctx, opts) } // Watch begins to watch all RuntimeClasses across all clusters. func (c *runtimeClassesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).RuntimeClasses().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).RuntimeClasses().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1alpha1/node_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1alpha1/node_client.go index 87537ad68f9f3..0868f5ad46572 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1alpha1/node_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1alpha1/node_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" nodev1alpha1 "k8s.io/client-go/kubernetes/typed/node/v1alpha1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type NodeV1alpha1ClusterInterface interface { } type NodeV1alpha1ClusterScoper interface { - Cluster(logicalcluster.Name) nodev1alpha1.NodeV1alpha1Interface + Cluster(logicalcluster.Path) nodev1alpha1.NodeV1alpha1Interface } type NodeV1alpha1ClusterClient struct { clientCache kcpclient.Cache[*nodev1alpha1.NodeV1alpha1Client] } -func (c *NodeV1alpha1ClusterClient) Cluster(name logicalcluster.Name) nodev1alpha1.NodeV1alpha1Interface { - if name == logicalcluster.Wildcard { +func (c *NodeV1alpha1ClusterClient) Cluster(path logicalcluster.Path) nodev1alpha1.NodeV1alpha1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *NodeV1alpha1ClusterClient) RuntimeClasses() RuntimeClassClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1alpha1/runtimeclass.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1alpha1/runtimeclass.go index 6ca1d8b6264e3..85f8391e17ae5 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1alpha1/runtimeclass.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1alpha1/runtimeclass.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" nodev1alpha1 "k8s.io/api/node/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type RuntimeClassesClusterGetter interface { // RuntimeClassClusterInterface can operate on RuntimeClasses across all clusters, // or scope down to one cluster and return a nodev1alpha1client.RuntimeClassInterface. type RuntimeClassClusterInterface interface { - Cluster(logicalcluster.Name) nodev1alpha1client.RuntimeClassInterface + Cluster(logicalcluster.Path) nodev1alpha1client.RuntimeClassInterface List(ctx context.Context, opts metav1.ListOptions) (*nodev1alpha1.RuntimeClassList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type runtimeClassesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *runtimeClassesClusterInterface) Cluster(name logicalcluster.Name) nodev1alpha1client.RuntimeClassInterface { - if name == logicalcluster.Wildcard { +func (c *runtimeClassesClusterInterface) Cluster(path logicalcluster.Path) nodev1alpha1client.RuntimeClassInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).RuntimeClasses() + return c.clientCache.ClusterOrDie(path).RuntimeClasses() } // List returns the entire collection of all RuntimeClasses across all clusters. func (c *runtimeClassesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*nodev1alpha1.RuntimeClassList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).RuntimeClasses().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).RuntimeClasses().List(ctx, opts) } // Watch begins to watch all RuntimeClasses across all clusters. func (c *runtimeClassesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).RuntimeClasses().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).RuntimeClasses().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1beta1/node_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1beta1/node_client.go index bfdf30092d29d..23351fdfaa88e 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1beta1/node_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1beta1/node_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" nodev1beta1 "k8s.io/client-go/kubernetes/typed/node/v1beta1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type NodeV1beta1ClusterInterface interface { } type NodeV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) nodev1beta1.NodeV1beta1Interface + Cluster(logicalcluster.Path) nodev1beta1.NodeV1beta1Interface } type NodeV1beta1ClusterClient struct { clientCache kcpclient.Cache[*nodev1beta1.NodeV1beta1Client] } -func (c *NodeV1beta1ClusterClient) Cluster(name logicalcluster.Name) nodev1beta1.NodeV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *NodeV1beta1ClusterClient) Cluster(path logicalcluster.Path) nodev1beta1.NodeV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *NodeV1beta1ClusterClient) RuntimeClasses() RuntimeClassClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1beta1/runtimeclass.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1beta1/runtimeclass.go index 0827f28a5ec08..6b3a63630a048 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1beta1/runtimeclass.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/node/v1beta1/runtimeclass.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" nodev1beta1 "k8s.io/api/node/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type RuntimeClassesClusterGetter interface { // RuntimeClassClusterInterface can operate on RuntimeClasses across all clusters, // or scope down to one cluster and return a nodev1beta1client.RuntimeClassInterface. type RuntimeClassClusterInterface interface { - Cluster(logicalcluster.Name) nodev1beta1client.RuntimeClassInterface + Cluster(logicalcluster.Path) nodev1beta1client.RuntimeClassInterface List(ctx context.Context, opts metav1.ListOptions) (*nodev1beta1.RuntimeClassList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type runtimeClassesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *runtimeClassesClusterInterface) Cluster(name logicalcluster.Name) nodev1beta1client.RuntimeClassInterface { - if name == logicalcluster.Wildcard { +func (c *runtimeClassesClusterInterface) Cluster(path logicalcluster.Path) nodev1beta1client.RuntimeClassInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).RuntimeClasses() + return c.clientCache.ClusterOrDie(path).RuntimeClasses() } // List returns the entire collection of all RuntimeClasses across all clusters. func (c *runtimeClassesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*nodev1beta1.RuntimeClassList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).RuntimeClasses().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).RuntimeClasses().List(ctx, opts) } // Watch begins to watch all RuntimeClasses across all clusters. func (c *runtimeClassesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).RuntimeClasses().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).RuntimeClasses().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1/eviction.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1/eviction.go index 4821cfdb80046..6cf781b6c5ed8 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1/eviction.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1/eviction.go @@ -23,7 +23,7 @@ package v1 import ( kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" policyv1client "k8s.io/client-go/kubernetes/typed/policy/v1" ) @@ -36,7 +36,7 @@ type EvictionsClusterGetter interface { // EvictionClusterInterface can scope down to one cluster and return a EvictionsNamespacer. type EvictionClusterInterface interface { - Cluster(logicalcluster.Name) EvictionsNamespacer + Cluster(logicalcluster.Path) EvictionsNamespacer } type evictionsClusterInterface struct { @@ -44,12 +44,12 @@ type evictionsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *evictionsClusterInterface) Cluster(name logicalcluster.Name) EvictionsNamespacer { - if name == logicalcluster.Wildcard { +func (c *evictionsClusterInterface) Cluster(path logicalcluster.Path) EvictionsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &evictionsNamespacer{clientCache: c.clientCache, name: name} + return &evictionsNamespacer{clientCache: c.clientCache, path: path} } // EvictionsNamespacer can scope to objects within a namespace, returning a policyv1client.EvictionInterface. @@ -59,9 +59,9 @@ type EvictionsNamespacer interface { type evictionsNamespacer struct { clientCache kcpclient.Cache[*policyv1client.PolicyV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *evictionsNamespacer) Namespace(namespace string) policyv1client.EvictionInterface { - return n.clientCache.ClusterOrDie(n.name).Evictions(namespace) + return n.clientCache.ClusterOrDie(n.path).Evictions(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1/poddisruptionbudget.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1/poddisruptionbudget.go index ab4d59cb83def..8f34acbaf99be 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1/poddisruptionbudget.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1/poddisruptionbudget.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" policyv1 "k8s.io/api/policy/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type PodDisruptionBudgetsClusterGetter interface { // PodDisruptionBudgetClusterInterface can operate on PodDisruptionBudgets across all clusters, // or scope down to one cluster and return a PodDisruptionBudgetsNamespacer. type PodDisruptionBudgetClusterInterface interface { - Cluster(logicalcluster.Name) PodDisruptionBudgetsNamespacer + Cluster(logicalcluster.Path) PodDisruptionBudgetsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*policyv1.PodDisruptionBudgetList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type podDisruptionBudgetsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *podDisruptionBudgetsClusterInterface) Cluster(name logicalcluster.Name) PodDisruptionBudgetsNamespacer { - if name == logicalcluster.Wildcard { +func (c *podDisruptionBudgetsClusterInterface) Cluster(path logicalcluster.Path) PodDisruptionBudgetsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &podDisruptionBudgetsNamespacer{clientCache: c.clientCache, name: name} + return &podDisruptionBudgetsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all PodDisruptionBudgets across all clusters. func (c *podDisruptionBudgetsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*policyv1.PodDisruptionBudgetList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PodDisruptionBudgets(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PodDisruptionBudgets(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all PodDisruptionBudgets across all clusters. func (c *podDisruptionBudgetsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PodDisruptionBudgets(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PodDisruptionBudgets(metav1.NamespaceAll).Watch(ctx, opts) } // PodDisruptionBudgetsNamespacer can scope to objects within a namespace, returning a policyv1client.PodDisruptionBudgetInterface. @@ -77,9 +77,9 @@ type PodDisruptionBudgetsNamespacer interface { type podDisruptionBudgetsNamespacer struct { clientCache kcpclient.Cache[*policyv1client.PolicyV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *podDisruptionBudgetsNamespacer) Namespace(namespace string) policyv1client.PodDisruptionBudgetInterface { - return n.clientCache.ClusterOrDie(n.name).PodDisruptionBudgets(namespace) + return n.clientCache.ClusterOrDie(n.path).PodDisruptionBudgets(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1/policy_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1/policy_client.go index 09213ce5dbfbe..a76231bbce625 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1/policy_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1/policy_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" policyv1 "k8s.io/client-go/kubernetes/typed/policy/v1" "k8s.io/client-go/rest" @@ -38,18 +38,18 @@ type PolicyV1ClusterInterface interface { } type PolicyV1ClusterScoper interface { - Cluster(logicalcluster.Name) policyv1.PolicyV1Interface + Cluster(logicalcluster.Path) policyv1.PolicyV1Interface } type PolicyV1ClusterClient struct { clientCache kcpclient.Cache[*policyv1.PolicyV1Client] } -func (c *PolicyV1ClusterClient) Cluster(name logicalcluster.Name) policyv1.PolicyV1Interface { - if name == logicalcluster.Wildcard { +func (c *PolicyV1ClusterClient) Cluster(path logicalcluster.Path) policyv1.PolicyV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *PolicyV1ClusterClient) PodDisruptionBudgets() PodDisruptionBudgetClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/eviction.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/eviction.go index 7b211c9f6f6f1..55151874e7aca 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/eviction.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/eviction.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" policyv1beta1client "k8s.io/client-go/kubernetes/typed/policy/v1beta1" ) @@ -36,7 +36,7 @@ type EvictionsClusterGetter interface { // EvictionClusterInterface can scope down to one cluster and return a EvictionsNamespacer. type EvictionClusterInterface interface { - Cluster(logicalcluster.Name) EvictionsNamespacer + Cluster(logicalcluster.Path) EvictionsNamespacer } type evictionsClusterInterface struct { @@ -44,12 +44,12 @@ type evictionsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *evictionsClusterInterface) Cluster(name logicalcluster.Name) EvictionsNamespacer { - if name == logicalcluster.Wildcard { +func (c *evictionsClusterInterface) Cluster(path logicalcluster.Path) EvictionsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &evictionsNamespacer{clientCache: c.clientCache, name: name} + return &evictionsNamespacer{clientCache: c.clientCache, path: path} } // EvictionsNamespacer can scope to objects within a namespace, returning a policyv1beta1client.EvictionInterface. @@ -59,9 +59,9 @@ type EvictionsNamespacer interface { type evictionsNamespacer struct { clientCache kcpclient.Cache[*policyv1beta1client.PolicyV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *evictionsNamespacer) Namespace(namespace string) policyv1beta1client.EvictionInterface { - return n.clientCache.ClusterOrDie(n.name).Evictions(namespace) + return n.clientCache.ClusterOrDie(n.path).Evictions(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go index 4efb43fcfbafa..f4085a503d687 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" policyv1beta1 "k8s.io/api/policy/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type PodDisruptionBudgetsClusterGetter interface { // PodDisruptionBudgetClusterInterface can operate on PodDisruptionBudgets across all clusters, // or scope down to one cluster and return a PodDisruptionBudgetsNamespacer. type PodDisruptionBudgetClusterInterface interface { - Cluster(logicalcluster.Name) PodDisruptionBudgetsNamespacer + Cluster(logicalcluster.Path) PodDisruptionBudgetsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*policyv1beta1.PodDisruptionBudgetList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type podDisruptionBudgetsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *podDisruptionBudgetsClusterInterface) Cluster(name logicalcluster.Name) PodDisruptionBudgetsNamespacer { - if name == logicalcluster.Wildcard { +func (c *podDisruptionBudgetsClusterInterface) Cluster(path logicalcluster.Path) PodDisruptionBudgetsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &podDisruptionBudgetsNamespacer{clientCache: c.clientCache, name: name} + return &podDisruptionBudgetsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all PodDisruptionBudgets across all clusters. func (c *podDisruptionBudgetsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*policyv1beta1.PodDisruptionBudgetList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PodDisruptionBudgets(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PodDisruptionBudgets(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all PodDisruptionBudgets across all clusters. func (c *podDisruptionBudgetsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PodDisruptionBudgets(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PodDisruptionBudgets(metav1.NamespaceAll).Watch(ctx, opts) } // PodDisruptionBudgetsNamespacer can scope to objects within a namespace, returning a policyv1beta1client.PodDisruptionBudgetInterface. @@ -77,9 +77,9 @@ type PodDisruptionBudgetsNamespacer interface { type podDisruptionBudgetsNamespacer struct { clientCache kcpclient.Cache[*policyv1beta1client.PolicyV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *podDisruptionBudgetsNamespacer) Namespace(namespace string) policyv1beta1client.PodDisruptionBudgetInterface { - return n.clientCache.ClusterOrDie(n.name).PodDisruptionBudgets(namespace) + return n.clientCache.ClusterOrDie(n.path).PodDisruptionBudgets(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/podsecuritypolicy.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/podsecuritypolicy.go index 17f40c808306f..f8c0e404fe67a 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/podsecuritypolicy.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/podsecuritypolicy.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" policyv1beta1 "k8s.io/api/policy/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type PodSecurityPoliciesClusterGetter interface { // PodSecurityPolicyClusterInterface can operate on PodSecurityPolicies across all clusters, // or scope down to one cluster and return a policyv1beta1client.PodSecurityPolicyInterface. type PodSecurityPolicyClusterInterface interface { - Cluster(logicalcluster.Name) policyv1beta1client.PodSecurityPolicyInterface + Cluster(logicalcluster.Path) policyv1beta1client.PodSecurityPolicyInterface List(ctx context.Context, opts metav1.ListOptions) (*policyv1beta1.PodSecurityPolicyList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type podSecurityPoliciesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *podSecurityPoliciesClusterInterface) Cluster(name logicalcluster.Name) policyv1beta1client.PodSecurityPolicyInterface { - if name == logicalcluster.Wildcard { +func (c *podSecurityPoliciesClusterInterface) Cluster(path logicalcluster.Path) policyv1beta1client.PodSecurityPolicyInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).PodSecurityPolicies() + return c.clientCache.ClusterOrDie(path).PodSecurityPolicies() } // List returns the entire collection of all PodSecurityPolicies across all clusters. func (c *podSecurityPoliciesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*policyv1beta1.PodSecurityPolicyList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PodSecurityPolicies().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PodSecurityPolicies().List(ctx, opts) } // Watch begins to watch all PodSecurityPolicies across all clusters. func (c *podSecurityPoliciesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PodSecurityPolicies().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PodSecurityPolicies().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/policy_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/policy_client.go index c40b26214657a..a03420eb5b207 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/policy_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/policy/v1beta1/policy_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" policyv1beta1 "k8s.io/client-go/kubernetes/typed/policy/v1beta1" "k8s.io/client-go/rest" @@ -39,18 +39,18 @@ type PolicyV1beta1ClusterInterface interface { } type PolicyV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) policyv1beta1.PolicyV1beta1Interface + Cluster(logicalcluster.Path) policyv1beta1.PolicyV1beta1Interface } type PolicyV1beta1ClusterClient struct { clientCache kcpclient.Cache[*policyv1beta1.PolicyV1beta1Client] } -func (c *PolicyV1beta1ClusterClient) Cluster(name logicalcluster.Name) policyv1beta1.PolicyV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *PolicyV1beta1ClusterClient) Cluster(path logicalcluster.Path) policyv1beta1.PolicyV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *PolicyV1beta1ClusterClient) PodDisruptionBudgets() PodDisruptionBudgetClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/clusterrole.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/clusterrole.go index 64ce3962c77a1..9b9bd152e9c97 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/clusterrole.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/clusterrole.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ClusterRolesClusterGetter interface { // ClusterRoleClusterInterface can operate on ClusterRoles across all clusters, // or scope down to one cluster and return a rbacv1client.ClusterRoleInterface. type ClusterRoleClusterInterface interface { - Cluster(logicalcluster.Name) rbacv1client.ClusterRoleInterface + Cluster(logicalcluster.Path) rbacv1client.ClusterRoleInterface List(ctx context.Context, opts metav1.ListOptions) (*rbacv1.ClusterRoleList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type clusterRolesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *clusterRolesClusterInterface) Cluster(name logicalcluster.Name) rbacv1client.ClusterRoleInterface { - if name == logicalcluster.Wildcard { +func (c *clusterRolesClusterInterface) Cluster(path logicalcluster.Path) rbacv1client.ClusterRoleInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).ClusterRoles() + return c.clientCache.ClusterOrDie(path).ClusterRoles() } // List returns the entire collection of all ClusterRoles across all clusters. func (c *clusterRolesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*rbacv1.ClusterRoleList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ClusterRoles().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ClusterRoles().List(ctx, opts) } // Watch begins to watch all ClusterRoles across all clusters. func (c *clusterRolesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ClusterRoles().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ClusterRoles().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/clusterrolebinding.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/clusterrolebinding.go index 2e89df552c999..5bddab5b49fa3 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/clusterrolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/clusterrolebinding.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ClusterRoleBindingsClusterGetter interface { // ClusterRoleBindingClusterInterface can operate on ClusterRoleBindings across all clusters, // or scope down to one cluster and return a rbacv1client.ClusterRoleBindingInterface. type ClusterRoleBindingClusterInterface interface { - Cluster(logicalcluster.Name) rbacv1client.ClusterRoleBindingInterface + Cluster(logicalcluster.Path) rbacv1client.ClusterRoleBindingInterface List(ctx context.Context, opts metav1.ListOptions) (*rbacv1.ClusterRoleBindingList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type clusterRoleBindingsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *clusterRoleBindingsClusterInterface) Cluster(name logicalcluster.Name) rbacv1client.ClusterRoleBindingInterface { - if name == logicalcluster.Wildcard { +func (c *clusterRoleBindingsClusterInterface) Cluster(path logicalcluster.Path) rbacv1client.ClusterRoleBindingInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).ClusterRoleBindings() + return c.clientCache.ClusterOrDie(path).ClusterRoleBindings() } // List returns the entire collection of all ClusterRoleBindings across all clusters. func (c *clusterRoleBindingsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*rbacv1.ClusterRoleBindingList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ClusterRoleBindings().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ClusterRoleBindings().List(ctx, opts) } // Watch begins to watch all ClusterRoleBindings across all clusters. func (c *clusterRoleBindingsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ClusterRoleBindings().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ClusterRoleBindings().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/rbac_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/rbac_client.go index cc36489ad559b..2bd63fdd4641f 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/rbac_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/rbac_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1 "k8s.io/client-go/kubernetes/typed/rbac/v1" "k8s.io/client-go/rest" @@ -40,18 +40,18 @@ type RbacV1ClusterInterface interface { } type RbacV1ClusterScoper interface { - Cluster(logicalcluster.Name) rbacv1.RbacV1Interface + Cluster(logicalcluster.Path) rbacv1.RbacV1Interface } type RbacV1ClusterClient struct { clientCache kcpclient.Cache[*rbacv1.RbacV1Client] } -func (c *RbacV1ClusterClient) Cluster(name logicalcluster.Name) rbacv1.RbacV1Interface { - if name == logicalcluster.Wildcard { +func (c *RbacV1ClusterClient) Cluster(path logicalcluster.Path) rbacv1.RbacV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *RbacV1ClusterClient) Roles() RoleClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/role.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/role.go index 2231cfa33c7d1..7ace2cc5bc491 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/role.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/role.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type RolesClusterGetter interface { // RoleClusterInterface can operate on Roles across all clusters, // or scope down to one cluster and return a RolesNamespacer. type RoleClusterInterface interface { - Cluster(logicalcluster.Name) RolesNamespacer + Cluster(logicalcluster.Path) RolesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*rbacv1.RoleList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type rolesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *rolesClusterInterface) Cluster(name logicalcluster.Name) RolesNamespacer { - if name == logicalcluster.Wildcard { +func (c *rolesClusterInterface) Cluster(path logicalcluster.Path) RolesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &rolesNamespacer{clientCache: c.clientCache, name: name} + return &rolesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Roles across all clusters. func (c *rolesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*rbacv1.RoleList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Roles(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Roles(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Roles across all clusters. func (c *rolesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Roles(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Roles(metav1.NamespaceAll).Watch(ctx, opts) } // RolesNamespacer can scope to objects within a namespace, returning a rbacv1client.RoleInterface. @@ -77,9 +77,9 @@ type RolesNamespacer interface { type rolesNamespacer struct { clientCache kcpclient.Cache[*rbacv1client.RbacV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *rolesNamespacer) Namespace(namespace string) rbacv1client.RoleInterface { - return n.clientCache.ClusterOrDie(n.name).Roles(namespace) + return n.clientCache.ClusterOrDie(n.path).Roles(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/rolebinding.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/rolebinding.go index 387ca6ed96a23..8f42a699925bc 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/rolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1/rolebinding.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type RoleBindingsClusterGetter interface { // RoleBindingClusterInterface can operate on RoleBindings across all clusters, // or scope down to one cluster and return a RoleBindingsNamespacer. type RoleBindingClusterInterface interface { - Cluster(logicalcluster.Name) RoleBindingsNamespacer + Cluster(logicalcluster.Path) RoleBindingsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*rbacv1.RoleBindingList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type roleBindingsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *roleBindingsClusterInterface) Cluster(name logicalcluster.Name) RoleBindingsNamespacer { - if name == logicalcluster.Wildcard { +func (c *roleBindingsClusterInterface) Cluster(path logicalcluster.Path) RoleBindingsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &roleBindingsNamespacer{clientCache: c.clientCache, name: name} + return &roleBindingsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all RoleBindings across all clusters. func (c *roleBindingsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*rbacv1.RoleBindingList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).RoleBindings(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).RoleBindings(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all RoleBindings across all clusters. func (c *roleBindingsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).RoleBindings(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).RoleBindings(metav1.NamespaceAll).Watch(ctx, opts) } // RoleBindingsNamespacer can scope to objects within a namespace, returning a rbacv1client.RoleBindingInterface. @@ -77,9 +77,9 @@ type RoleBindingsNamespacer interface { type roleBindingsNamespacer struct { clientCache kcpclient.Cache[*rbacv1client.RbacV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *roleBindingsNamespacer) Namespace(namespace string) rbacv1client.RoleBindingInterface { - return n.clientCache.ClusterOrDie(n.name).RoleBindings(namespace) + return n.clientCache.ClusterOrDie(n.path).RoleBindings(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/clusterrole.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/clusterrole.go index 7323005d86c0d..fe26eb6af54de 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/clusterrole.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/clusterrole.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ClusterRolesClusterGetter interface { // ClusterRoleClusterInterface can operate on ClusterRoles across all clusters, // or scope down to one cluster and return a rbacv1alpha1client.ClusterRoleInterface. type ClusterRoleClusterInterface interface { - Cluster(logicalcluster.Name) rbacv1alpha1client.ClusterRoleInterface + Cluster(logicalcluster.Path) rbacv1alpha1client.ClusterRoleInterface List(ctx context.Context, opts metav1.ListOptions) (*rbacv1alpha1.ClusterRoleList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type clusterRolesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *clusterRolesClusterInterface) Cluster(name logicalcluster.Name) rbacv1alpha1client.ClusterRoleInterface { - if name == logicalcluster.Wildcard { +func (c *clusterRolesClusterInterface) Cluster(path logicalcluster.Path) rbacv1alpha1client.ClusterRoleInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).ClusterRoles() + return c.clientCache.ClusterOrDie(path).ClusterRoles() } // List returns the entire collection of all ClusterRoles across all clusters. func (c *clusterRolesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*rbacv1alpha1.ClusterRoleList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ClusterRoles().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ClusterRoles().List(ctx, opts) } // Watch begins to watch all ClusterRoles across all clusters. func (c *clusterRolesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ClusterRoles().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ClusterRoles().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go index 0b6b418b08a3c..41f802b958ff6 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ClusterRoleBindingsClusterGetter interface { // ClusterRoleBindingClusterInterface can operate on ClusterRoleBindings across all clusters, // or scope down to one cluster and return a rbacv1alpha1client.ClusterRoleBindingInterface. type ClusterRoleBindingClusterInterface interface { - Cluster(logicalcluster.Name) rbacv1alpha1client.ClusterRoleBindingInterface + Cluster(logicalcluster.Path) rbacv1alpha1client.ClusterRoleBindingInterface List(ctx context.Context, opts metav1.ListOptions) (*rbacv1alpha1.ClusterRoleBindingList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type clusterRoleBindingsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *clusterRoleBindingsClusterInterface) Cluster(name logicalcluster.Name) rbacv1alpha1client.ClusterRoleBindingInterface { - if name == logicalcluster.Wildcard { +func (c *clusterRoleBindingsClusterInterface) Cluster(path logicalcluster.Path) rbacv1alpha1client.ClusterRoleBindingInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).ClusterRoleBindings() + return c.clientCache.ClusterOrDie(path).ClusterRoleBindings() } // List returns the entire collection of all ClusterRoleBindings across all clusters. func (c *clusterRoleBindingsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*rbacv1alpha1.ClusterRoleBindingList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ClusterRoleBindings().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ClusterRoleBindings().List(ctx, opts) } // Watch begins to watch all ClusterRoleBindings across all clusters. func (c *clusterRoleBindingsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ClusterRoleBindings().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ClusterRoleBindings().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/rbac_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/rbac_client.go index 18716f3f18527..f4441575d3edd 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/rbac_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/rbac_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1alpha1 "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1" "k8s.io/client-go/rest" @@ -40,18 +40,18 @@ type RbacV1alpha1ClusterInterface interface { } type RbacV1alpha1ClusterScoper interface { - Cluster(logicalcluster.Name) rbacv1alpha1.RbacV1alpha1Interface + Cluster(logicalcluster.Path) rbacv1alpha1.RbacV1alpha1Interface } type RbacV1alpha1ClusterClient struct { clientCache kcpclient.Cache[*rbacv1alpha1.RbacV1alpha1Client] } -func (c *RbacV1alpha1ClusterClient) Cluster(name logicalcluster.Name) rbacv1alpha1.RbacV1alpha1Interface { - if name == logicalcluster.Wildcard { +func (c *RbacV1alpha1ClusterClient) Cluster(path logicalcluster.Path) rbacv1alpha1.RbacV1alpha1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *RbacV1alpha1ClusterClient) Roles() RoleClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/role.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/role.go index 6c5adadf2aa6a..bdf30069de4c1 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/role.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/role.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type RolesClusterGetter interface { // RoleClusterInterface can operate on Roles across all clusters, // or scope down to one cluster and return a RolesNamespacer. type RoleClusterInterface interface { - Cluster(logicalcluster.Name) RolesNamespacer + Cluster(logicalcluster.Path) RolesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*rbacv1alpha1.RoleList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type rolesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *rolesClusterInterface) Cluster(name logicalcluster.Name) RolesNamespacer { - if name == logicalcluster.Wildcard { +func (c *rolesClusterInterface) Cluster(path logicalcluster.Path) RolesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &rolesNamespacer{clientCache: c.clientCache, name: name} + return &rolesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Roles across all clusters. func (c *rolesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*rbacv1alpha1.RoleList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Roles(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Roles(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Roles across all clusters. func (c *rolesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Roles(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Roles(metav1.NamespaceAll).Watch(ctx, opts) } // RolesNamespacer can scope to objects within a namespace, returning a rbacv1alpha1client.RoleInterface. @@ -77,9 +77,9 @@ type RolesNamespacer interface { type rolesNamespacer struct { clientCache kcpclient.Cache[*rbacv1alpha1client.RbacV1alpha1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *rolesNamespacer) Namespace(namespace string) rbacv1alpha1client.RoleInterface { - return n.clientCache.ClusterOrDie(n.name).Roles(namespace) + return n.clientCache.ClusterOrDie(n.path).Roles(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/rolebinding.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/rolebinding.go index d243d258cc61f..f2ea4fec66e1d 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/rolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1alpha1/rolebinding.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type RoleBindingsClusterGetter interface { // RoleBindingClusterInterface can operate on RoleBindings across all clusters, // or scope down to one cluster and return a RoleBindingsNamespacer. type RoleBindingClusterInterface interface { - Cluster(logicalcluster.Name) RoleBindingsNamespacer + Cluster(logicalcluster.Path) RoleBindingsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*rbacv1alpha1.RoleBindingList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type roleBindingsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *roleBindingsClusterInterface) Cluster(name logicalcluster.Name) RoleBindingsNamespacer { - if name == logicalcluster.Wildcard { +func (c *roleBindingsClusterInterface) Cluster(path logicalcluster.Path) RoleBindingsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &roleBindingsNamespacer{clientCache: c.clientCache, name: name} + return &roleBindingsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all RoleBindings across all clusters. func (c *roleBindingsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*rbacv1alpha1.RoleBindingList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).RoleBindings(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).RoleBindings(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all RoleBindings across all clusters. func (c *roleBindingsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).RoleBindings(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).RoleBindings(metav1.NamespaceAll).Watch(ctx, opts) } // RoleBindingsNamespacer can scope to objects within a namespace, returning a rbacv1alpha1client.RoleBindingInterface. @@ -77,9 +77,9 @@ type RoleBindingsNamespacer interface { type roleBindingsNamespacer struct { clientCache kcpclient.Cache[*rbacv1alpha1client.RbacV1alpha1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *roleBindingsNamespacer) Namespace(namespace string) rbacv1alpha1client.RoleBindingInterface { - return n.clientCache.ClusterOrDie(n.name).RoleBindings(namespace) + return n.clientCache.ClusterOrDie(n.path).RoleBindings(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/clusterrole.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/clusterrole.go index 93f32ae5ed384..18d00058e4ecf 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/clusterrole.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/clusterrole.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1beta1 "k8s.io/api/rbac/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ClusterRolesClusterGetter interface { // ClusterRoleClusterInterface can operate on ClusterRoles across all clusters, // or scope down to one cluster and return a rbacv1beta1client.ClusterRoleInterface. type ClusterRoleClusterInterface interface { - Cluster(logicalcluster.Name) rbacv1beta1client.ClusterRoleInterface + Cluster(logicalcluster.Path) rbacv1beta1client.ClusterRoleInterface List(ctx context.Context, opts metav1.ListOptions) (*rbacv1beta1.ClusterRoleList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type clusterRolesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *clusterRolesClusterInterface) Cluster(name logicalcluster.Name) rbacv1beta1client.ClusterRoleInterface { - if name == logicalcluster.Wildcard { +func (c *clusterRolesClusterInterface) Cluster(path logicalcluster.Path) rbacv1beta1client.ClusterRoleInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).ClusterRoles() + return c.clientCache.ClusterOrDie(path).ClusterRoles() } // List returns the entire collection of all ClusterRoles across all clusters. func (c *clusterRolesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*rbacv1beta1.ClusterRoleList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ClusterRoles().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ClusterRoles().List(ctx, opts) } // Watch begins to watch all ClusterRoles across all clusters. func (c *clusterRolesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ClusterRoles().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ClusterRoles().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go index a8ec0c103bcc7..4bba2cfef702a 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1beta1 "k8s.io/api/rbac/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type ClusterRoleBindingsClusterGetter interface { // ClusterRoleBindingClusterInterface can operate on ClusterRoleBindings across all clusters, // or scope down to one cluster and return a rbacv1beta1client.ClusterRoleBindingInterface. type ClusterRoleBindingClusterInterface interface { - Cluster(logicalcluster.Name) rbacv1beta1client.ClusterRoleBindingInterface + Cluster(logicalcluster.Path) rbacv1beta1client.ClusterRoleBindingInterface List(ctx context.Context, opts metav1.ListOptions) (*rbacv1beta1.ClusterRoleBindingList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type clusterRoleBindingsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *clusterRoleBindingsClusterInterface) Cluster(name logicalcluster.Name) rbacv1beta1client.ClusterRoleBindingInterface { - if name == logicalcluster.Wildcard { +func (c *clusterRoleBindingsClusterInterface) Cluster(path logicalcluster.Path) rbacv1beta1client.ClusterRoleBindingInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).ClusterRoleBindings() + return c.clientCache.ClusterOrDie(path).ClusterRoleBindings() } // List returns the entire collection of all ClusterRoleBindings across all clusters. func (c *clusterRoleBindingsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*rbacv1beta1.ClusterRoleBindingList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ClusterRoleBindings().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ClusterRoleBindings().List(ctx, opts) } // Watch begins to watch all ClusterRoleBindings across all clusters. func (c *clusterRoleBindingsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).ClusterRoleBindings().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).ClusterRoleBindings().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/rbac_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/rbac_client.go index 0a567799d1e84..da3d7b0a9b3ee 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/rbac_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/rbac_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1beta1 "k8s.io/client-go/kubernetes/typed/rbac/v1beta1" "k8s.io/client-go/rest" @@ -40,18 +40,18 @@ type RbacV1beta1ClusterInterface interface { } type RbacV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) rbacv1beta1.RbacV1beta1Interface + Cluster(logicalcluster.Path) rbacv1beta1.RbacV1beta1Interface } type RbacV1beta1ClusterClient struct { clientCache kcpclient.Cache[*rbacv1beta1.RbacV1beta1Client] } -func (c *RbacV1beta1ClusterClient) Cluster(name logicalcluster.Name) rbacv1beta1.RbacV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *RbacV1beta1ClusterClient) Cluster(path logicalcluster.Path) rbacv1beta1.RbacV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *RbacV1beta1ClusterClient) Roles() RoleClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/role.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/role.go index 8d0943085d2b8..0e3d6cf3af7d1 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/role.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/role.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1beta1 "k8s.io/api/rbac/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type RolesClusterGetter interface { // RoleClusterInterface can operate on Roles across all clusters, // or scope down to one cluster and return a RolesNamespacer. type RoleClusterInterface interface { - Cluster(logicalcluster.Name) RolesNamespacer + Cluster(logicalcluster.Path) RolesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*rbacv1beta1.RoleList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type rolesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *rolesClusterInterface) Cluster(name logicalcluster.Name) RolesNamespacer { - if name == logicalcluster.Wildcard { +func (c *rolesClusterInterface) Cluster(path logicalcluster.Path) RolesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &rolesNamespacer{clientCache: c.clientCache, name: name} + return &rolesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all Roles across all clusters. func (c *rolesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*rbacv1beta1.RoleList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Roles(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Roles(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all Roles across all clusters. func (c *rolesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Roles(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Roles(metav1.NamespaceAll).Watch(ctx, opts) } // RolesNamespacer can scope to objects within a namespace, returning a rbacv1beta1client.RoleInterface. @@ -77,9 +77,9 @@ type RolesNamespacer interface { type rolesNamespacer struct { clientCache kcpclient.Cache[*rbacv1beta1client.RbacV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *rolesNamespacer) Namespace(namespace string) rbacv1beta1client.RoleInterface { - return n.clientCache.ClusterOrDie(n.name).Roles(namespace) + return n.clientCache.ClusterOrDie(n.path).Roles(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/rolebinding.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/rolebinding.go index 30828ba69d832..12e533826c582 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/rolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1beta1/rolebinding.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1beta1 "k8s.io/api/rbac/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type RoleBindingsClusterGetter interface { // RoleBindingClusterInterface can operate on RoleBindings across all clusters, // or scope down to one cluster and return a RoleBindingsNamespacer. type RoleBindingClusterInterface interface { - Cluster(logicalcluster.Name) RoleBindingsNamespacer + Cluster(logicalcluster.Path) RoleBindingsNamespacer List(ctx context.Context, opts metav1.ListOptions) (*rbacv1beta1.RoleBindingList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type roleBindingsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *roleBindingsClusterInterface) Cluster(name logicalcluster.Name) RoleBindingsNamespacer { - if name == logicalcluster.Wildcard { +func (c *roleBindingsClusterInterface) Cluster(path logicalcluster.Path) RoleBindingsNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &roleBindingsNamespacer{clientCache: c.clientCache, name: name} + return &roleBindingsNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all RoleBindings across all clusters. func (c *roleBindingsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*rbacv1beta1.RoleBindingList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).RoleBindings(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).RoleBindings(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all RoleBindings across all clusters. func (c *roleBindingsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).RoleBindings(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).RoleBindings(metav1.NamespaceAll).Watch(ctx, opts) } // RoleBindingsNamespacer can scope to objects within a namespace, returning a rbacv1beta1client.RoleBindingInterface. @@ -77,9 +77,9 @@ type RoleBindingsNamespacer interface { type roleBindingsNamespacer struct { clientCache kcpclient.Cache[*rbacv1beta1client.RbacV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *roleBindingsNamespacer) Namespace(namespace string) rbacv1beta1client.RoleBindingInterface { - return n.clientCache.ClusterOrDie(n.name).RoleBindings(namespace) + return n.clientCache.ClusterOrDie(n.path).RoleBindings(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1/priorityclass.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1/priorityclass.go index 55e1b7137ebaf..5abbe15697b0f 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1/priorityclass.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1/priorityclass.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" schedulingv1 "k8s.io/api/scheduling/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type PriorityClassesClusterGetter interface { // PriorityClassClusterInterface can operate on PriorityClasses across all clusters, // or scope down to one cluster and return a schedulingv1client.PriorityClassInterface. type PriorityClassClusterInterface interface { - Cluster(logicalcluster.Name) schedulingv1client.PriorityClassInterface + Cluster(logicalcluster.Path) schedulingv1client.PriorityClassInterface List(ctx context.Context, opts metav1.ListOptions) (*schedulingv1.PriorityClassList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type priorityClassesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *priorityClassesClusterInterface) Cluster(name logicalcluster.Name) schedulingv1client.PriorityClassInterface { - if name == logicalcluster.Wildcard { +func (c *priorityClassesClusterInterface) Cluster(path logicalcluster.Path) schedulingv1client.PriorityClassInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).PriorityClasses() + return c.clientCache.ClusterOrDie(path).PriorityClasses() } // List returns the entire collection of all PriorityClasses across all clusters. func (c *priorityClassesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*schedulingv1.PriorityClassList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PriorityClasses().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PriorityClasses().List(ctx, opts) } // Watch begins to watch all PriorityClasses across all clusters. func (c *priorityClassesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PriorityClasses().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PriorityClasses().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1/scheduling_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1/scheduling_client.go index b13708bee726c..27d62bcd7a40a 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1/scheduling_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1/scheduling_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" schedulingv1 "k8s.io/client-go/kubernetes/typed/scheduling/v1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type SchedulingV1ClusterInterface interface { } type SchedulingV1ClusterScoper interface { - Cluster(logicalcluster.Name) schedulingv1.SchedulingV1Interface + Cluster(logicalcluster.Path) schedulingv1.SchedulingV1Interface } type SchedulingV1ClusterClient struct { clientCache kcpclient.Cache[*schedulingv1.SchedulingV1Client] } -func (c *SchedulingV1ClusterClient) Cluster(name logicalcluster.Name) schedulingv1.SchedulingV1Interface { - if name == logicalcluster.Wildcard { +func (c *SchedulingV1ClusterClient) Cluster(path logicalcluster.Path) schedulingv1.SchedulingV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *SchedulingV1ClusterClient) PriorityClasses() PriorityClassClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1alpha1/priorityclass.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1alpha1/priorityclass.go index 6c1d06df43025..fdb52f58db34a 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1alpha1/priorityclass.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1alpha1/priorityclass.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" schedulingv1alpha1 "k8s.io/api/scheduling/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type PriorityClassesClusterGetter interface { // PriorityClassClusterInterface can operate on PriorityClasses across all clusters, // or scope down to one cluster and return a schedulingv1alpha1client.PriorityClassInterface. type PriorityClassClusterInterface interface { - Cluster(logicalcluster.Name) schedulingv1alpha1client.PriorityClassInterface + Cluster(logicalcluster.Path) schedulingv1alpha1client.PriorityClassInterface List(ctx context.Context, opts metav1.ListOptions) (*schedulingv1alpha1.PriorityClassList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type priorityClassesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *priorityClassesClusterInterface) Cluster(name logicalcluster.Name) schedulingv1alpha1client.PriorityClassInterface { - if name == logicalcluster.Wildcard { +func (c *priorityClassesClusterInterface) Cluster(path logicalcluster.Path) schedulingv1alpha1client.PriorityClassInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).PriorityClasses() + return c.clientCache.ClusterOrDie(path).PriorityClasses() } // List returns the entire collection of all PriorityClasses across all clusters. func (c *priorityClassesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*schedulingv1alpha1.PriorityClassList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PriorityClasses().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PriorityClasses().List(ctx, opts) } // Watch begins to watch all PriorityClasses across all clusters. func (c *priorityClassesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PriorityClasses().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PriorityClasses().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1alpha1/scheduling_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1alpha1/scheduling_client.go index 9d123cdd14348..e4c1be7a85408 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1alpha1/scheduling_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1alpha1/scheduling_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" schedulingv1alpha1 "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type SchedulingV1alpha1ClusterInterface interface { } type SchedulingV1alpha1ClusterScoper interface { - Cluster(logicalcluster.Name) schedulingv1alpha1.SchedulingV1alpha1Interface + Cluster(logicalcluster.Path) schedulingv1alpha1.SchedulingV1alpha1Interface } type SchedulingV1alpha1ClusterClient struct { clientCache kcpclient.Cache[*schedulingv1alpha1.SchedulingV1alpha1Client] } -func (c *SchedulingV1alpha1ClusterClient) Cluster(name logicalcluster.Name) schedulingv1alpha1.SchedulingV1alpha1Interface { - if name == logicalcluster.Wildcard { +func (c *SchedulingV1alpha1ClusterClient) Cluster(path logicalcluster.Path) schedulingv1alpha1.SchedulingV1alpha1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *SchedulingV1alpha1ClusterClient) PriorityClasses() PriorityClassClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1beta1/priorityclass.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1beta1/priorityclass.go index 07eaf8db00cce..3ab8cfc41e3a9 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1beta1/priorityclass.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1beta1/priorityclass.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" schedulingv1beta1 "k8s.io/api/scheduling/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type PriorityClassesClusterGetter interface { // PriorityClassClusterInterface can operate on PriorityClasses across all clusters, // or scope down to one cluster and return a schedulingv1beta1client.PriorityClassInterface. type PriorityClassClusterInterface interface { - Cluster(logicalcluster.Name) schedulingv1beta1client.PriorityClassInterface + Cluster(logicalcluster.Path) schedulingv1beta1client.PriorityClassInterface List(ctx context.Context, opts metav1.ListOptions) (*schedulingv1beta1.PriorityClassList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type priorityClassesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *priorityClassesClusterInterface) Cluster(name logicalcluster.Name) schedulingv1beta1client.PriorityClassInterface { - if name == logicalcluster.Wildcard { +func (c *priorityClassesClusterInterface) Cluster(path logicalcluster.Path) schedulingv1beta1client.PriorityClassInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).PriorityClasses() + return c.clientCache.ClusterOrDie(path).PriorityClasses() } // List returns the entire collection of all PriorityClasses across all clusters. func (c *priorityClassesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*schedulingv1beta1.PriorityClassList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PriorityClasses().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PriorityClasses().List(ctx, opts) } // Watch begins to watch all PriorityClasses across all clusters. func (c *priorityClassesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).PriorityClasses().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).PriorityClasses().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1beta1/scheduling_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1beta1/scheduling_client.go index 7a7fcc5318ec6..12eae2abc4e43 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1beta1/scheduling_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/scheduling/v1beta1/scheduling_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" schedulingv1beta1 "k8s.io/client-go/kubernetes/typed/scheduling/v1beta1" "k8s.io/client-go/rest" @@ -37,18 +37,18 @@ type SchedulingV1beta1ClusterInterface interface { } type SchedulingV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) schedulingv1beta1.SchedulingV1beta1Interface + Cluster(logicalcluster.Path) schedulingv1beta1.SchedulingV1beta1Interface } type SchedulingV1beta1ClusterClient struct { clientCache kcpclient.Cache[*schedulingv1beta1.SchedulingV1beta1Client] } -func (c *SchedulingV1beta1ClusterClient) Cluster(name logicalcluster.Name) schedulingv1beta1.SchedulingV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *SchedulingV1beta1ClusterClient) Cluster(path logicalcluster.Path) schedulingv1beta1.SchedulingV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *SchedulingV1beta1ClusterClient) PriorityClasses() PriorityClassClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/csidriver.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/csidriver.go index a6fb0cef784be..53e9855f71d59 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/csidriver.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/csidriver.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type CSIDriversClusterGetter interface { // CSIDriverClusterInterface can operate on CSIDrivers across all clusters, // or scope down to one cluster and return a storagev1client.CSIDriverInterface. type CSIDriverClusterInterface interface { - Cluster(logicalcluster.Name) storagev1client.CSIDriverInterface + Cluster(logicalcluster.Path) storagev1client.CSIDriverInterface List(ctx context.Context, opts metav1.ListOptions) (*storagev1.CSIDriverList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type cSIDriversClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *cSIDriversClusterInterface) Cluster(name logicalcluster.Name) storagev1client.CSIDriverInterface { - if name == logicalcluster.Wildcard { +func (c *cSIDriversClusterInterface) Cluster(path logicalcluster.Path) storagev1client.CSIDriverInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).CSIDrivers() + return c.clientCache.ClusterOrDie(path).CSIDrivers() } // List returns the entire collection of all CSIDrivers across all clusters. func (c *cSIDriversClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*storagev1.CSIDriverList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CSIDrivers().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CSIDrivers().List(ctx, opts) } // Watch begins to watch all CSIDrivers across all clusters. func (c *cSIDriversClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CSIDrivers().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CSIDrivers().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/csinode.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/csinode.go index 4d208c18de0d5..0e91566125b22 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/csinode.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/csinode.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type CSINodesClusterGetter interface { // CSINodeClusterInterface can operate on CSINodes across all clusters, // or scope down to one cluster and return a storagev1client.CSINodeInterface. type CSINodeClusterInterface interface { - Cluster(logicalcluster.Name) storagev1client.CSINodeInterface + Cluster(logicalcluster.Path) storagev1client.CSINodeInterface List(ctx context.Context, opts metav1.ListOptions) (*storagev1.CSINodeList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type cSINodesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *cSINodesClusterInterface) Cluster(name logicalcluster.Name) storagev1client.CSINodeInterface { - if name == logicalcluster.Wildcard { +func (c *cSINodesClusterInterface) Cluster(path logicalcluster.Path) storagev1client.CSINodeInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).CSINodes() + return c.clientCache.ClusterOrDie(path).CSINodes() } // List returns the entire collection of all CSINodes across all clusters. func (c *cSINodesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*storagev1.CSINodeList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CSINodes().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CSINodes().List(ctx, opts) } // Watch begins to watch all CSINodes across all clusters. func (c *cSINodesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CSINodes().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CSINodes().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/csistoragecapacity.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/csistoragecapacity.go index 3d3354abdb56d..05751a34b9fea 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/csistoragecapacity.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/csistoragecapacity.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type CSIStorageCapacitiesClusterGetter interface { // CSIStorageCapacityClusterInterface can operate on CSIStorageCapacities across all clusters, // or scope down to one cluster and return a CSIStorageCapacitiesNamespacer. type CSIStorageCapacityClusterInterface interface { - Cluster(logicalcluster.Name) CSIStorageCapacitiesNamespacer + Cluster(logicalcluster.Path) CSIStorageCapacitiesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*storagev1.CSIStorageCapacityList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type cSIStorageCapacitiesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *cSIStorageCapacitiesClusterInterface) Cluster(name logicalcluster.Name) CSIStorageCapacitiesNamespacer { - if name == logicalcluster.Wildcard { +func (c *cSIStorageCapacitiesClusterInterface) Cluster(path logicalcluster.Path) CSIStorageCapacitiesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &cSIStorageCapacitiesNamespacer{clientCache: c.clientCache, name: name} + return &cSIStorageCapacitiesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all CSIStorageCapacities across all clusters. func (c *cSIStorageCapacitiesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*storagev1.CSIStorageCapacityList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CSIStorageCapacities(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CSIStorageCapacities(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all CSIStorageCapacities across all clusters. func (c *cSIStorageCapacitiesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CSIStorageCapacities(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CSIStorageCapacities(metav1.NamespaceAll).Watch(ctx, opts) } // CSIStorageCapacitiesNamespacer can scope to objects within a namespace, returning a storagev1client.CSIStorageCapacityInterface. @@ -77,9 +77,9 @@ type CSIStorageCapacitiesNamespacer interface { type cSIStorageCapacitiesNamespacer struct { clientCache kcpclient.Cache[*storagev1client.StorageV1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *cSIStorageCapacitiesNamespacer) Namespace(namespace string) storagev1client.CSIStorageCapacityInterface { - return n.clientCache.ClusterOrDie(n.name).CSIStorageCapacities(namespace) + return n.clientCache.ClusterOrDie(n.path).CSIStorageCapacities(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/storage_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/storage_client.go index 579994612ab33..5505939ba87cc 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/storage_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/storage_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/client-go/kubernetes/typed/storage/v1" "k8s.io/client-go/rest" @@ -41,18 +41,18 @@ type StorageV1ClusterInterface interface { } type StorageV1ClusterScoper interface { - Cluster(logicalcluster.Name) storagev1.StorageV1Interface + Cluster(logicalcluster.Path) storagev1.StorageV1Interface } type StorageV1ClusterClient struct { clientCache kcpclient.Cache[*storagev1.StorageV1Client] } -func (c *StorageV1ClusterClient) Cluster(name logicalcluster.Name) storagev1.StorageV1Interface { - if name == logicalcluster.Wildcard { +func (c *StorageV1ClusterClient) Cluster(path logicalcluster.Path) storagev1.StorageV1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *StorageV1ClusterClient) StorageClasses() StorageClassClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/storageclass.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/storageclass.go index 80921277ca088..c6bb2af320ca4 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/storageclass.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/storageclass.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type StorageClassesClusterGetter interface { // StorageClassClusterInterface can operate on StorageClasses across all clusters, // or scope down to one cluster and return a storagev1client.StorageClassInterface. type StorageClassClusterInterface interface { - Cluster(logicalcluster.Name) storagev1client.StorageClassInterface + Cluster(logicalcluster.Path) storagev1client.StorageClassInterface List(ctx context.Context, opts metav1.ListOptions) (*storagev1.StorageClassList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type storageClassesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *storageClassesClusterInterface) Cluster(name logicalcluster.Name) storagev1client.StorageClassInterface { - if name == logicalcluster.Wildcard { +func (c *storageClassesClusterInterface) Cluster(path logicalcluster.Path) storagev1client.StorageClassInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).StorageClasses() + return c.clientCache.ClusterOrDie(path).StorageClasses() } // List returns the entire collection of all StorageClasses across all clusters. func (c *storageClassesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*storagev1.StorageClassList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).StorageClasses().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).StorageClasses().List(ctx, opts) } // Watch begins to watch all StorageClasses across all clusters. func (c *storageClassesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).StorageClasses().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).StorageClasses().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/volumeattachment.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/volumeattachment.go index c096b4c466890..cea6326096bef 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/volumeattachment.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1/volumeattachment.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type VolumeAttachmentsClusterGetter interface { // VolumeAttachmentClusterInterface can operate on VolumeAttachments across all clusters, // or scope down to one cluster and return a storagev1client.VolumeAttachmentInterface. type VolumeAttachmentClusterInterface interface { - Cluster(logicalcluster.Name) storagev1client.VolumeAttachmentInterface + Cluster(logicalcluster.Path) storagev1client.VolumeAttachmentInterface List(ctx context.Context, opts metav1.ListOptions) (*storagev1.VolumeAttachmentList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type volumeAttachmentsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *volumeAttachmentsClusterInterface) Cluster(name logicalcluster.Name) storagev1client.VolumeAttachmentInterface { - if name == logicalcluster.Wildcard { +func (c *volumeAttachmentsClusterInterface) Cluster(path logicalcluster.Path) storagev1client.VolumeAttachmentInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).VolumeAttachments() + return c.clientCache.ClusterOrDie(path).VolumeAttachments() } // List returns the entire collection of all VolumeAttachments across all clusters. func (c *volumeAttachmentsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*storagev1.VolumeAttachmentList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).VolumeAttachments().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).VolumeAttachments().List(ctx, opts) } // Watch begins to watch all VolumeAttachments across all clusters. func (c *volumeAttachmentsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).VolumeAttachments().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).VolumeAttachments().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1alpha1/csistoragecapacity.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1alpha1/csistoragecapacity.go index c88d1f6df1ebb..b21d22f19f3e3 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1alpha1/csistoragecapacity.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1alpha1/csistoragecapacity.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1alpha1 "k8s.io/api/storage/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type CSIStorageCapacitiesClusterGetter interface { // CSIStorageCapacityClusterInterface can operate on CSIStorageCapacities across all clusters, // or scope down to one cluster and return a CSIStorageCapacitiesNamespacer. type CSIStorageCapacityClusterInterface interface { - Cluster(logicalcluster.Name) CSIStorageCapacitiesNamespacer + Cluster(logicalcluster.Path) CSIStorageCapacitiesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*storagev1alpha1.CSIStorageCapacityList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type cSIStorageCapacitiesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *cSIStorageCapacitiesClusterInterface) Cluster(name logicalcluster.Name) CSIStorageCapacitiesNamespacer { - if name == logicalcluster.Wildcard { +func (c *cSIStorageCapacitiesClusterInterface) Cluster(path logicalcluster.Path) CSIStorageCapacitiesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &cSIStorageCapacitiesNamespacer{clientCache: c.clientCache, name: name} + return &cSIStorageCapacitiesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all CSIStorageCapacities across all clusters. func (c *cSIStorageCapacitiesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*storagev1alpha1.CSIStorageCapacityList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CSIStorageCapacities(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CSIStorageCapacities(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all CSIStorageCapacities across all clusters. func (c *cSIStorageCapacitiesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CSIStorageCapacities(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CSIStorageCapacities(metav1.NamespaceAll).Watch(ctx, opts) } // CSIStorageCapacitiesNamespacer can scope to objects within a namespace, returning a storagev1alpha1client.CSIStorageCapacityInterface. @@ -77,9 +77,9 @@ type CSIStorageCapacitiesNamespacer interface { type cSIStorageCapacitiesNamespacer struct { clientCache kcpclient.Cache[*storagev1alpha1client.StorageV1alpha1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *cSIStorageCapacitiesNamespacer) Namespace(namespace string) storagev1alpha1client.CSIStorageCapacityInterface { - return n.clientCache.ClusterOrDie(n.name).CSIStorageCapacities(namespace) + return n.clientCache.ClusterOrDie(n.path).CSIStorageCapacities(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1alpha1/storage_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1alpha1/storage_client.go index 49938e0c90605..236ecbf8e80f5 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1alpha1/storage_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1alpha1/storage_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1alpha1 "k8s.io/client-go/kubernetes/typed/storage/v1alpha1" "k8s.io/client-go/rest" @@ -38,18 +38,18 @@ type StorageV1alpha1ClusterInterface interface { } type StorageV1alpha1ClusterScoper interface { - Cluster(logicalcluster.Name) storagev1alpha1.StorageV1alpha1Interface + Cluster(logicalcluster.Path) storagev1alpha1.StorageV1alpha1Interface } type StorageV1alpha1ClusterClient struct { clientCache kcpclient.Cache[*storagev1alpha1.StorageV1alpha1Client] } -func (c *StorageV1alpha1ClusterClient) Cluster(name logicalcluster.Name) storagev1alpha1.StorageV1alpha1Interface { - if name == logicalcluster.Wildcard { +func (c *StorageV1alpha1ClusterClient) Cluster(path logicalcluster.Path) storagev1alpha1.StorageV1alpha1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *StorageV1alpha1ClusterClient) VolumeAttachments() VolumeAttachmentClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1alpha1/volumeattachment.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1alpha1/volumeattachment.go index c2e8e12c5186c..4c805a519100d 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1alpha1/volumeattachment.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1alpha1/volumeattachment.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1alpha1 "k8s.io/api/storage/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type VolumeAttachmentsClusterGetter interface { // VolumeAttachmentClusterInterface can operate on VolumeAttachments across all clusters, // or scope down to one cluster and return a storagev1alpha1client.VolumeAttachmentInterface. type VolumeAttachmentClusterInterface interface { - Cluster(logicalcluster.Name) storagev1alpha1client.VolumeAttachmentInterface + Cluster(logicalcluster.Path) storagev1alpha1client.VolumeAttachmentInterface List(ctx context.Context, opts metav1.ListOptions) (*storagev1alpha1.VolumeAttachmentList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type volumeAttachmentsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *volumeAttachmentsClusterInterface) Cluster(name logicalcluster.Name) storagev1alpha1client.VolumeAttachmentInterface { - if name == logicalcluster.Wildcard { +func (c *volumeAttachmentsClusterInterface) Cluster(path logicalcluster.Path) storagev1alpha1client.VolumeAttachmentInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).VolumeAttachments() + return c.clientCache.ClusterOrDie(path).VolumeAttachments() } // List returns the entire collection of all VolumeAttachments across all clusters. func (c *volumeAttachmentsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*storagev1alpha1.VolumeAttachmentList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).VolumeAttachments().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).VolumeAttachments().List(ctx, opts) } // Watch begins to watch all VolumeAttachments across all clusters. func (c *volumeAttachmentsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).VolumeAttachments().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).VolumeAttachments().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/csidriver.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/csidriver.go index 48338d653baa9..063b5626d3948 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/csidriver.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/csidriver.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type CSIDriversClusterGetter interface { // CSIDriverClusterInterface can operate on CSIDrivers across all clusters, // or scope down to one cluster and return a storagev1beta1client.CSIDriverInterface. type CSIDriverClusterInterface interface { - Cluster(logicalcluster.Name) storagev1beta1client.CSIDriverInterface + Cluster(logicalcluster.Path) storagev1beta1client.CSIDriverInterface List(ctx context.Context, opts metav1.ListOptions) (*storagev1beta1.CSIDriverList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type cSIDriversClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *cSIDriversClusterInterface) Cluster(name logicalcluster.Name) storagev1beta1client.CSIDriverInterface { - if name == logicalcluster.Wildcard { +func (c *cSIDriversClusterInterface) Cluster(path logicalcluster.Path) storagev1beta1client.CSIDriverInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).CSIDrivers() + return c.clientCache.ClusterOrDie(path).CSIDrivers() } // List returns the entire collection of all CSIDrivers across all clusters. func (c *cSIDriversClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*storagev1beta1.CSIDriverList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CSIDrivers().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CSIDrivers().List(ctx, opts) } // Watch begins to watch all CSIDrivers across all clusters. func (c *cSIDriversClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CSIDrivers().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CSIDrivers().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/csinode.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/csinode.go index 33e404dd3fae0..76f53c078597c 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/csinode.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/csinode.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type CSINodesClusterGetter interface { // CSINodeClusterInterface can operate on CSINodes across all clusters, // or scope down to one cluster and return a storagev1beta1client.CSINodeInterface. type CSINodeClusterInterface interface { - Cluster(logicalcluster.Name) storagev1beta1client.CSINodeInterface + Cluster(logicalcluster.Path) storagev1beta1client.CSINodeInterface List(ctx context.Context, opts metav1.ListOptions) (*storagev1beta1.CSINodeList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type cSINodesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *cSINodesClusterInterface) Cluster(name logicalcluster.Name) storagev1beta1client.CSINodeInterface { - if name == logicalcluster.Wildcard { +func (c *cSINodesClusterInterface) Cluster(path logicalcluster.Path) storagev1beta1client.CSINodeInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).CSINodes() + return c.clientCache.ClusterOrDie(path).CSINodes() } // List returns the entire collection of all CSINodes across all clusters. func (c *cSINodesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*storagev1beta1.CSINodeList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CSINodes().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CSINodes().List(ctx, opts) } // Watch begins to watch all CSINodes across all clusters. func (c *cSINodesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CSINodes().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CSINodes().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/csistoragecapacity.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/csistoragecapacity.go index e3beb17613b6f..712f55f08db00 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/csistoragecapacity.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/csistoragecapacity.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type CSIStorageCapacitiesClusterGetter interface { // CSIStorageCapacityClusterInterface can operate on CSIStorageCapacities across all clusters, // or scope down to one cluster and return a CSIStorageCapacitiesNamespacer. type CSIStorageCapacityClusterInterface interface { - Cluster(logicalcluster.Name) CSIStorageCapacitiesNamespacer + Cluster(logicalcluster.Path) CSIStorageCapacitiesNamespacer List(ctx context.Context, opts metav1.ListOptions) (*storagev1beta1.CSIStorageCapacityList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,22 +52,22 @@ type cSIStorageCapacitiesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *cSIStorageCapacitiesClusterInterface) Cluster(name logicalcluster.Name) CSIStorageCapacitiesNamespacer { - if name == logicalcluster.Wildcard { +func (c *cSIStorageCapacitiesClusterInterface) Cluster(path logicalcluster.Path) CSIStorageCapacitiesNamespacer { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return &cSIStorageCapacitiesNamespacer{clientCache: c.clientCache, name: name} + return &cSIStorageCapacitiesNamespacer{clientCache: c.clientCache, path: path} } // List returns the entire collection of all CSIStorageCapacities across all clusters. func (c *cSIStorageCapacitiesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*storagev1beta1.CSIStorageCapacityList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CSIStorageCapacities(metav1.NamespaceAll).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CSIStorageCapacities(metav1.NamespaceAll).List(ctx, opts) } // Watch begins to watch all CSIStorageCapacities across all clusters. func (c *cSIStorageCapacitiesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).CSIStorageCapacities(metav1.NamespaceAll).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).CSIStorageCapacities(metav1.NamespaceAll).Watch(ctx, opts) } // CSIStorageCapacitiesNamespacer can scope to objects within a namespace, returning a storagev1beta1client.CSIStorageCapacityInterface. @@ -77,9 +77,9 @@ type CSIStorageCapacitiesNamespacer interface { type cSIStorageCapacitiesNamespacer struct { clientCache kcpclient.Cache[*storagev1beta1client.StorageV1beta1Client] - name logicalcluster.Name + path logicalcluster.Path } func (n *cSIStorageCapacitiesNamespacer) Namespace(namespace string) storagev1beta1client.CSIStorageCapacityInterface { - return n.clientCache.ClusterOrDie(n.name).CSIStorageCapacities(namespace) + return n.clientCache.ClusterOrDie(n.path).CSIStorageCapacities(namespace) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/storage_client.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/storage_client.go index 26ca70e0c9be3..071caef1b5b25 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/storage_client.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/storage_client.go @@ -25,7 +25,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/client-go/kubernetes/typed/storage/v1beta1" "k8s.io/client-go/rest" @@ -41,18 +41,18 @@ type StorageV1beta1ClusterInterface interface { } type StorageV1beta1ClusterScoper interface { - Cluster(logicalcluster.Name) storagev1beta1.StorageV1beta1Interface + Cluster(logicalcluster.Path) storagev1beta1.StorageV1beta1Interface } type StorageV1beta1ClusterClient struct { clientCache kcpclient.Cache[*storagev1beta1.StorageV1beta1Client] } -func (c *StorageV1beta1ClusterClient) Cluster(name logicalcluster.Name) storagev1beta1.StorageV1beta1Interface { - if name == logicalcluster.Wildcard { +func (c *StorageV1beta1ClusterClient) Cluster(path logicalcluster.Path) storagev1beta1.StorageV1beta1Interface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name) + return c.clientCache.ClusterOrDie(path) } func (c *StorageV1beta1ClusterClient) StorageClasses() StorageClassClusterInterface { diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/storageclass.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/storageclass.go index dce86aed959cf..80fcb0fbd28e4 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/storageclass.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/storageclass.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type StorageClassesClusterGetter interface { // StorageClassClusterInterface can operate on StorageClasses across all clusters, // or scope down to one cluster and return a storagev1beta1client.StorageClassInterface. type StorageClassClusterInterface interface { - Cluster(logicalcluster.Name) storagev1beta1client.StorageClassInterface + Cluster(logicalcluster.Path) storagev1beta1client.StorageClassInterface List(ctx context.Context, opts metav1.ListOptions) (*storagev1beta1.StorageClassList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type storageClassesClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *storageClassesClusterInterface) Cluster(name logicalcluster.Name) storagev1beta1client.StorageClassInterface { - if name == logicalcluster.Wildcard { +func (c *storageClassesClusterInterface) Cluster(path logicalcluster.Path) storagev1beta1client.StorageClassInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).StorageClasses() + return c.clientCache.ClusterOrDie(path).StorageClasses() } // List returns the entire collection of all StorageClasses across all clusters. func (c *storageClassesClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*storagev1beta1.StorageClassList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).StorageClasses().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).StorageClasses().List(ctx, opts) } // Watch begins to watch all StorageClasses across all clusters. func (c *storageClassesClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).StorageClasses().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).StorageClasses().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/volumeattachment.go b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/volumeattachment.go index bb32cc3e89203..9861c1a77f33f 100644 --- a/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/volumeattachment.go +++ b/vendor/github.com/kcp-dev/client-go/kubernetes/typed/storage/v1beta1/volumeattachment.go @@ -25,7 +25,7 @@ import ( "context" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -42,7 +42,7 @@ type VolumeAttachmentsClusterGetter interface { // VolumeAttachmentClusterInterface can operate on VolumeAttachments across all clusters, // or scope down to one cluster and return a storagev1beta1client.VolumeAttachmentInterface. type VolumeAttachmentClusterInterface interface { - Cluster(logicalcluster.Name) storagev1beta1client.VolumeAttachmentInterface + Cluster(logicalcluster.Path) storagev1beta1client.VolumeAttachmentInterface List(ctx context.Context, opts metav1.ListOptions) (*storagev1beta1.VolumeAttachmentList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } @@ -52,20 +52,20 @@ type volumeAttachmentsClusterInterface struct { } // Cluster scopes the client down to a particular cluster. -func (c *volumeAttachmentsClusterInterface) Cluster(name logicalcluster.Name) storagev1beta1client.VolumeAttachmentInterface { - if name == logicalcluster.Wildcard { +func (c *volumeAttachmentsClusterInterface) Cluster(path logicalcluster.Path) storagev1beta1client.VolumeAttachmentInterface { + if path == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } - return c.clientCache.ClusterOrDie(name).VolumeAttachments() + return c.clientCache.ClusterOrDie(path).VolumeAttachments() } // List returns the entire collection of all VolumeAttachments across all clusters. func (c *volumeAttachmentsClusterInterface) List(ctx context.Context, opts metav1.ListOptions) (*storagev1beta1.VolumeAttachmentList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).VolumeAttachments().List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).VolumeAttachments().List(ctx, opts) } // Watch begins to watch all VolumeAttachments across all clusters. func (c *volumeAttachmentsClusterInterface) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).VolumeAttachments().Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).VolumeAttachments().Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1/mutatingwebhookconfiguration.go b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1/mutatingwebhookconfiguration.go index eb63dfaeb46a5..96a70bf007da2 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1/mutatingwebhookconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1/mutatingwebhookconfiguration.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // MutatingWebhookConfigurationClusterLister can list MutatingWebhookConfigurations across all workspaces, or scope down to a MutatingWebhookConfigurationLister for one workspace. +// All objects returned here must be treated as read-only. type MutatingWebhookConfigurationClusterLister interface { + // List lists all MutatingWebhookConfigurations in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*admissionregistrationv1.MutatingWebhookConfiguration, err error) + // Cluster returns a lister that can list and get MutatingWebhookConfigurations in one workspace. Cluster(cluster logicalcluster.Name) admissionregistrationv1listers.MutatingWebhookConfigurationLister + MutatingWebhookConfigurationClusterListerExpansion } type mutatingWebhookConfigurationClusterLister struct { @@ -43,6 +48,10 @@ type mutatingWebhookConfigurationClusterLister struct { } // NewMutatingWebhookConfigurationClusterLister returns a new MutatingWebhookConfigurationClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewMutatingWebhookConfigurationClusterLister(indexer cache.Indexer) *mutatingWebhookConfigurationClusterLister { return &mutatingWebhookConfigurationClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type mutatingWebhookConfigurationLister struct { // List lists all MutatingWebhookConfigurations in the indexer for a workspace. func (s *mutatingWebhookConfigurationLister) List(selector labels.Selector) (ret []*admissionregistrationv1.MutatingWebhookConfiguration, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*admissionregistrationv1.MutatingWebhookConfiguration) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*admissionregistrationv1.MutatingWebhookConfiguration)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1/mutatingwebhookconfiguration_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1/mutatingwebhookconfiguration_expansion.go new file mode 100644 index 0000000000000..ad9ad945bc1ca --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1/mutatingwebhookconfiguration_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// MutatingWebhookConfigurationClusterListerExpansion allows custom methods to be added to MutatingWebhookConfigurationClusterLister. +type MutatingWebhookConfigurationClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1/validatingwebhookconfiguration.go b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1/validatingwebhookconfiguration.go index ae15722044031..a08a5163a498c 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1/validatingwebhookconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1/validatingwebhookconfiguration.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // ValidatingWebhookConfigurationClusterLister can list ValidatingWebhookConfigurations across all workspaces, or scope down to a ValidatingWebhookConfigurationLister for one workspace. +// All objects returned here must be treated as read-only. type ValidatingWebhookConfigurationClusterLister interface { + // List lists all ValidatingWebhookConfigurations in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*admissionregistrationv1.ValidatingWebhookConfiguration, err error) + // Cluster returns a lister that can list and get ValidatingWebhookConfigurations in one workspace. Cluster(cluster logicalcluster.Name) admissionregistrationv1listers.ValidatingWebhookConfigurationLister + ValidatingWebhookConfigurationClusterListerExpansion } type validatingWebhookConfigurationClusterLister struct { @@ -43,6 +48,10 @@ type validatingWebhookConfigurationClusterLister struct { } // NewValidatingWebhookConfigurationClusterLister returns a new ValidatingWebhookConfigurationClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewValidatingWebhookConfigurationClusterLister(indexer cache.Indexer) *validatingWebhookConfigurationClusterLister { return &validatingWebhookConfigurationClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type validatingWebhookConfigurationLister struct { // List lists all ValidatingWebhookConfigurations in the indexer for a workspace. func (s *validatingWebhookConfigurationLister) List(selector labels.Selector) (ret []*admissionregistrationv1.ValidatingWebhookConfiguration, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*admissionregistrationv1.ValidatingWebhookConfiguration) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*admissionregistrationv1.ValidatingWebhookConfiguration)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1/validatingwebhookconfiguration_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1/validatingwebhookconfiguration_expansion.go new file mode 100644 index 0000000000000..bb551f8eda1d4 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1/validatingwebhookconfiguration_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// ValidatingWebhookConfigurationClusterListerExpansion allows custom methods to be added to ValidatingWebhookConfigurationClusterLister. +type ValidatingWebhookConfigurationClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1beta1/mutatingwebhookconfiguration.go b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1beta1/mutatingwebhookconfiguration.go index 3d350dcbb5234..de231b5523598 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1beta1/mutatingwebhookconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1beta1/mutatingwebhookconfiguration.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // MutatingWebhookConfigurationClusterLister can list MutatingWebhookConfigurations across all workspaces, or scope down to a MutatingWebhookConfigurationLister for one workspace. +// All objects returned here must be treated as read-only. type MutatingWebhookConfigurationClusterLister interface { + // List lists all MutatingWebhookConfigurations in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*admissionregistrationv1beta1.MutatingWebhookConfiguration, err error) + // Cluster returns a lister that can list and get MutatingWebhookConfigurations in one workspace. Cluster(cluster logicalcluster.Name) admissionregistrationv1beta1listers.MutatingWebhookConfigurationLister + MutatingWebhookConfigurationClusterListerExpansion } type mutatingWebhookConfigurationClusterLister struct { @@ -43,6 +48,10 @@ type mutatingWebhookConfigurationClusterLister struct { } // NewMutatingWebhookConfigurationClusterLister returns a new MutatingWebhookConfigurationClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewMutatingWebhookConfigurationClusterLister(indexer cache.Indexer) *mutatingWebhookConfigurationClusterLister { return &mutatingWebhookConfigurationClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type mutatingWebhookConfigurationLister struct { // List lists all MutatingWebhookConfigurations in the indexer for a workspace. func (s *mutatingWebhookConfigurationLister) List(selector labels.Selector) (ret []*admissionregistrationv1beta1.MutatingWebhookConfiguration, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*admissionregistrationv1beta1.MutatingWebhookConfiguration) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*admissionregistrationv1beta1.MutatingWebhookConfiguration)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1beta1/mutatingwebhookconfiguration_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1beta1/mutatingwebhookconfiguration_expansion.go new file mode 100644 index 0000000000000..cb793773337da --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1beta1/mutatingwebhookconfiguration_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// MutatingWebhookConfigurationClusterListerExpansion allows custom methods to be added to MutatingWebhookConfigurationClusterLister. +type MutatingWebhookConfigurationClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1beta1/validatingwebhookconfiguration.go b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1beta1/validatingwebhookconfiguration.go index 26b98962b751d..8371b0431ed19 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1beta1/validatingwebhookconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1beta1/validatingwebhookconfiguration.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // ValidatingWebhookConfigurationClusterLister can list ValidatingWebhookConfigurations across all workspaces, or scope down to a ValidatingWebhookConfigurationLister for one workspace. +// All objects returned here must be treated as read-only. type ValidatingWebhookConfigurationClusterLister interface { + // List lists all ValidatingWebhookConfigurations in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*admissionregistrationv1beta1.ValidatingWebhookConfiguration, err error) + // Cluster returns a lister that can list and get ValidatingWebhookConfigurations in one workspace. Cluster(cluster logicalcluster.Name) admissionregistrationv1beta1listers.ValidatingWebhookConfigurationLister + ValidatingWebhookConfigurationClusterListerExpansion } type validatingWebhookConfigurationClusterLister struct { @@ -43,6 +48,10 @@ type validatingWebhookConfigurationClusterLister struct { } // NewValidatingWebhookConfigurationClusterLister returns a new ValidatingWebhookConfigurationClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewValidatingWebhookConfigurationClusterLister(indexer cache.Indexer) *validatingWebhookConfigurationClusterLister { return &validatingWebhookConfigurationClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type validatingWebhookConfigurationLister struct { // List lists all ValidatingWebhookConfigurations in the indexer for a workspace. func (s *validatingWebhookConfigurationLister) List(selector labels.Selector) (ret []*admissionregistrationv1beta1.ValidatingWebhookConfiguration, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*admissionregistrationv1beta1.ValidatingWebhookConfiguration) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*admissionregistrationv1beta1.ValidatingWebhookConfiguration)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1beta1/validatingwebhookconfiguration_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1beta1/validatingwebhookconfiguration_expansion.go new file mode 100644 index 0000000000000..ce50f471d4c43 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/admissionregistration/v1beta1/validatingwebhookconfiguration_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// ValidatingWebhookConfigurationClusterListerExpansion allows custom methods to be added to ValidatingWebhookConfigurationClusterLister. +type ValidatingWebhookConfigurationClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/apiserverinternal/v1alpha1/storageversion.go b/vendor/github.com/kcp-dev/client-go/listers/apiserverinternal/v1alpha1/storageversion.go index f75414c1d2f09..5398ba96d3975 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apiserverinternal/v1alpha1/storageversion.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apiserverinternal/v1alpha1/storageversion.go @@ -23,7 +23,7 @@ package v1alpha1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" internalv1alpha1 "k8s.io/api/apiserverinternal/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // StorageVersionClusterLister can list StorageVersions across all workspaces, or scope down to a StorageVersionLister for one workspace. +// All objects returned here must be treated as read-only. type StorageVersionClusterLister interface { + // List lists all StorageVersions in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*internalv1alpha1.StorageVersion, err error) + // Cluster returns a lister that can list and get StorageVersions in one workspace. Cluster(cluster logicalcluster.Name) internalv1alpha1listers.StorageVersionLister + StorageVersionClusterListerExpansion } type storageVersionClusterLister struct { @@ -43,6 +48,10 @@ type storageVersionClusterLister struct { } // NewStorageVersionClusterLister returns a new StorageVersionClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewStorageVersionClusterLister(indexer cache.Indexer) *storageVersionClusterLister { return &storageVersionClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type storageVersionLister struct { // List lists all StorageVersions in the indexer for a workspace. func (s *storageVersionLister) List(selector labels.Selector) (ret []*internalv1alpha1.StorageVersion, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*internalv1alpha1.StorageVersion) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*internalv1alpha1.StorageVersion)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/apiserverinternal/v1alpha1/storageversion_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/apiserverinternal/v1alpha1/storageversion_expansion.go new file mode 100644 index 0000000000000..63038d3f2deeb --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/apiserverinternal/v1alpha1/storageversion_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1alpha1 + +// StorageVersionClusterListerExpansion allows custom methods to be added to StorageVersionClusterLister. +type StorageVersionClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/controllerrevision.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/controllerrevision.go index d320f959cd6c2..77892f292ddae 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/controllerrevision.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/controllerrevision.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appsv1listers "k8s.io/client-go/listers/apps/v1" "k8s.io/client-go/tools/cache" ) // ControllerRevisionClusterLister can list ControllerRevisions across all workspaces, or scope down to a ControllerRevisionLister for one workspace. +// All objects returned here must be treated as read-only. type ControllerRevisionClusterLister interface { + // List lists all ControllerRevisions in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*appsv1.ControllerRevision, err error) + // Cluster returns a lister that can list and get ControllerRevisions in one workspace. Cluster(cluster logicalcluster.Name) appsv1listers.ControllerRevisionLister + ControllerRevisionClusterListerExpansion } type controllerRevisionClusterLister struct { @@ -44,6 +48,11 @@ type controllerRevisionClusterLister struct { } // NewControllerRevisionClusterLister returns a new ControllerRevisionClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewControllerRevisionClusterLister(indexer cache.Indexer) *controllerRevisionClusterLister { return &controllerRevisionClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type controllerRevisionLister struct { // List lists all ControllerRevisions in the indexer for a workspace. func (s *controllerRevisionLister) List(selector labels.Selector) (ret []*appsv1.ControllerRevision, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1.ControllerRevision) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1.ControllerRevision)) + }) return ret, err } @@ -104,28 +98,9 @@ type controllerRevisionNamespaceLister struct { // List lists all ControllerRevisions in the indexer for a given workspace and namespace. func (s *controllerRevisionNamespaceLister) List(selector labels.Selector) (ret []*appsv1.ControllerRevision, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1.ControllerRevision) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1.ControllerRevision)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/controllerrevision_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/controllerrevision_expansion.go new file mode 100644 index 0000000000000..121e47ec65fd0 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/controllerrevision_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// ControllerRevisionClusterListerExpansion allows custom methods to be added to ControllerRevisionClusterLister. +type ControllerRevisionClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/daemonset.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/daemonset.go index 985ad1aaaa130..1c39e7111fcb0 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/daemonset.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/daemonset.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appsv1listers "k8s.io/client-go/listers/apps/v1" "k8s.io/client-go/tools/cache" ) // DaemonSetClusterLister can list DaemonSets across all workspaces, or scope down to a DaemonSetLister for one workspace. +// All objects returned here must be treated as read-only. type DaemonSetClusterLister interface { + // List lists all DaemonSets in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*appsv1.DaemonSet, err error) + // Cluster returns a lister that can list and get DaemonSets in one workspace. Cluster(cluster logicalcluster.Name) appsv1listers.DaemonSetLister + DaemonSetClusterListerExpansion } type daemonSetClusterLister struct { @@ -44,6 +48,11 @@ type daemonSetClusterLister struct { } // NewDaemonSetClusterLister returns a new DaemonSetClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewDaemonSetClusterLister(indexer cache.Indexer) *daemonSetClusterLister { return &daemonSetClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type daemonSetLister struct { // List lists all DaemonSets in the indexer for a workspace. func (s *daemonSetLister) List(selector labels.Selector) (ret []*appsv1.DaemonSet, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1.DaemonSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1.DaemonSet)) + }) return ret, err } @@ -104,28 +98,9 @@ type daemonSetNamespaceLister struct { // List lists all DaemonSets in the indexer for a given workspace and namespace. func (s *daemonSetNamespaceLister) List(selector labels.Selector) (ret []*appsv1.DaemonSet, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1.DaemonSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1.DaemonSet)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/daemonset_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/daemonset_expansion.go index 667d6fb88ea02..689c9ec81c07d 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/daemonset_expansion.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/daemonset_expansion.go @@ -25,6 +25,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ) +// DaemonSetClusterListerExpansion allows custom methods to be added to +// DaemonSetClusterLister. +type DaemonSetClusterListerExpansion interface{} + // DaemonSetListerExpansion allows custom methods to be added to // DaemonSetLister. type DaemonSetListerExpansion interface { diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/deployment.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/deployment.go index 008de8b4549b9..be4a5018bf6f7 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/deployment.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/deployment.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appsv1listers "k8s.io/client-go/listers/apps/v1" "k8s.io/client-go/tools/cache" ) // DeploymentClusterLister can list Deployments across all workspaces, or scope down to a DeploymentLister for one workspace. +// All objects returned here must be treated as read-only. type DeploymentClusterLister interface { + // List lists all Deployments in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*appsv1.Deployment, err error) + // Cluster returns a lister that can list and get Deployments in one workspace. Cluster(cluster logicalcluster.Name) appsv1listers.DeploymentLister + DeploymentClusterListerExpansion } type deploymentClusterLister struct { @@ -44,6 +48,11 @@ type deploymentClusterLister struct { } // NewDeploymentClusterLister returns a new DeploymentClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewDeploymentClusterLister(indexer cache.Indexer) *deploymentClusterLister { return &deploymentClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type deploymentLister struct { // List lists all Deployments in the indexer for a workspace. func (s *deploymentLister) List(selector labels.Selector) (ret []*appsv1.Deployment, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1.Deployment) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1.Deployment)) + }) return ret, err } @@ -104,28 +98,9 @@ type deploymentNamespaceLister struct { // List lists all Deployments in the indexer for a given workspace and namespace. func (s *deploymentNamespaceLister) List(selector labels.Selector) (ret []*appsv1.Deployment, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1.Deployment) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1.Deployment)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/deployment_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/deployment_expansion.go new file mode 100644 index 0000000000000..b0dcdac73dc46 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/deployment_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// DeploymentClusterListerExpansion allows custom methods to be added to DeploymentClusterLister. +type DeploymentClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/replicaset.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/replicaset.go index ec770bf0cc4e4..88ea3bb192b93 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/replicaset.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/replicaset.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appsv1listers "k8s.io/client-go/listers/apps/v1" "k8s.io/client-go/tools/cache" ) // ReplicaSetClusterLister can list ReplicaSets across all workspaces, or scope down to a ReplicaSetLister for one workspace. +// All objects returned here must be treated as read-only. type ReplicaSetClusterLister interface { + // List lists all ReplicaSets in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*appsv1.ReplicaSet, err error) + // Cluster returns a lister that can list and get ReplicaSets in one workspace. Cluster(cluster logicalcluster.Name) appsv1listers.ReplicaSetLister + ReplicaSetClusterListerExpansion } type replicaSetClusterLister struct { @@ -44,6 +48,11 @@ type replicaSetClusterLister struct { } // NewReplicaSetClusterLister returns a new ReplicaSetClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewReplicaSetClusterLister(indexer cache.Indexer) *replicaSetClusterLister { return &replicaSetClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type replicaSetLister struct { // List lists all ReplicaSets in the indexer for a workspace. func (s *replicaSetLister) List(selector labels.Selector) (ret []*appsv1.ReplicaSet, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1.ReplicaSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1.ReplicaSet)) + }) return ret, err } @@ -104,28 +98,9 @@ type replicaSetNamespaceLister struct { // List lists all ReplicaSets in the indexer for a given workspace and namespace. func (s *replicaSetNamespaceLister) List(selector labels.Selector) (ret []*appsv1.ReplicaSet, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1.ReplicaSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1.ReplicaSet)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/replicaset_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/replicaset_expansion.go index 8e093de0a0157..02d077461332d 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/replicaset_expansion.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/replicaset_expansion.go @@ -25,6 +25,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ) +// ReplicaSetClusterListerExpansion allows custom methods to be added to +// ReplicaSetClusterLister. +type ReplicaSetClusterListerExpansion interface{} + // ReplicaSetListerExpansion allows custom methods to be added to // ReplicaSetLister. type ReplicaSetListerExpansion interface { diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/statefulset.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/statefulset.go index 8e26d00004c23..6ff5f2cbad53f 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/statefulset.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/statefulset.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appsv1listers "k8s.io/client-go/listers/apps/v1" "k8s.io/client-go/tools/cache" ) // StatefulSetClusterLister can list StatefulSets across all workspaces, or scope down to a StatefulSetLister for one workspace. +// All objects returned here must be treated as read-only. type StatefulSetClusterLister interface { + // List lists all StatefulSets in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*appsv1.StatefulSet, err error) + // Cluster returns a lister that can list and get StatefulSets in one workspace. Cluster(cluster logicalcluster.Name) appsv1listers.StatefulSetLister + StatefulSetClusterListerExpansion } type statefulSetClusterLister struct { @@ -44,6 +48,11 @@ type statefulSetClusterLister struct { } // NewStatefulSetClusterLister returns a new StatefulSetClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewStatefulSetClusterLister(indexer cache.Indexer) *statefulSetClusterLister { return &statefulSetClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type statefulSetLister struct { // List lists all StatefulSets in the indexer for a workspace. func (s *statefulSetLister) List(selector labels.Selector) (ret []*appsv1.StatefulSet, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1.StatefulSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1.StatefulSet)) + }) return ret, err } @@ -104,28 +98,9 @@ type statefulSetNamespaceLister struct { // List lists all StatefulSets in the indexer for a given workspace and namespace. func (s *statefulSetNamespaceLister) List(selector labels.Selector) (ret []*appsv1.StatefulSet, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1.StatefulSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1.StatefulSet)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/statefulset_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/statefulset_expansion.go index e79f8a2b46ad6..b72ed2c32152e 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1/statefulset_expansion.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1/statefulset_expansion.go @@ -25,6 +25,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ) +// StatefulSetClusterListerExpansion allows custom methods to be added to +// StatefulSetClusterLister. +type StatefulSetClusterListerExpansion interface{} + // StatefulSetListerExpansion allows custom methods to be added to // StatefulSetLister. type StatefulSetListerExpansion interface { diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/controllerrevision.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/controllerrevision.go index 3b5de12fb3e35..31415ea635f39 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/controllerrevision.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/controllerrevision.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta1 "k8s.io/api/apps/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appsv1beta1listers "k8s.io/client-go/listers/apps/v1beta1" "k8s.io/client-go/tools/cache" ) // ControllerRevisionClusterLister can list ControllerRevisions across all workspaces, or scope down to a ControllerRevisionLister for one workspace. +// All objects returned here must be treated as read-only. type ControllerRevisionClusterLister interface { + // List lists all ControllerRevisions in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*appsv1beta1.ControllerRevision, err error) + // Cluster returns a lister that can list and get ControllerRevisions in one workspace. Cluster(cluster logicalcluster.Name) appsv1beta1listers.ControllerRevisionLister + ControllerRevisionClusterListerExpansion } type controllerRevisionClusterLister struct { @@ -44,6 +48,11 @@ type controllerRevisionClusterLister struct { } // NewControllerRevisionClusterLister returns a new ControllerRevisionClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewControllerRevisionClusterLister(indexer cache.Indexer) *controllerRevisionClusterLister { return &controllerRevisionClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type controllerRevisionLister struct { // List lists all ControllerRevisions in the indexer for a workspace. func (s *controllerRevisionLister) List(selector labels.Selector) (ret []*appsv1beta1.ControllerRevision, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta1.ControllerRevision) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta1.ControllerRevision)) + }) return ret, err } @@ -104,28 +98,9 @@ type controllerRevisionNamespaceLister struct { // List lists all ControllerRevisions in the indexer for a given workspace and namespace. func (s *controllerRevisionNamespaceLister) List(selector labels.Selector) (ret []*appsv1beta1.ControllerRevision, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta1.ControllerRevision) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta1.ControllerRevision)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/controllerrevision_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/controllerrevision_expansion.go new file mode 100644 index 0000000000000..c0745283cc5a1 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/controllerrevision_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// ControllerRevisionClusterListerExpansion allows custom methods to be added to ControllerRevisionClusterLister. +type ControllerRevisionClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/deployment.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/deployment.go index ac90ba02b31d3..7254689e38fb3 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/deployment.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/deployment.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta1 "k8s.io/api/apps/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appsv1beta1listers "k8s.io/client-go/listers/apps/v1beta1" "k8s.io/client-go/tools/cache" ) // DeploymentClusterLister can list Deployments across all workspaces, or scope down to a DeploymentLister for one workspace. +// All objects returned here must be treated as read-only. type DeploymentClusterLister interface { + // List lists all Deployments in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*appsv1beta1.Deployment, err error) + // Cluster returns a lister that can list and get Deployments in one workspace. Cluster(cluster logicalcluster.Name) appsv1beta1listers.DeploymentLister + DeploymentClusterListerExpansion } type deploymentClusterLister struct { @@ -44,6 +48,11 @@ type deploymentClusterLister struct { } // NewDeploymentClusterLister returns a new DeploymentClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewDeploymentClusterLister(indexer cache.Indexer) *deploymentClusterLister { return &deploymentClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type deploymentLister struct { // List lists all Deployments in the indexer for a workspace. func (s *deploymentLister) List(selector labels.Selector) (ret []*appsv1beta1.Deployment, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta1.Deployment) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta1.Deployment)) + }) return ret, err } @@ -104,28 +98,9 @@ type deploymentNamespaceLister struct { // List lists all Deployments in the indexer for a given workspace and namespace. func (s *deploymentNamespaceLister) List(selector labels.Selector) (ret []*appsv1beta1.Deployment, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta1.Deployment) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta1.Deployment)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/deployment_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/deployment_expansion.go new file mode 100644 index 0000000000000..11a6cf51cea87 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/deployment_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// DeploymentClusterListerExpansion allows custom methods to be added to DeploymentClusterLister. +type DeploymentClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/statefulset.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/statefulset.go index de76e6cb839fc..6b5457bae6423 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/statefulset.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/statefulset.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta1 "k8s.io/api/apps/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appsv1beta1listers "k8s.io/client-go/listers/apps/v1beta1" "k8s.io/client-go/tools/cache" ) // StatefulSetClusterLister can list StatefulSets across all workspaces, or scope down to a StatefulSetLister for one workspace. +// All objects returned here must be treated as read-only. type StatefulSetClusterLister interface { + // List lists all StatefulSets in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*appsv1beta1.StatefulSet, err error) + // Cluster returns a lister that can list and get StatefulSets in one workspace. Cluster(cluster logicalcluster.Name) appsv1beta1listers.StatefulSetLister + StatefulSetClusterListerExpansion } type statefulSetClusterLister struct { @@ -44,6 +48,11 @@ type statefulSetClusterLister struct { } // NewStatefulSetClusterLister returns a new StatefulSetClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewStatefulSetClusterLister(indexer cache.Indexer) *statefulSetClusterLister { return &statefulSetClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type statefulSetLister struct { // List lists all StatefulSets in the indexer for a workspace. func (s *statefulSetLister) List(selector labels.Selector) (ret []*appsv1beta1.StatefulSet, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta1.StatefulSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta1.StatefulSet)) + }) return ret, err } @@ -104,28 +98,9 @@ type statefulSetNamespaceLister struct { // List lists all StatefulSets in the indexer for a given workspace and namespace. func (s *statefulSetNamespaceLister) List(selector labels.Selector) (ret []*appsv1beta1.StatefulSet, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta1.StatefulSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta1.StatefulSet)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/statefulset_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/statefulset_expansion.go index 7d2c4d9b07a72..24ef8ccb6d749 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/statefulset_expansion.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta1/statefulset_expansion.go @@ -25,6 +25,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ) +// StatefulSetClusterListerExpansion allows custom methods to be added to +// StatefulSetClusterLister. +type StatefulSetClusterListerExpansion interface{} + // StatefulSetListerExpansion allows custom methods to be added to // StatefulSetLister. type StatefulSetListerExpansion interface { diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/controllerrevision.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/controllerrevision.go index f508120b77dcf..afd053f02721f 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/controllerrevision.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/controllerrevision.go @@ -23,20 +23,24 @@ package v1beta2 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appsv1beta2listers "k8s.io/client-go/listers/apps/v1beta2" "k8s.io/client-go/tools/cache" ) // ControllerRevisionClusterLister can list ControllerRevisions across all workspaces, or scope down to a ControllerRevisionLister for one workspace. +// All objects returned here must be treated as read-only. type ControllerRevisionClusterLister interface { + // List lists all ControllerRevisions in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*appsv1beta2.ControllerRevision, err error) + // Cluster returns a lister that can list and get ControllerRevisions in one workspace. Cluster(cluster logicalcluster.Name) appsv1beta2listers.ControllerRevisionLister + ControllerRevisionClusterListerExpansion } type controllerRevisionClusterLister struct { @@ -44,6 +48,11 @@ type controllerRevisionClusterLister struct { } // NewControllerRevisionClusterLister returns a new ControllerRevisionClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewControllerRevisionClusterLister(indexer cache.Indexer) *controllerRevisionClusterLister { return &controllerRevisionClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type controllerRevisionLister struct { // List lists all ControllerRevisions in the indexer for a workspace. func (s *controllerRevisionLister) List(selector labels.Selector) (ret []*appsv1beta2.ControllerRevision, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta2.ControllerRevision) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta2.ControllerRevision)) + }) return ret, err } @@ -104,28 +98,9 @@ type controllerRevisionNamespaceLister struct { // List lists all ControllerRevisions in the indexer for a given workspace and namespace. func (s *controllerRevisionNamespaceLister) List(selector labels.Selector) (ret []*appsv1beta2.ControllerRevision, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta2.ControllerRevision) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta2.ControllerRevision)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/controllerrevision_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/controllerrevision_expansion.go new file mode 100644 index 0000000000000..0bb948b3eccf3 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/controllerrevision_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta2 + +// ControllerRevisionClusterListerExpansion allows custom methods to be added to ControllerRevisionClusterLister. +type ControllerRevisionClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/daemonset.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/daemonset.go index 99ef948d61ccf..9bd176d03c58b 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/daemonset.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/daemonset.go @@ -23,20 +23,24 @@ package v1beta2 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appsv1beta2listers "k8s.io/client-go/listers/apps/v1beta2" "k8s.io/client-go/tools/cache" ) // DaemonSetClusterLister can list DaemonSets across all workspaces, or scope down to a DaemonSetLister for one workspace. +// All objects returned here must be treated as read-only. type DaemonSetClusterLister interface { + // List lists all DaemonSets in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*appsv1beta2.DaemonSet, err error) + // Cluster returns a lister that can list and get DaemonSets in one workspace. Cluster(cluster logicalcluster.Name) appsv1beta2listers.DaemonSetLister + DaemonSetClusterListerExpansion } type daemonSetClusterLister struct { @@ -44,6 +48,11 @@ type daemonSetClusterLister struct { } // NewDaemonSetClusterLister returns a new DaemonSetClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewDaemonSetClusterLister(indexer cache.Indexer) *daemonSetClusterLister { return &daemonSetClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type daemonSetLister struct { // List lists all DaemonSets in the indexer for a workspace. func (s *daemonSetLister) List(selector labels.Selector) (ret []*appsv1beta2.DaemonSet, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta2.DaemonSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta2.DaemonSet)) + }) return ret, err } @@ -104,28 +98,9 @@ type daemonSetNamespaceLister struct { // List lists all DaemonSets in the indexer for a given workspace and namespace. func (s *daemonSetNamespaceLister) List(selector labels.Selector) (ret []*appsv1beta2.DaemonSet, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta2.DaemonSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta2.DaemonSet)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/daemonset_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/daemonset_expansion.go index e722b63b68081..169d7b667430a 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/daemonset_expansion.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/daemonset_expansion.go @@ -25,6 +25,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ) +// DaemonSetClusterListerExpansion allows custom methods to be added to +// DaemonSetClusterLister. +type DaemonSetClusterListerExpansion interface{} + // DaemonSetListerExpansion allows custom methods to be added to // DaemonSetLister. type DaemonSetListerExpansion interface { diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/deployment.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/deployment.go index 21ed4bd0da236..cf76ea14f55bb 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/deployment.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/deployment.go @@ -23,20 +23,24 @@ package v1beta2 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appsv1beta2listers "k8s.io/client-go/listers/apps/v1beta2" "k8s.io/client-go/tools/cache" ) // DeploymentClusterLister can list Deployments across all workspaces, or scope down to a DeploymentLister for one workspace. +// All objects returned here must be treated as read-only. type DeploymentClusterLister interface { + // List lists all Deployments in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*appsv1beta2.Deployment, err error) + // Cluster returns a lister that can list and get Deployments in one workspace. Cluster(cluster logicalcluster.Name) appsv1beta2listers.DeploymentLister + DeploymentClusterListerExpansion } type deploymentClusterLister struct { @@ -44,6 +48,11 @@ type deploymentClusterLister struct { } // NewDeploymentClusterLister returns a new DeploymentClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewDeploymentClusterLister(indexer cache.Indexer) *deploymentClusterLister { return &deploymentClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type deploymentLister struct { // List lists all Deployments in the indexer for a workspace. func (s *deploymentLister) List(selector labels.Selector) (ret []*appsv1beta2.Deployment, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta2.Deployment) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta2.Deployment)) + }) return ret, err } @@ -104,28 +98,9 @@ type deploymentNamespaceLister struct { // List lists all Deployments in the indexer for a given workspace and namespace. func (s *deploymentNamespaceLister) List(selector labels.Selector) (ret []*appsv1beta2.Deployment, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta2.Deployment) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta2.Deployment)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/deployment_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/deployment_expansion.go new file mode 100644 index 0000000000000..df847acecd0b5 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/deployment_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta2 + +// DeploymentClusterListerExpansion allows custom methods to be added to DeploymentClusterLister. +type DeploymentClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/replicaset.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/replicaset.go index 91a10383c03d8..f03ac713b5d17 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/replicaset.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/replicaset.go @@ -23,20 +23,24 @@ package v1beta2 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appsv1beta2listers "k8s.io/client-go/listers/apps/v1beta2" "k8s.io/client-go/tools/cache" ) // ReplicaSetClusterLister can list ReplicaSets across all workspaces, or scope down to a ReplicaSetLister for one workspace. +// All objects returned here must be treated as read-only. type ReplicaSetClusterLister interface { + // List lists all ReplicaSets in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*appsv1beta2.ReplicaSet, err error) + // Cluster returns a lister that can list and get ReplicaSets in one workspace. Cluster(cluster logicalcluster.Name) appsv1beta2listers.ReplicaSetLister + ReplicaSetClusterListerExpansion } type replicaSetClusterLister struct { @@ -44,6 +48,11 @@ type replicaSetClusterLister struct { } // NewReplicaSetClusterLister returns a new ReplicaSetClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewReplicaSetClusterLister(indexer cache.Indexer) *replicaSetClusterLister { return &replicaSetClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type replicaSetLister struct { // List lists all ReplicaSets in the indexer for a workspace. func (s *replicaSetLister) List(selector labels.Selector) (ret []*appsv1beta2.ReplicaSet, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta2.ReplicaSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta2.ReplicaSet)) + }) return ret, err } @@ -104,28 +98,9 @@ type replicaSetNamespaceLister struct { // List lists all ReplicaSets in the indexer for a given workspace and namespace. func (s *replicaSetNamespaceLister) List(selector labels.Selector) (ret []*appsv1beta2.ReplicaSet, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta2.ReplicaSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta2.ReplicaSet)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/replicaset_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/replicaset_expansion.go index bc014b5a69d5a..484eb6324e50a 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/replicaset_expansion.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/replicaset_expansion.go @@ -25,6 +25,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ) +// ReplicaSetClusterListerExpansion allows custom methods to be added to +// ReplicaSetClusterLister. +type ReplicaSetClusterListerExpansion interface{} + // ReplicaSetListerExpansion allows custom methods to be added to // ReplicaSetLister. type ReplicaSetListerExpansion interface { diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/statefulset.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/statefulset.go index 63f2c93825eb3..22e11cdbaad22 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/statefulset.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/statefulset.go @@ -23,20 +23,24 @@ package v1beta2 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" appsv1beta2 "k8s.io/api/apps/v1beta2" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" appsv1beta2listers "k8s.io/client-go/listers/apps/v1beta2" "k8s.io/client-go/tools/cache" ) // StatefulSetClusterLister can list StatefulSets across all workspaces, or scope down to a StatefulSetLister for one workspace. +// All objects returned here must be treated as read-only. type StatefulSetClusterLister interface { + // List lists all StatefulSets in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*appsv1beta2.StatefulSet, err error) + // Cluster returns a lister that can list and get StatefulSets in one workspace. Cluster(cluster logicalcluster.Name) appsv1beta2listers.StatefulSetLister + StatefulSetClusterListerExpansion } type statefulSetClusterLister struct { @@ -44,6 +48,11 @@ type statefulSetClusterLister struct { } // NewStatefulSetClusterLister returns a new StatefulSetClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewStatefulSetClusterLister(indexer cache.Indexer) *statefulSetClusterLister { return &statefulSetClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type statefulSetLister struct { // List lists all StatefulSets in the indexer for a workspace. func (s *statefulSetLister) List(selector labels.Selector) (ret []*appsv1beta2.StatefulSet, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta2.StatefulSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta2.StatefulSet)) + }) return ret, err } @@ -104,28 +98,9 @@ type statefulSetNamespaceLister struct { // List lists all StatefulSets in the indexer for a given workspace and namespace. func (s *statefulSetNamespaceLister) List(selector labels.Selector) (ret []*appsv1beta2.StatefulSet, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*appsv1beta2.StatefulSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*appsv1beta2.StatefulSet)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/statefulset_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/statefulset_expansion.go index eae31b82f83f3..f9a3b38cb1d76 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/statefulset_expansion.go +++ b/vendor/github.com/kcp-dev/client-go/listers/apps/v1beta2/statefulset_expansion.go @@ -25,6 +25,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ) +// StatefulSetClusterListerExpansion allows custom methods to be added to +// StatefulSetClusterLister. +type StatefulSetClusterListerExpansion interface{} + // StatefulSetListerExpansion allows custom methods to be added to // StatefulSetLister. type StatefulSetListerExpansion interface { diff --git a/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v1/horizontalpodautoscaler.go b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v1/horizontalpodautoscaler.go index d61c474e6e6cf..2a1f29b463f69 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v1/horizontalpodautoscaler.go +++ b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v1/horizontalpodautoscaler.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv1 "k8s.io/api/autoscaling/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" autoscalingv1listers "k8s.io/client-go/listers/autoscaling/v1" "k8s.io/client-go/tools/cache" ) // HorizontalPodAutoscalerClusterLister can list HorizontalPodAutoscalers across all workspaces, or scope down to a HorizontalPodAutoscalerLister for one workspace. +// All objects returned here must be treated as read-only. type HorizontalPodAutoscalerClusterLister interface { + // List lists all HorizontalPodAutoscalers in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*autoscalingv1.HorizontalPodAutoscaler, err error) + // Cluster returns a lister that can list and get HorizontalPodAutoscalers in one workspace. Cluster(cluster logicalcluster.Name) autoscalingv1listers.HorizontalPodAutoscalerLister + HorizontalPodAutoscalerClusterListerExpansion } type horizontalPodAutoscalerClusterLister struct { @@ -44,6 +48,11 @@ type horizontalPodAutoscalerClusterLister struct { } // NewHorizontalPodAutoscalerClusterLister returns a new HorizontalPodAutoscalerClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewHorizontalPodAutoscalerClusterLister(indexer cache.Indexer) *horizontalPodAutoscalerClusterLister { return &horizontalPodAutoscalerClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type horizontalPodAutoscalerLister struct { // List lists all HorizontalPodAutoscalers in the indexer for a workspace. func (s *horizontalPodAutoscalerLister) List(selector labels.Selector) (ret []*autoscalingv1.HorizontalPodAutoscaler, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*autoscalingv1.HorizontalPodAutoscaler) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*autoscalingv1.HorizontalPodAutoscaler)) + }) return ret, err } @@ -104,28 +98,9 @@ type horizontalPodAutoscalerNamespaceLister struct { // List lists all HorizontalPodAutoscalers in the indexer for a given workspace and namespace. func (s *horizontalPodAutoscalerNamespaceLister) List(selector labels.Selector) (ret []*autoscalingv1.HorizontalPodAutoscaler, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*autoscalingv1.HorizontalPodAutoscaler) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*autoscalingv1.HorizontalPodAutoscaler)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v1/horizontalpodautoscaler_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v1/horizontalpodautoscaler_expansion.go new file mode 100644 index 0000000000000..65785806b5df1 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v1/horizontalpodautoscaler_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// HorizontalPodAutoscalerClusterListerExpansion allows custom methods to be added to HorizontalPodAutoscalerClusterLister. +type HorizontalPodAutoscalerClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2/horizontalpodautoscaler.go b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2/horizontalpodautoscaler.go index 002ceede1a6c6..141a164b1cbea 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2/horizontalpodautoscaler.go +++ b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2/horizontalpodautoscaler.go @@ -23,20 +23,24 @@ package v2 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv2 "k8s.io/api/autoscaling/v2" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" autoscalingv2listers "k8s.io/client-go/listers/autoscaling/v2" "k8s.io/client-go/tools/cache" ) // HorizontalPodAutoscalerClusterLister can list HorizontalPodAutoscalers across all workspaces, or scope down to a HorizontalPodAutoscalerLister for one workspace. +// All objects returned here must be treated as read-only. type HorizontalPodAutoscalerClusterLister interface { + // List lists all HorizontalPodAutoscalers in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*autoscalingv2.HorizontalPodAutoscaler, err error) + // Cluster returns a lister that can list and get HorizontalPodAutoscalers in one workspace. Cluster(cluster logicalcluster.Name) autoscalingv2listers.HorizontalPodAutoscalerLister + HorizontalPodAutoscalerClusterListerExpansion } type horizontalPodAutoscalerClusterLister struct { @@ -44,6 +48,11 @@ type horizontalPodAutoscalerClusterLister struct { } // NewHorizontalPodAutoscalerClusterLister returns a new HorizontalPodAutoscalerClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewHorizontalPodAutoscalerClusterLister(indexer cache.Indexer) *horizontalPodAutoscalerClusterLister { return &horizontalPodAutoscalerClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type horizontalPodAutoscalerLister struct { // List lists all HorizontalPodAutoscalers in the indexer for a workspace. func (s *horizontalPodAutoscalerLister) List(selector labels.Selector) (ret []*autoscalingv2.HorizontalPodAutoscaler, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*autoscalingv2.HorizontalPodAutoscaler) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*autoscalingv2.HorizontalPodAutoscaler)) + }) return ret, err } @@ -104,28 +98,9 @@ type horizontalPodAutoscalerNamespaceLister struct { // List lists all HorizontalPodAutoscalers in the indexer for a given workspace and namespace. func (s *horizontalPodAutoscalerNamespaceLister) List(selector labels.Selector) (ret []*autoscalingv2.HorizontalPodAutoscaler, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*autoscalingv2.HorizontalPodAutoscaler) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*autoscalingv2.HorizontalPodAutoscaler)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2/horizontalpodautoscaler_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2/horizontalpodautoscaler_expansion.go new file mode 100644 index 0000000000000..f186ef85d3062 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2/horizontalpodautoscaler_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v2 + +// HorizontalPodAutoscalerClusterListerExpansion allows custom methods to be added to HorizontalPodAutoscalerClusterLister. +type HorizontalPodAutoscalerClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2beta1/horizontalpodautoscaler.go b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2beta1/horizontalpodautoscaler.go index 552bed435b07e..a2814017cb78f 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2beta1/horizontalpodautoscaler.go +++ b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2beta1/horizontalpodautoscaler.go @@ -23,20 +23,24 @@ package v2beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv2beta1 "k8s.io/api/autoscaling/v2beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" autoscalingv2beta1listers "k8s.io/client-go/listers/autoscaling/v2beta1" "k8s.io/client-go/tools/cache" ) // HorizontalPodAutoscalerClusterLister can list HorizontalPodAutoscalers across all workspaces, or scope down to a HorizontalPodAutoscalerLister for one workspace. +// All objects returned here must be treated as read-only. type HorizontalPodAutoscalerClusterLister interface { + // List lists all HorizontalPodAutoscalers in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*autoscalingv2beta1.HorizontalPodAutoscaler, err error) + // Cluster returns a lister that can list and get HorizontalPodAutoscalers in one workspace. Cluster(cluster logicalcluster.Name) autoscalingv2beta1listers.HorizontalPodAutoscalerLister + HorizontalPodAutoscalerClusterListerExpansion } type horizontalPodAutoscalerClusterLister struct { @@ -44,6 +48,11 @@ type horizontalPodAutoscalerClusterLister struct { } // NewHorizontalPodAutoscalerClusterLister returns a new HorizontalPodAutoscalerClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewHorizontalPodAutoscalerClusterLister(indexer cache.Indexer) *horizontalPodAutoscalerClusterLister { return &horizontalPodAutoscalerClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type horizontalPodAutoscalerLister struct { // List lists all HorizontalPodAutoscalers in the indexer for a workspace. func (s *horizontalPodAutoscalerLister) List(selector labels.Selector) (ret []*autoscalingv2beta1.HorizontalPodAutoscaler, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*autoscalingv2beta1.HorizontalPodAutoscaler) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*autoscalingv2beta1.HorizontalPodAutoscaler)) + }) return ret, err } @@ -104,28 +98,9 @@ type horizontalPodAutoscalerNamespaceLister struct { // List lists all HorizontalPodAutoscalers in the indexer for a given workspace and namespace. func (s *horizontalPodAutoscalerNamespaceLister) List(selector labels.Selector) (ret []*autoscalingv2beta1.HorizontalPodAutoscaler, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*autoscalingv2beta1.HorizontalPodAutoscaler) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*autoscalingv2beta1.HorizontalPodAutoscaler)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2beta1/horizontalpodautoscaler_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2beta1/horizontalpodautoscaler_expansion.go new file mode 100644 index 0000000000000..30954c982bb4f --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2beta1/horizontalpodautoscaler_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v2beta1 + +// HorizontalPodAutoscalerClusterListerExpansion allows custom methods to be added to HorizontalPodAutoscalerClusterLister. +type HorizontalPodAutoscalerClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2beta2/horizontalpodautoscaler.go b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2beta2/horizontalpodautoscaler.go index 70fdccda987bf..53ee19304aa0b 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2beta2/horizontalpodautoscaler.go +++ b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2beta2/horizontalpodautoscaler.go @@ -23,20 +23,24 @@ package v2beta2 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" autoscalingv2beta2listers "k8s.io/client-go/listers/autoscaling/v2beta2" "k8s.io/client-go/tools/cache" ) // HorizontalPodAutoscalerClusterLister can list HorizontalPodAutoscalers across all workspaces, or scope down to a HorizontalPodAutoscalerLister for one workspace. +// All objects returned here must be treated as read-only. type HorizontalPodAutoscalerClusterLister interface { + // List lists all HorizontalPodAutoscalers in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*autoscalingv2beta2.HorizontalPodAutoscaler, err error) + // Cluster returns a lister that can list and get HorizontalPodAutoscalers in one workspace. Cluster(cluster logicalcluster.Name) autoscalingv2beta2listers.HorizontalPodAutoscalerLister + HorizontalPodAutoscalerClusterListerExpansion } type horizontalPodAutoscalerClusterLister struct { @@ -44,6 +48,11 @@ type horizontalPodAutoscalerClusterLister struct { } // NewHorizontalPodAutoscalerClusterLister returns a new HorizontalPodAutoscalerClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewHorizontalPodAutoscalerClusterLister(indexer cache.Indexer) *horizontalPodAutoscalerClusterLister { return &horizontalPodAutoscalerClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type horizontalPodAutoscalerLister struct { // List lists all HorizontalPodAutoscalers in the indexer for a workspace. func (s *horizontalPodAutoscalerLister) List(selector labels.Selector) (ret []*autoscalingv2beta2.HorizontalPodAutoscaler, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*autoscalingv2beta2.HorizontalPodAutoscaler) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*autoscalingv2beta2.HorizontalPodAutoscaler)) + }) return ret, err } @@ -104,28 +98,9 @@ type horizontalPodAutoscalerNamespaceLister struct { // List lists all HorizontalPodAutoscalers in the indexer for a given workspace and namespace. func (s *horizontalPodAutoscalerNamespaceLister) List(selector labels.Selector) (ret []*autoscalingv2beta2.HorizontalPodAutoscaler, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*autoscalingv2beta2.HorizontalPodAutoscaler) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*autoscalingv2beta2.HorizontalPodAutoscaler)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2beta2/horizontalpodautoscaler_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2beta2/horizontalpodautoscaler_expansion.go new file mode 100644 index 0000000000000..9d264c8ef5c5c --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/autoscaling/v2beta2/horizontalpodautoscaler_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v2beta2 + +// HorizontalPodAutoscalerClusterListerExpansion allows custom methods to be added to HorizontalPodAutoscalerClusterLister. +type HorizontalPodAutoscalerClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/batch/v1/cronjob.go b/vendor/github.com/kcp-dev/client-go/listers/batch/v1/cronjob.go index 1a5aa9eda868a..fd48760f96060 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/batch/v1/cronjob.go +++ b/vendor/github.com/kcp-dev/client-go/listers/batch/v1/cronjob.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" batchv1 "k8s.io/api/batch/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" batchv1listers "k8s.io/client-go/listers/batch/v1" "k8s.io/client-go/tools/cache" ) // CronJobClusterLister can list CronJobs across all workspaces, or scope down to a CronJobLister for one workspace. +// All objects returned here must be treated as read-only. type CronJobClusterLister interface { + // List lists all CronJobs in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*batchv1.CronJob, err error) + // Cluster returns a lister that can list and get CronJobs in one workspace. Cluster(cluster logicalcluster.Name) batchv1listers.CronJobLister + CronJobClusterListerExpansion } type cronJobClusterLister struct { @@ -44,6 +48,11 @@ type cronJobClusterLister struct { } // NewCronJobClusterLister returns a new CronJobClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewCronJobClusterLister(indexer cache.Indexer) *cronJobClusterLister { return &cronJobClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type cronJobLister struct { // List lists all CronJobs in the indexer for a workspace. func (s *cronJobLister) List(selector labels.Selector) (ret []*batchv1.CronJob, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*batchv1.CronJob) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*batchv1.CronJob)) + }) return ret, err } @@ -104,28 +98,9 @@ type cronJobNamespaceLister struct { // List lists all CronJobs in the indexer for a given workspace and namespace. func (s *cronJobNamespaceLister) List(selector labels.Selector) (ret []*batchv1.CronJob, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*batchv1.CronJob) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*batchv1.CronJob)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/batch/v1/cronjob_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/batch/v1/cronjob_expansion.go new file mode 100644 index 0000000000000..b398acdaea4a7 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/batch/v1/cronjob_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// CronJobClusterListerExpansion allows custom methods to be added to CronJobClusterLister. +type CronJobClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/batch/v1/job.go b/vendor/github.com/kcp-dev/client-go/listers/batch/v1/job.go index 6cd197a82ce47..cedb1b480a55a 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/batch/v1/job.go +++ b/vendor/github.com/kcp-dev/client-go/listers/batch/v1/job.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" batchv1 "k8s.io/api/batch/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" batchv1listers "k8s.io/client-go/listers/batch/v1" "k8s.io/client-go/tools/cache" ) // JobClusterLister can list Jobs across all workspaces, or scope down to a JobLister for one workspace. +// All objects returned here must be treated as read-only. type JobClusterLister interface { + // List lists all Jobs in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*batchv1.Job, err error) + // Cluster returns a lister that can list and get Jobs in one workspace. Cluster(cluster logicalcluster.Name) batchv1listers.JobLister + JobClusterListerExpansion } type jobClusterLister struct { @@ -44,6 +48,11 @@ type jobClusterLister struct { } // NewJobClusterLister returns a new JobClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewJobClusterLister(indexer cache.Indexer) *jobClusterLister { return &jobClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type jobLister struct { // List lists all Jobs in the indexer for a workspace. func (s *jobLister) List(selector labels.Selector) (ret []*batchv1.Job, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*batchv1.Job) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*batchv1.Job)) + }) return ret, err } @@ -104,28 +98,9 @@ type jobNamespaceLister struct { // List lists all Jobs in the indexer for a given workspace and namespace. func (s *jobNamespaceLister) List(selector labels.Selector) (ret []*batchv1.Job, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*batchv1.Job) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*batchv1.Job)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/batch/v1/job_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/batch/v1/job_expansion.go index 8dc5db7885ec6..5258f43539559 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/batch/v1/job_expansion.go +++ b/vendor/github.com/kcp-dev/client-go/listers/batch/v1/job_expansion.go @@ -25,6 +25,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ) +// JobClusterListerExpansion allows custom methods to be added to +// JobClusterLister. +type JobClusterListerExpansion interface{} + // JobListerExpansion allows custom methods to be added to // JobLister. type JobListerExpansion interface { diff --git a/vendor/github.com/kcp-dev/client-go/listers/batch/v1beta1/cronjob.go b/vendor/github.com/kcp-dev/client-go/listers/batch/v1beta1/cronjob.go index dc74d32b99fe7..7a645b2d7b1ca 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/batch/v1beta1/cronjob.go +++ b/vendor/github.com/kcp-dev/client-go/listers/batch/v1beta1/cronjob.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" batchv1beta1 "k8s.io/api/batch/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" batchv1beta1listers "k8s.io/client-go/listers/batch/v1beta1" "k8s.io/client-go/tools/cache" ) // CronJobClusterLister can list CronJobs across all workspaces, or scope down to a CronJobLister for one workspace. +// All objects returned here must be treated as read-only. type CronJobClusterLister interface { + // List lists all CronJobs in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*batchv1beta1.CronJob, err error) + // Cluster returns a lister that can list and get CronJobs in one workspace. Cluster(cluster logicalcluster.Name) batchv1beta1listers.CronJobLister + CronJobClusterListerExpansion } type cronJobClusterLister struct { @@ -44,6 +48,11 @@ type cronJobClusterLister struct { } // NewCronJobClusterLister returns a new CronJobClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewCronJobClusterLister(indexer cache.Indexer) *cronJobClusterLister { return &cronJobClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type cronJobLister struct { // List lists all CronJobs in the indexer for a workspace. func (s *cronJobLister) List(selector labels.Selector) (ret []*batchv1beta1.CronJob, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*batchv1beta1.CronJob) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*batchv1beta1.CronJob)) + }) return ret, err } @@ -104,28 +98,9 @@ type cronJobNamespaceLister struct { // List lists all CronJobs in the indexer for a given workspace and namespace. func (s *cronJobNamespaceLister) List(selector labels.Selector) (ret []*batchv1beta1.CronJob, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*batchv1beta1.CronJob) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*batchv1beta1.CronJob)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/batch/v1beta1/cronjob_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/batch/v1beta1/cronjob_expansion.go new file mode 100644 index 0000000000000..a9de967e34b47 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/batch/v1beta1/cronjob_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// CronJobClusterListerExpansion allows custom methods to be added to CronJobClusterLister. +type CronJobClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/certificates/v1/certificatesigningrequest.go b/vendor/github.com/kcp-dev/client-go/listers/certificates/v1/certificatesigningrequest.go index 693b6e4e0f517..ffac5009e60a8 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/certificates/v1/certificatesigningrequest.go +++ b/vendor/github.com/kcp-dev/client-go/listers/certificates/v1/certificatesigningrequest.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" certificatesv1 "k8s.io/api/certificates/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // CertificateSigningRequestClusterLister can list CertificateSigningRequests across all workspaces, or scope down to a CertificateSigningRequestLister for one workspace. +// All objects returned here must be treated as read-only. type CertificateSigningRequestClusterLister interface { + // List lists all CertificateSigningRequests in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*certificatesv1.CertificateSigningRequest, err error) + // Cluster returns a lister that can list and get CertificateSigningRequests in one workspace. Cluster(cluster logicalcluster.Name) certificatesv1listers.CertificateSigningRequestLister + CertificateSigningRequestClusterListerExpansion } type certificateSigningRequestClusterLister struct { @@ -43,6 +48,10 @@ type certificateSigningRequestClusterLister struct { } // NewCertificateSigningRequestClusterLister returns a new CertificateSigningRequestClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewCertificateSigningRequestClusterLister(indexer cache.Indexer) *certificateSigningRequestClusterLister { return &certificateSigningRequestClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type certificateSigningRequestLister struct { // List lists all CertificateSigningRequests in the indexer for a workspace. func (s *certificateSigningRequestLister) List(selector labels.Selector) (ret []*certificatesv1.CertificateSigningRequest, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*certificatesv1.CertificateSigningRequest) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*certificatesv1.CertificateSigningRequest)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/certificates/v1/certificatesigningrequest_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/certificates/v1/certificatesigningrequest_expansion.go new file mode 100644 index 0000000000000..35c07886d36c2 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/certificates/v1/certificatesigningrequest_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// CertificateSigningRequestClusterListerExpansion allows custom methods to be added to CertificateSigningRequestClusterLister. +type CertificateSigningRequestClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/certificates/v1beta1/certificatesigningrequest.go b/vendor/github.com/kcp-dev/client-go/listers/certificates/v1beta1/certificatesigningrequest.go index b971b16231c76..6cbf77a037f05 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/certificates/v1beta1/certificatesigningrequest.go +++ b/vendor/github.com/kcp-dev/client-go/listers/certificates/v1beta1/certificatesigningrequest.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" certificatesv1beta1 "k8s.io/api/certificates/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // CertificateSigningRequestClusterLister can list CertificateSigningRequests across all workspaces, or scope down to a CertificateSigningRequestLister for one workspace. +// All objects returned here must be treated as read-only. type CertificateSigningRequestClusterLister interface { + // List lists all CertificateSigningRequests in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*certificatesv1beta1.CertificateSigningRequest, err error) + // Cluster returns a lister that can list and get CertificateSigningRequests in one workspace. Cluster(cluster logicalcluster.Name) certificatesv1beta1listers.CertificateSigningRequestLister + CertificateSigningRequestClusterListerExpansion } type certificateSigningRequestClusterLister struct { @@ -43,6 +48,10 @@ type certificateSigningRequestClusterLister struct { } // NewCertificateSigningRequestClusterLister returns a new CertificateSigningRequestClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewCertificateSigningRequestClusterLister(indexer cache.Indexer) *certificateSigningRequestClusterLister { return &certificateSigningRequestClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type certificateSigningRequestLister struct { // List lists all CertificateSigningRequests in the indexer for a workspace. func (s *certificateSigningRequestLister) List(selector labels.Selector) (ret []*certificatesv1beta1.CertificateSigningRequest, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*certificatesv1beta1.CertificateSigningRequest) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*certificatesv1beta1.CertificateSigningRequest)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/certificates/v1beta1/certificatesigningrequest_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/certificates/v1beta1/certificatesigningrequest_expansion.go new file mode 100644 index 0000000000000..91dc37427e0ae --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/certificates/v1beta1/certificatesigningrequest_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// CertificateSigningRequestClusterListerExpansion allows custom methods to be added to CertificateSigningRequestClusterLister. +type CertificateSigningRequestClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/coordination/v1/lease.go b/vendor/github.com/kcp-dev/client-go/listers/coordination/v1/lease.go index 5b3aa76304145..c3f3b0d17ccf8 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/coordination/v1/lease.go +++ b/vendor/github.com/kcp-dev/client-go/listers/coordination/v1/lease.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" coordinationv1 "k8s.io/api/coordination/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" coordinationv1listers "k8s.io/client-go/listers/coordination/v1" "k8s.io/client-go/tools/cache" ) // LeaseClusterLister can list Leases across all workspaces, or scope down to a LeaseLister for one workspace. +// All objects returned here must be treated as read-only. type LeaseClusterLister interface { + // List lists all Leases in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*coordinationv1.Lease, err error) + // Cluster returns a lister that can list and get Leases in one workspace. Cluster(cluster logicalcluster.Name) coordinationv1listers.LeaseLister + LeaseClusterListerExpansion } type leaseClusterLister struct { @@ -44,6 +48,11 @@ type leaseClusterLister struct { } // NewLeaseClusterLister returns a new LeaseClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewLeaseClusterLister(indexer cache.Indexer) *leaseClusterLister { return &leaseClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type leaseLister struct { // List lists all Leases in the indexer for a workspace. func (s *leaseLister) List(selector labels.Selector) (ret []*coordinationv1.Lease, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*coordinationv1.Lease) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*coordinationv1.Lease)) + }) return ret, err } @@ -104,28 +98,9 @@ type leaseNamespaceLister struct { // List lists all Leases in the indexer for a given workspace and namespace. func (s *leaseNamespaceLister) List(selector labels.Selector) (ret []*coordinationv1.Lease, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*coordinationv1.Lease) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*coordinationv1.Lease)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/coordination/v1/lease_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/coordination/v1/lease_expansion.go new file mode 100644 index 0000000000000..614b152fbe5c4 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/coordination/v1/lease_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// LeaseClusterListerExpansion allows custom methods to be added to LeaseClusterLister. +type LeaseClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/coordination/v1beta1/lease.go b/vendor/github.com/kcp-dev/client-go/listers/coordination/v1beta1/lease.go index 65780ec24b4b5..8a516bccf6bc7 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/coordination/v1beta1/lease.go +++ b/vendor/github.com/kcp-dev/client-go/listers/coordination/v1beta1/lease.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" coordinationv1beta1 "k8s.io/api/coordination/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" coordinationv1beta1listers "k8s.io/client-go/listers/coordination/v1beta1" "k8s.io/client-go/tools/cache" ) // LeaseClusterLister can list Leases across all workspaces, or scope down to a LeaseLister for one workspace. +// All objects returned here must be treated as read-only. type LeaseClusterLister interface { + // List lists all Leases in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*coordinationv1beta1.Lease, err error) + // Cluster returns a lister that can list and get Leases in one workspace. Cluster(cluster logicalcluster.Name) coordinationv1beta1listers.LeaseLister + LeaseClusterListerExpansion } type leaseClusterLister struct { @@ -44,6 +48,11 @@ type leaseClusterLister struct { } // NewLeaseClusterLister returns a new LeaseClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewLeaseClusterLister(indexer cache.Indexer) *leaseClusterLister { return &leaseClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type leaseLister struct { // List lists all Leases in the indexer for a workspace. func (s *leaseLister) List(selector labels.Selector) (ret []*coordinationv1beta1.Lease, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*coordinationv1beta1.Lease) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*coordinationv1beta1.Lease)) + }) return ret, err } @@ -104,28 +98,9 @@ type leaseNamespaceLister struct { // List lists all Leases in the indexer for a given workspace and namespace. func (s *leaseNamespaceLister) List(selector labels.Selector) (ret []*coordinationv1beta1.Lease, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*coordinationv1beta1.Lease) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*coordinationv1beta1.Lease)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/coordination/v1beta1/lease_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/coordination/v1beta1/lease_expansion.go new file mode 100644 index 0000000000000..0f27bbd50a641 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/coordination/v1beta1/lease_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// LeaseClusterListerExpansion allows custom methods to be added to LeaseClusterLister. +type LeaseClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/componentstatus.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/componentstatus.go index a40988bc1b2c7..caa22a51fbcb6 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/componentstatus.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/componentstatus.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // ComponentStatusClusterLister can list ComponentStatuses across all workspaces, or scope down to a ComponentStatusLister for one workspace. +// All objects returned here must be treated as read-only. type ComponentStatusClusterLister interface { + // List lists all ComponentStatuses in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.ComponentStatus, err error) + // Cluster returns a lister that can list and get ComponentStatuses in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.ComponentStatusLister + ComponentStatusClusterListerExpansion } type componentStatusClusterLister struct { @@ -43,6 +48,10 @@ type componentStatusClusterLister struct { } // NewComponentStatusClusterLister returns a new ComponentStatusClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewComponentStatusClusterLister(indexer cache.Indexer) *componentStatusClusterLister { return &componentStatusClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type componentStatusLister struct { // List lists all ComponentStatuses in the indexer for a workspace. func (s *componentStatusLister) List(selector labels.Selector) (ret []*corev1.ComponentStatus, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.ComponentStatus) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.ComponentStatus)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/componentstatus_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/componentstatus_expansion.go new file mode 100644 index 0000000000000..68585eb2bd754 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/componentstatus_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// ComponentStatusClusterListerExpansion allows custom methods to be added to ComponentStatusClusterLister. +type ComponentStatusClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/configmap.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/configmap.go index 813a49fa5e593..17bcb57af0953 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/configmap.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/configmap.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) // ConfigMapClusterLister can list ConfigMaps across all workspaces, or scope down to a ConfigMapLister for one workspace. +// All objects returned here must be treated as read-only. type ConfigMapClusterLister interface { + // List lists all ConfigMaps in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.ConfigMap, err error) + // Cluster returns a lister that can list and get ConfigMaps in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.ConfigMapLister + ConfigMapClusterListerExpansion } type configMapClusterLister struct { @@ -44,6 +48,11 @@ type configMapClusterLister struct { } // NewConfigMapClusterLister returns a new ConfigMapClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewConfigMapClusterLister(indexer cache.Indexer) *configMapClusterLister { return &configMapClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type configMapLister struct { // List lists all ConfigMaps in the indexer for a workspace. func (s *configMapLister) List(selector labels.Selector) (ret []*corev1.ConfigMap, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.ConfigMap) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.ConfigMap)) + }) return ret, err } @@ -104,28 +98,9 @@ type configMapNamespaceLister struct { // List lists all ConfigMaps in the indexer for a given workspace and namespace. func (s *configMapNamespaceLister) List(selector labels.Selector) (ret []*corev1.ConfigMap, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.ConfigMap) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.ConfigMap)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/configmap_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/configmap_expansion.go new file mode 100644 index 0000000000000..42a2c1707578a --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/configmap_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// ConfigMapClusterListerExpansion allows custom methods to be added to ConfigMapClusterLister. +type ConfigMapClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/endpoints.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/endpoints.go index 1db8eb76f10b7..e89505b8790f6 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/endpoints.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/endpoints.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) // EndpointsClusterLister can list Endpoints across all workspaces, or scope down to a EndpointsLister for one workspace. +// All objects returned here must be treated as read-only. type EndpointsClusterLister interface { + // List lists all Endpoints in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.Endpoints, err error) + // Cluster returns a lister that can list and get Endpoints in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.EndpointsLister + EndpointsClusterListerExpansion } type endpointsClusterLister struct { @@ -44,6 +48,11 @@ type endpointsClusterLister struct { } // NewEndpointsClusterLister returns a new EndpointsClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewEndpointsClusterLister(indexer cache.Indexer) *endpointsClusterLister { return &endpointsClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type endpointsLister struct { // List lists all Endpoints in the indexer for a workspace. func (s *endpointsLister) List(selector labels.Selector) (ret []*corev1.Endpoints, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.Endpoints) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.Endpoints)) + }) return ret, err } @@ -104,28 +98,9 @@ type endpointsNamespaceLister struct { // List lists all Endpoints in the indexer for a given workspace and namespace. func (s *endpointsNamespaceLister) List(selector labels.Selector) (ret []*corev1.Endpoints, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.Endpoints) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.Endpoints)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/endpoints_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/endpoints_expansion.go new file mode 100644 index 0000000000000..8183e80650495 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/endpoints_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// EndpointsClusterListerExpansion allows custom methods to be added to EndpointsClusterLister. +type EndpointsClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/event.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/event.go index 6e9a0d73909d0..ed71acfa7b29d 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/event.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/event.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) // EventClusterLister can list Events across all workspaces, or scope down to a EventLister for one workspace. +// All objects returned here must be treated as read-only. type EventClusterLister interface { + // List lists all Events in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.Event, err error) + // Cluster returns a lister that can list and get Events in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.EventLister + EventClusterListerExpansion } type eventClusterLister struct { @@ -44,6 +48,11 @@ type eventClusterLister struct { } // NewEventClusterLister returns a new EventClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewEventClusterLister(indexer cache.Indexer) *eventClusterLister { return &eventClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type eventLister struct { // List lists all Events in the indexer for a workspace. func (s *eventLister) List(selector labels.Selector) (ret []*corev1.Event, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.Event) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.Event)) + }) return ret, err } @@ -104,28 +98,9 @@ type eventNamespaceLister struct { // List lists all Events in the indexer for a given workspace and namespace. func (s *eventNamespaceLister) List(selector labels.Selector) (ret []*corev1.Event, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.Event) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.Event)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/event_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/event_expansion.go new file mode 100644 index 0000000000000..bdb79e6ed15cb --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/event_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// EventClusterListerExpansion allows custom methods to be added to EventClusterLister. +type EventClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/limitrange.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/limitrange.go index 20851adb36cfb..2fe14a3c69435 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/limitrange.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/limitrange.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) // LimitRangeClusterLister can list LimitRanges across all workspaces, or scope down to a LimitRangeLister for one workspace. +// All objects returned here must be treated as read-only. type LimitRangeClusterLister interface { + // List lists all LimitRanges in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.LimitRange, err error) + // Cluster returns a lister that can list and get LimitRanges in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.LimitRangeLister + LimitRangeClusterListerExpansion } type limitRangeClusterLister struct { @@ -44,6 +48,11 @@ type limitRangeClusterLister struct { } // NewLimitRangeClusterLister returns a new LimitRangeClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewLimitRangeClusterLister(indexer cache.Indexer) *limitRangeClusterLister { return &limitRangeClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type limitRangeLister struct { // List lists all LimitRanges in the indexer for a workspace. func (s *limitRangeLister) List(selector labels.Selector) (ret []*corev1.LimitRange, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.LimitRange) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.LimitRange)) + }) return ret, err } @@ -104,28 +98,9 @@ type limitRangeNamespaceLister struct { // List lists all LimitRanges in the indexer for a given workspace and namespace. func (s *limitRangeNamespaceLister) List(selector labels.Selector) (ret []*corev1.LimitRange, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.LimitRange) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.LimitRange)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/limitrange_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/limitrange_expansion.go new file mode 100644 index 0000000000000..7c72c71774c73 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/limitrange_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// LimitRangeClusterListerExpansion allows custom methods to be added to LimitRangeClusterLister. +type LimitRangeClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/namespace.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/namespace.go index 72bfd8096e26e..5b6e6a4592fb2 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/namespace.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/namespace.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // NamespaceClusterLister can list Namespaces across all workspaces, or scope down to a NamespaceLister for one workspace. +// All objects returned here must be treated as read-only. type NamespaceClusterLister interface { + // List lists all Namespaces in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.Namespace, err error) + // Cluster returns a lister that can list and get Namespaces in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.NamespaceLister + NamespaceClusterListerExpansion } type namespaceClusterLister struct { @@ -43,6 +48,10 @@ type namespaceClusterLister struct { } // NewNamespaceClusterLister returns a new NamespaceClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewNamespaceClusterLister(indexer cache.Indexer) *namespaceClusterLister { return &namespaceClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type namespaceLister struct { // List lists all Namespaces in the indexer for a workspace. func (s *namespaceLister) List(selector labels.Selector) (ret []*corev1.Namespace, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.Namespace) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.Namespace)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/namespace_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/namespace_expansion.go new file mode 100644 index 0000000000000..ea8e99ced5e51 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/namespace_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// NamespaceClusterListerExpansion allows custom methods to be added to NamespaceClusterLister. +type NamespaceClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/node.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/node.go index d0f46044f26b6..a1acf1c45ad12 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/node.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/node.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // NodeClusterLister can list Nodes across all workspaces, or scope down to a NodeLister for one workspace. +// All objects returned here must be treated as read-only. type NodeClusterLister interface { + // List lists all Nodes in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.Node, err error) + // Cluster returns a lister that can list and get Nodes in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.NodeLister + NodeClusterListerExpansion } type nodeClusterLister struct { @@ -43,6 +48,10 @@ type nodeClusterLister struct { } // NewNodeClusterLister returns a new NodeClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewNodeClusterLister(indexer cache.Indexer) *nodeClusterLister { return &nodeClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type nodeLister struct { // List lists all Nodes in the indexer for a workspace. func (s *nodeLister) List(selector labels.Selector) (ret []*corev1.Node, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.Node) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.Node)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/node_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/node_expansion.go new file mode 100644 index 0000000000000..3a2f35bfdc01f --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/node_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// NodeClusterListerExpansion allows custom methods to be added to NodeClusterLister. +type NodeClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/persistentvolume.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/persistentvolume.go index 72318261e686b..2a2ff5f9b6f68 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/persistentvolume.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/persistentvolume.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // PersistentVolumeClusterLister can list PersistentVolumes across all workspaces, or scope down to a PersistentVolumeLister for one workspace. +// All objects returned here must be treated as read-only. type PersistentVolumeClusterLister interface { + // List lists all PersistentVolumes in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.PersistentVolume, err error) + // Cluster returns a lister that can list and get PersistentVolumes in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.PersistentVolumeLister + PersistentVolumeClusterListerExpansion } type persistentVolumeClusterLister struct { @@ -43,6 +48,10 @@ type persistentVolumeClusterLister struct { } // NewPersistentVolumeClusterLister returns a new PersistentVolumeClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewPersistentVolumeClusterLister(indexer cache.Indexer) *persistentVolumeClusterLister { return &persistentVolumeClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type persistentVolumeLister struct { // List lists all PersistentVolumes in the indexer for a workspace. func (s *persistentVolumeLister) List(selector labels.Selector) (ret []*corev1.PersistentVolume, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.PersistentVolume) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.PersistentVolume)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/persistentvolume_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/persistentvolume_expansion.go new file mode 100644 index 0000000000000..1cf27f75301ec --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/persistentvolume_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// PersistentVolumeClusterListerExpansion allows custom methods to be added to PersistentVolumeClusterLister. +type PersistentVolumeClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/persistentvolumeclaim.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/persistentvolumeclaim.go index d61731bd4c92e..65b751d98db70 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/persistentvolumeclaim.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/persistentvolumeclaim.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) // PersistentVolumeClaimClusterLister can list PersistentVolumeClaims across all workspaces, or scope down to a PersistentVolumeClaimLister for one workspace. +// All objects returned here must be treated as read-only. type PersistentVolumeClaimClusterLister interface { + // List lists all PersistentVolumeClaims in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.PersistentVolumeClaim, err error) + // Cluster returns a lister that can list and get PersistentVolumeClaims in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.PersistentVolumeClaimLister + PersistentVolumeClaimClusterListerExpansion } type persistentVolumeClaimClusterLister struct { @@ -44,6 +48,11 @@ type persistentVolumeClaimClusterLister struct { } // NewPersistentVolumeClaimClusterLister returns a new PersistentVolumeClaimClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewPersistentVolumeClaimClusterLister(indexer cache.Indexer) *persistentVolumeClaimClusterLister { return &persistentVolumeClaimClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type persistentVolumeClaimLister struct { // List lists all PersistentVolumeClaims in the indexer for a workspace. func (s *persistentVolumeClaimLister) List(selector labels.Selector) (ret []*corev1.PersistentVolumeClaim, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.PersistentVolumeClaim) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.PersistentVolumeClaim)) + }) return ret, err } @@ -104,28 +98,9 @@ type persistentVolumeClaimNamespaceLister struct { // List lists all PersistentVolumeClaims in the indexer for a given workspace and namespace. func (s *persistentVolumeClaimNamespaceLister) List(selector labels.Selector) (ret []*corev1.PersistentVolumeClaim, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.PersistentVolumeClaim) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.PersistentVolumeClaim)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/persistentvolumeclaim_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/persistentvolumeclaim_expansion.go new file mode 100644 index 0000000000000..94e33ca0b31a9 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/persistentvolumeclaim_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// PersistentVolumeClaimClusterListerExpansion allows custom methods to be added to PersistentVolumeClaimClusterLister. +type PersistentVolumeClaimClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/pod.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/pod.go index 98e859dd913ba..64915ec3b7c5e 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/pod.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/pod.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) // PodClusterLister can list Pods across all workspaces, or scope down to a PodLister for one workspace. +// All objects returned here must be treated as read-only. type PodClusterLister interface { + // List lists all Pods in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.Pod, err error) + // Cluster returns a lister that can list and get Pods in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.PodLister + PodClusterListerExpansion } type podClusterLister struct { @@ -44,6 +48,11 @@ type podClusterLister struct { } // NewPodClusterLister returns a new PodClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewPodClusterLister(indexer cache.Indexer) *podClusterLister { return &podClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type podLister struct { // List lists all Pods in the indexer for a workspace. func (s *podLister) List(selector labels.Selector) (ret []*corev1.Pod, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.Pod) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.Pod)) + }) return ret, err } @@ -104,28 +98,9 @@ type podNamespaceLister struct { // List lists all Pods in the indexer for a given workspace and namespace. func (s *podNamespaceLister) List(selector labels.Selector) (ret []*corev1.Pod, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.Pod) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.Pod)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/pod_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/pod_expansion.go new file mode 100644 index 0000000000000..e4bfca6a6b6bc --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/pod_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// PodClusterListerExpansion allows custom methods to be added to PodClusterLister. +type PodClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/podtemplate.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/podtemplate.go index 20f8cd90c9f1a..19842c00a3a68 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/podtemplate.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/podtemplate.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) // PodTemplateClusterLister can list PodTemplates across all workspaces, or scope down to a PodTemplateLister for one workspace. +// All objects returned here must be treated as read-only. type PodTemplateClusterLister interface { + // List lists all PodTemplates in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.PodTemplate, err error) + // Cluster returns a lister that can list and get PodTemplates in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.PodTemplateLister + PodTemplateClusterListerExpansion } type podTemplateClusterLister struct { @@ -44,6 +48,11 @@ type podTemplateClusterLister struct { } // NewPodTemplateClusterLister returns a new PodTemplateClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewPodTemplateClusterLister(indexer cache.Indexer) *podTemplateClusterLister { return &podTemplateClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type podTemplateLister struct { // List lists all PodTemplates in the indexer for a workspace. func (s *podTemplateLister) List(selector labels.Selector) (ret []*corev1.PodTemplate, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.PodTemplate) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.PodTemplate)) + }) return ret, err } @@ -104,28 +98,9 @@ type podTemplateNamespaceLister struct { // List lists all PodTemplates in the indexer for a given workspace and namespace. func (s *podTemplateNamespaceLister) List(selector labels.Selector) (ret []*corev1.PodTemplate, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.PodTemplate) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.PodTemplate)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/podtemplate_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/podtemplate_expansion.go new file mode 100644 index 0000000000000..778cf172330aa --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/podtemplate_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// PodTemplateClusterListerExpansion allows custom methods to be added to PodTemplateClusterLister. +type PodTemplateClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/replicationcontroller.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/replicationcontroller.go index c9bf8422fbf15..73c8c9669d5d3 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/replicationcontroller.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/replicationcontroller.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) // ReplicationControllerClusterLister can list ReplicationControllers across all workspaces, or scope down to a ReplicationControllerLister for one workspace. +// All objects returned here must be treated as read-only. type ReplicationControllerClusterLister interface { + // List lists all ReplicationControllers in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.ReplicationController, err error) + // Cluster returns a lister that can list and get ReplicationControllers in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.ReplicationControllerLister + ReplicationControllerClusterListerExpansion } type replicationControllerClusterLister struct { @@ -44,6 +48,11 @@ type replicationControllerClusterLister struct { } // NewReplicationControllerClusterLister returns a new ReplicationControllerClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewReplicationControllerClusterLister(indexer cache.Indexer) *replicationControllerClusterLister { return &replicationControllerClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type replicationControllerLister struct { // List lists all ReplicationControllers in the indexer for a workspace. func (s *replicationControllerLister) List(selector labels.Selector) (ret []*corev1.ReplicationController, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.ReplicationController) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.ReplicationController)) + }) return ret, err } @@ -104,28 +98,9 @@ type replicationControllerNamespaceLister struct { // List lists all ReplicationControllers in the indexer for a given workspace and namespace. func (s *replicationControllerNamespaceLister) List(selector labels.Selector) (ret []*corev1.ReplicationController, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.ReplicationController) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.ReplicationController)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/replicationcontroller_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/replicationcontroller_expansion.go index b031d52173a0b..31a116a09c3f3 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/replicationcontroller_expansion.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/replicationcontroller_expansion.go @@ -23,6 +23,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ) +// ReplicationControllerClusterListerExpansion allows custom methods to be added to +// ReplicationControllerClusterLister. +type ReplicationControllerClusterListerExpansion interface{} + // ReplicationControllerListerExpansion allows custom methods to be added to // ReplicationControllerLister. type ReplicationControllerListerExpansion interface { diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/resourcequota.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/resourcequota.go index acd07f992e9c4..8bd6ee5c56647 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/resourcequota.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/resourcequota.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) // ResourceQuotaClusterLister can list ResourceQuotas across all workspaces, or scope down to a ResourceQuotaLister for one workspace. +// All objects returned here must be treated as read-only. type ResourceQuotaClusterLister interface { + // List lists all ResourceQuotas in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.ResourceQuota, err error) + // Cluster returns a lister that can list and get ResourceQuotas in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.ResourceQuotaLister + ResourceQuotaClusterListerExpansion } type resourceQuotaClusterLister struct { @@ -44,6 +48,11 @@ type resourceQuotaClusterLister struct { } // NewResourceQuotaClusterLister returns a new ResourceQuotaClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewResourceQuotaClusterLister(indexer cache.Indexer) *resourceQuotaClusterLister { return &resourceQuotaClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type resourceQuotaLister struct { // List lists all ResourceQuotas in the indexer for a workspace. func (s *resourceQuotaLister) List(selector labels.Selector) (ret []*corev1.ResourceQuota, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.ResourceQuota) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.ResourceQuota)) + }) return ret, err } @@ -104,28 +98,9 @@ type resourceQuotaNamespaceLister struct { // List lists all ResourceQuotas in the indexer for a given workspace and namespace. func (s *resourceQuotaNamespaceLister) List(selector labels.Selector) (ret []*corev1.ResourceQuota, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.ResourceQuota) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.ResourceQuota)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/resourcequota_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/resourcequota_expansion.go new file mode 100644 index 0000000000000..a7d6eaed9078f --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/resourcequota_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// ResourceQuotaClusterListerExpansion allows custom methods to be added to ResourceQuotaClusterLister. +type ResourceQuotaClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/secret.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/secret.go index 516e70fcbdeae..f1c159ec6f75b 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/secret.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/secret.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) // SecretClusterLister can list Secrets across all workspaces, or scope down to a SecretLister for one workspace. +// All objects returned here must be treated as read-only. type SecretClusterLister interface { + // List lists all Secrets in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.Secret, err error) + // Cluster returns a lister that can list and get Secrets in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.SecretLister + SecretClusterListerExpansion } type secretClusterLister struct { @@ -44,6 +48,11 @@ type secretClusterLister struct { } // NewSecretClusterLister returns a new SecretClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewSecretClusterLister(indexer cache.Indexer) *secretClusterLister { return &secretClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type secretLister struct { // List lists all Secrets in the indexer for a workspace. func (s *secretLister) List(selector labels.Selector) (ret []*corev1.Secret, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.Secret) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.Secret)) + }) return ret, err } @@ -104,28 +98,9 @@ type secretNamespaceLister struct { // List lists all Secrets in the indexer for a given workspace and namespace. func (s *secretNamespaceLister) List(selector labels.Selector) (ret []*corev1.Secret, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.Secret) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.Secret)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/secret_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/secret_expansion.go new file mode 100644 index 0000000000000..717fd920cf468 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/secret_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// SecretClusterListerExpansion allows custom methods to be added to SecretClusterLister. +type SecretClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/service.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/service.go index 74986c621b3ae..e671d8f85479b 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/service.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/service.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) // ServiceClusterLister can list Services across all workspaces, or scope down to a ServiceLister for one workspace. +// All objects returned here must be treated as read-only. type ServiceClusterLister interface { + // List lists all Services in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.Service, err error) + // Cluster returns a lister that can list and get Services in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.ServiceLister + ServiceClusterListerExpansion } type serviceClusterLister struct { @@ -44,6 +48,11 @@ type serviceClusterLister struct { } // NewServiceClusterLister returns a new ServiceClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewServiceClusterLister(indexer cache.Indexer) *serviceClusterLister { return &serviceClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type serviceLister struct { // List lists all Services in the indexer for a workspace. func (s *serviceLister) List(selector labels.Selector) (ret []*corev1.Service, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.Service) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.Service)) + }) return ret, err } @@ -104,28 +98,9 @@ type serviceNamespaceLister struct { // List lists all Services in the indexer for a given workspace and namespace. func (s *serviceNamespaceLister) List(selector labels.Selector) (ret []*corev1.Service, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.Service) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.Service)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/service_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/service_expansion.go new file mode 100644 index 0000000000000..c9c2c3af33d2a --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/service_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// ServiceClusterListerExpansion allows custom methods to be added to ServiceClusterLister. +type ServiceClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/serviceaccount.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/serviceaccount.go index 5a01a0a97e9ef..1f81568993283 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/core/v1/serviceaccount.go +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/serviceaccount.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" corev1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" ) // ServiceAccountClusterLister can list ServiceAccounts across all workspaces, or scope down to a ServiceAccountLister for one workspace. +// All objects returned here must be treated as read-only. type ServiceAccountClusterLister interface { + // List lists all ServiceAccounts in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*corev1.ServiceAccount, err error) + // Cluster returns a lister that can list and get ServiceAccounts in one workspace. Cluster(cluster logicalcluster.Name) corev1listers.ServiceAccountLister + ServiceAccountClusterListerExpansion } type serviceAccountClusterLister struct { @@ -44,6 +48,11 @@ type serviceAccountClusterLister struct { } // NewServiceAccountClusterLister returns a new ServiceAccountClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewServiceAccountClusterLister(indexer cache.Indexer) *serviceAccountClusterLister { return &serviceAccountClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type serviceAccountLister struct { // List lists all ServiceAccounts in the indexer for a workspace. func (s *serviceAccountLister) List(selector labels.Selector) (ret []*corev1.ServiceAccount, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.ServiceAccount) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.ServiceAccount)) + }) return ret, err } @@ -104,28 +98,9 @@ type serviceAccountNamespaceLister struct { // List lists all ServiceAccounts in the indexer for a given workspace and namespace. func (s *serviceAccountNamespaceLister) List(selector labels.Selector) (ret []*corev1.ServiceAccount, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*corev1.ServiceAccount) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*corev1.ServiceAccount)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/core/v1/serviceaccount_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/core/v1/serviceaccount_expansion.go new file mode 100644 index 0000000000000..4d4047a51f2f4 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/core/v1/serviceaccount_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// ServiceAccountClusterListerExpansion allows custom methods to be added to ServiceAccountClusterLister. +type ServiceAccountClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/discovery/v1/endpointslice.go b/vendor/github.com/kcp-dev/client-go/listers/discovery/v1/endpointslice.go index 96701375054b5..0f03370269251 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/discovery/v1/endpointslice.go +++ b/vendor/github.com/kcp-dev/client-go/listers/discovery/v1/endpointslice.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" discoveryv1 "k8s.io/api/discovery/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" discoveryv1listers "k8s.io/client-go/listers/discovery/v1" "k8s.io/client-go/tools/cache" ) // EndpointSliceClusterLister can list EndpointSlices across all workspaces, or scope down to a EndpointSliceLister for one workspace. +// All objects returned here must be treated as read-only. type EndpointSliceClusterLister interface { + // List lists all EndpointSlices in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*discoveryv1.EndpointSlice, err error) + // Cluster returns a lister that can list and get EndpointSlices in one workspace. Cluster(cluster logicalcluster.Name) discoveryv1listers.EndpointSliceLister + EndpointSliceClusterListerExpansion } type endpointSliceClusterLister struct { @@ -44,6 +48,11 @@ type endpointSliceClusterLister struct { } // NewEndpointSliceClusterLister returns a new EndpointSliceClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewEndpointSliceClusterLister(indexer cache.Indexer) *endpointSliceClusterLister { return &endpointSliceClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type endpointSliceLister struct { // List lists all EndpointSlices in the indexer for a workspace. func (s *endpointSliceLister) List(selector labels.Selector) (ret []*discoveryv1.EndpointSlice, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*discoveryv1.EndpointSlice) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*discoveryv1.EndpointSlice)) + }) return ret, err } @@ -104,28 +98,9 @@ type endpointSliceNamespaceLister struct { // List lists all EndpointSlices in the indexer for a given workspace and namespace. func (s *endpointSliceNamespaceLister) List(selector labels.Selector) (ret []*discoveryv1.EndpointSlice, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*discoveryv1.EndpointSlice) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*discoveryv1.EndpointSlice)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/discovery/v1/endpointslice_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/discovery/v1/endpointslice_expansion.go new file mode 100644 index 0000000000000..35e480934d9a2 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/discovery/v1/endpointslice_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// EndpointSliceClusterListerExpansion allows custom methods to be added to EndpointSliceClusterLister. +type EndpointSliceClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/discovery/v1beta1/endpointslice.go b/vendor/github.com/kcp-dev/client-go/listers/discovery/v1beta1/endpointslice.go index 46bffaeb924e9..83212cc9cef90 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/discovery/v1beta1/endpointslice.go +++ b/vendor/github.com/kcp-dev/client-go/listers/discovery/v1beta1/endpointslice.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" discoveryv1beta1 "k8s.io/api/discovery/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" discoveryv1beta1listers "k8s.io/client-go/listers/discovery/v1beta1" "k8s.io/client-go/tools/cache" ) // EndpointSliceClusterLister can list EndpointSlices across all workspaces, or scope down to a EndpointSliceLister for one workspace. +// All objects returned here must be treated as read-only. type EndpointSliceClusterLister interface { + // List lists all EndpointSlices in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*discoveryv1beta1.EndpointSlice, err error) + // Cluster returns a lister that can list and get EndpointSlices in one workspace. Cluster(cluster logicalcluster.Name) discoveryv1beta1listers.EndpointSliceLister + EndpointSliceClusterListerExpansion } type endpointSliceClusterLister struct { @@ -44,6 +48,11 @@ type endpointSliceClusterLister struct { } // NewEndpointSliceClusterLister returns a new EndpointSliceClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewEndpointSliceClusterLister(indexer cache.Indexer) *endpointSliceClusterLister { return &endpointSliceClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type endpointSliceLister struct { // List lists all EndpointSlices in the indexer for a workspace. func (s *endpointSliceLister) List(selector labels.Selector) (ret []*discoveryv1beta1.EndpointSlice, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*discoveryv1beta1.EndpointSlice) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*discoveryv1beta1.EndpointSlice)) + }) return ret, err } @@ -104,28 +98,9 @@ type endpointSliceNamespaceLister struct { // List lists all EndpointSlices in the indexer for a given workspace and namespace. func (s *endpointSliceNamespaceLister) List(selector labels.Selector) (ret []*discoveryv1beta1.EndpointSlice, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*discoveryv1beta1.EndpointSlice) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*discoveryv1beta1.EndpointSlice)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/discovery/v1beta1/endpointslice_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/discovery/v1beta1/endpointslice_expansion.go new file mode 100644 index 0000000000000..8e5c10af348dd --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/discovery/v1beta1/endpointslice_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// EndpointSliceClusterListerExpansion allows custom methods to be added to EndpointSliceClusterLister. +type EndpointSliceClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/events/v1/event.go b/vendor/github.com/kcp-dev/client-go/listers/events/v1/event.go index 57cddfbd75a56..82c4259924e23 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/events/v1/event.go +++ b/vendor/github.com/kcp-dev/client-go/listers/events/v1/event.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" eventsv1 "k8s.io/api/events/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" eventsv1listers "k8s.io/client-go/listers/events/v1" "k8s.io/client-go/tools/cache" ) // EventClusterLister can list Events across all workspaces, or scope down to a EventLister for one workspace. +// All objects returned here must be treated as read-only. type EventClusterLister interface { + // List lists all Events in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*eventsv1.Event, err error) + // Cluster returns a lister that can list and get Events in one workspace. Cluster(cluster logicalcluster.Name) eventsv1listers.EventLister + EventClusterListerExpansion } type eventClusterLister struct { @@ -44,6 +48,11 @@ type eventClusterLister struct { } // NewEventClusterLister returns a new EventClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewEventClusterLister(indexer cache.Indexer) *eventClusterLister { return &eventClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type eventLister struct { // List lists all Events in the indexer for a workspace. func (s *eventLister) List(selector labels.Selector) (ret []*eventsv1.Event, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*eventsv1.Event) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*eventsv1.Event)) + }) return ret, err } @@ -104,28 +98,9 @@ type eventNamespaceLister struct { // List lists all Events in the indexer for a given workspace and namespace. func (s *eventNamespaceLister) List(selector labels.Selector) (ret []*eventsv1.Event, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*eventsv1.Event) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*eventsv1.Event)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/events/v1/event_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/events/v1/event_expansion.go new file mode 100644 index 0000000000000..bdb79e6ed15cb --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/events/v1/event_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// EventClusterListerExpansion allows custom methods to be added to EventClusterLister. +type EventClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/events/v1beta1/event.go b/vendor/github.com/kcp-dev/client-go/listers/events/v1beta1/event.go index 8250f0f122dad..8ef1d03d0eeba 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/events/v1beta1/event.go +++ b/vendor/github.com/kcp-dev/client-go/listers/events/v1beta1/event.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" eventsv1beta1 "k8s.io/api/events/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" eventsv1beta1listers "k8s.io/client-go/listers/events/v1beta1" "k8s.io/client-go/tools/cache" ) // EventClusterLister can list Events across all workspaces, or scope down to a EventLister for one workspace. +// All objects returned here must be treated as read-only. type EventClusterLister interface { + // List lists all Events in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*eventsv1beta1.Event, err error) + // Cluster returns a lister that can list and get Events in one workspace. Cluster(cluster logicalcluster.Name) eventsv1beta1listers.EventLister + EventClusterListerExpansion } type eventClusterLister struct { @@ -44,6 +48,11 @@ type eventClusterLister struct { } // NewEventClusterLister returns a new EventClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewEventClusterLister(indexer cache.Indexer) *eventClusterLister { return &eventClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type eventLister struct { // List lists all Events in the indexer for a workspace. func (s *eventLister) List(selector labels.Selector) (ret []*eventsv1beta1.Event, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*eventsv1beta1.Event) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*eventsv1beta1.Event)) + }) return ret, err } @@ -104,28 +98,9 @@ type eventNamespaceLister struct { // List lists all Events in the indexer for a given workspace and namespace. func (s *eventNamespaceLister) List(selector labels.Selector) (ret []*eventsv1beta1.Event, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*eventsv1beta1.Event) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*eventsv1beta1.Event)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/events/v1beta1/event_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/events/v1beta1/event_expansion.go new file mode 100644 index 0000000000000..c9901ed258150 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/events/v1beta1/event_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// EventClusterListerExpansion allows custom methods to be added to EventClusterLister. +type EventClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/daemonset.go b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/daemonset.go index 4ee881911b847..0d143a02f108d 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/daemonset.go +++ b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/daemonset.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" extensionsv1beta1listers "k8s.io/client-go/listers/extensions/v1beta1" "k8s.io/client-go/tools/cache" ) // DaemonSetClusterLister can list DaemonSets across all workspaces, or scope down to a DaemonSetLister for one workspace. +// All objects returned here must be treated as read-only. type DaemonSetClusterLister interface { + // List lists all DaemonSets in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*extensionsv1beta1.DaemonSet, err error) + // Cluster returns a lister that can list and get DaemonSets in one workspace. Cluster(cluster logicalcluster.Name) extensionsv1beta1listers.DaemonSetLister + DaemonSetClusterListerExpansion } type daemonSetClusterLister struct { @@ -44,6 +48,11 @@ type daemonSetClusterLister struct { } // NewDaemonSetClusterLister returns a new DaemonSetClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewDaemonSetClusterLister(indexer cache.Indexer) *daemonSetClusterLister { return &daemonSetClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type daemonSetLister struct { // List lists all DaemonSets in the indexer for a workspace. func (s *daemonSetLister) List(selector labels.Selector) (ret []*extensionsv1beta1.DaemonSet, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*extensionsv1beta1.DaemonSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*extensionsv1beta1.DaemonSet)) + }) return ret, err } @@ -104,28 +98,9 @@ type daemonSetNamespaceLister struct { // List lists all DaemonSets in the indexer for a given workspace and namespace. func (s *daemonSetNamespaceLister) List(selector labels.Selector) (ret []*extensionsv1beta1.DaemonSet, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*extensionsv1beta1.DaemonSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*extensionsv1beta1.DaemonSet)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/daemonset_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/daemonset_expansion.go index f6dd7a963e865..3b2a9e39f0ddd 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/daemonset_expansion.go +++ b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/daemonset_expansion.go @@ -26,6 +26,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ) +// DaemonSetClusterListerExpansion allows custom methods to be added to +// DaemonSetClusterLister. +type DaemonSetClusterListerExpansion interface{} + // DaemonSetListerExpansion allows custom methods to be added to // DaemonSetLister. type DaemonSetListerExpansion interface { diff --git a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/deployment.go b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/deployment.go index 14e73b9757e6d..8537ab7cdb432 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/deployment.go +++ b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/deployment.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" extensionsv1beta1listers "k8s.io/client-go/listers/extensions/v1beta1" "k8s.io/client-go/tools/cache" ) // DeploymentClusterLister can list Deployments across all workspaces, or scope down to a DeploymentLister for one workspace. +// All objects returned here must be treated as read-only. type DeploymentClusterLister interface { + // List lists all Deployments in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*extensionsv1beta1.Deployment, err error) + // Cluster returns a lister that can list and get Deployments in one workspace. Cluster(cluster logicalcluster.Name) extensionsv1beta1listers.DeploymentLister + DeploymentClusterListerExpansion } type deploymentClusterLister struct { @@ -44,6 +48,11 @@ type deploymentClusterLister struct { } // NewDeploymentClusterLister returns a new DeploymentClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewDeploymentClusterLister(indexer cache.Indexer) *deploymentClusterLister { return &deploymentClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type deploymentLister struct { // List lists all Deployments in the indexer for a workspace. func (s *deploymentLister) List(selector labels.Selector) (ret []*extensionsv1beta1.Deployment, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*extensionsv1beta1.Deployment) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*extensionsv1beta1.Deployment)) + }) return ret, err } @@ -104,28 +98,9 @@ type deploymentNamespaceLister struct { // List lists all Deployments in the indexer for a given workspace and namespace. func (s *deploymentNamespaceLister) List(selector labels.Selector) (ret []*extensionsv1beta1.Deployment, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*extensionsv1beta1.Deployment) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*extensionsv1beta1.Deployment)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/deployment_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/deployment_expansion.go new file mode 100644 index 0000000000000..11a6cf51cea87 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/deployment_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// DeploymentClusterListerExpansion allows custom methods to be added to DeploymentClusterLister. +type DeploymentClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/ingress.go b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/ingress.go index 4561b7a11f6e8..5c62af022f643 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/ingress.go +++ b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/ingress.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" extensionsv1beta1listers "k8s.io/client-go/listers/extensions/v1beta1" "k8s.io/client-go/tools/cache" ) // IngressClusterLister can list Ingresses across all workspaces, or scope down to a IngressLister for one workspace. +// All objects returned here must be treated as read-only. type IngressClusterLister interface { + // List lists all Ingresses in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*extensionsv1beta1.Ingress, err error) + // Cluster returns a lister that can list and get Ingresses in one workspace. Cluster(cluster logicalcluster.Name) extensionsv1beta1listers.IngressLister + IngressClusterListerExpansion } type ingressClusterLister struct { @@ -44,6 +48,11 @@ type ingressClusterLister struct { } // NewIngressClusterLister returns a new IngressClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewIngressClusterLister(indexer cache.Indexer) *ingressClusterLister { return &ingressClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type ingressLister struct { // List lists all Ingresses in the indexer for a workspace. func (s *ingressLister) List(selector labels.Selector) (ret []*extensionsv1beta1.Ingress, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*extensionsv1beta1.Ingress) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*extensionsv1beta1.Ingress)) + }) return ret, err } @@ -104,28 +98,9 @@ type ingressNamespaceLister struct { // List lists all Ingresses in the indexer for a given workspace and namespace. func (s *ingressNamespaceLister) List(selector labels.Selector) (ret []*extensionsv1beta1.Ingress, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*extensionsv1beta1.Ingress) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*extensionsv1beta1.Ingress)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/ingress_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/ingress_expansion.go new file mode 100644 index 0000000000000..4f130cdf8e445 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/ingress_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// IngressClusterListerExpansion allows custom methods to be added to IngressClusterLister. +type IngressClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/networkpolicy.go b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/networkpolicy.go index 88a1233e37935..0d9b63a4ae006 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/networkpolicy.go +++ b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/networkpolicy.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" extensionsv1beta1listers "k8s.io/client-go/listers/extensions/v1beta1" "k8s.io/client-go/tools/cache" ) // NetworkPolicyClusterLister can list NetworkPolicies across all workspaces, or scope down to a NetworkPolicyLister for one workspace. +// All objects returned here must be treated as read-only. type NetworkPolicyClusterLister interface { + // List lists all NetworkPolicies in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*extensionsv1beta1.NetworkPolicy, err error) + // Cluster returns a lister that can list and get NetworkPolicies in one workspace. Cluster(cluster logicalcluster.Name) extensionsv1beta1listers.NetworkPolicyLister + NetworkPolicyClusterListerExpansion } type networkPolicyClusterLister struct { @@ -44,6 +48,11 @@ type networkPolicyClusterLister struct { } // NewNetworkPolicyClusterLister returns a new NetworkPolicyClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewNetworkPolicyClusterLister(indexer cache.Indexer) *networkPolicyClusterLister { return &networkPolicyClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type networkPolicyLister struct { // List lists all NetworkPolicies in the indexer for a workspace. func (s *networkPolicyLister) List(selector labels.Selector) (ret []*extensionsv1beta1.NetworkPolicy, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*extensionsv1beta1.NetworkPolicy) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*extensionsv1beta1.NetworkPolicy)) + }) return ret, err } @@ -104,28 +98,9 @@ type networkPolicyNamespaceLister struct { // List lists all NetworkPolicies in the indexer for a given workspace and namespace. func (s *networkPolicyNamespaceLister) List(selector labels.Selector) (ret []*extensionsv1beta1.NetworkPolicy, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*extensionsv1beta1.NetworkPolicy) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*extensionsv1beta1.NetworkPolicy)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/networkpolicy_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/networkpolicy_expansion.go new file mode 100644 index 0000000000000..e9d5f4ec1abd4 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/networkpolicy_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// NetworkPolicyClusterListerExpansion allows custom methods to be added to NetworkPolicyClusterLister. +type NetworkPolicyClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/podsecuritypolicy.go b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/podsecuritypolicy.go index b471f3c08b13d..bf6a4c43d952f 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/podsecuritypolicy.go +++ b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/podsecuritypolicy.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // PodSecurityPolicyClusterLister can list PodSecurityPolicies across all workspaces, or scope down to a PodSecurityPolicyLister for one workspace. +// All objects returned here must be treated as read-only. type PodSecurityPolicyClusterLister interface { + // List lists all PodSecurityPolicies in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*extensionsv1beta1.PodSecurityPolicy, err error) + // Cluster returns a lister that can list and get PodSecurityPolicies in one workspace. Cluster(cluster logicalcluster.Name) extensionsv1beta1listers.PodSecurityPolicyLister + PodSecurityPolicyClusterListerExpansion } type podSecurityPolicyClusterLister struct { @@ -43,6 +48,10 @@ type podSecurityPolicyClusterLister struct { } // NewPodSecurityPolicyClusterLister returns a new PodSecurityPolicyClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewPodSecurityPolicyClusterLister(indexer cache.Indexer) *podSecurityPolicyClusterLister { return &podSecurityPolicyClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type podSecurityPolicyLister struct { // List lists all PodSecurityPolicies in the indexer for a workspace. func (s *podSecurityPolicyLister) List(selector labels.Selector) (ret []*extensionsv1beta1.PodSecurityPolicy, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*extensionsv1beta1.PodSecurityPolicy) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*extensionsv1beta1.PodSecurityPolicy)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/podsecuritypolicy_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/podsecuritypolicy_expansion.go new file mode 100644 index 0000000000000..775adac818f85 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/podsecuritypolicy_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// PodSecurityPolicyClusterListerExpansion allows custom methods to be added to PodSecurityPolicyClusterLister. +type PodSecurityPolicyClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/replicaset.go b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/replicaset.go index a7a85fd97fd6c..cec63a1541aa5 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/replicaset.go +++ b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/replicaset.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" extensionsv1beta1listers "k8s.io/client-go/listers/extensions/v1beta1" "k8s.io/client-go/tools/cache" ) // ReplicaSetClusterLister can list ReplicaSets across all workspaces, or scope down to a ReplicaSetLister for one workspace. +// All objects returned here must be treated as read-only. type ReplicaSetClusterLister interface { + // List lists all ReplicaSets in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*extensionsv1beta1.ReplicaSet, err error) + // Cluster returns a lister that can list and get ReplicaSets in one workspace. Cluster(cluster logicalcluster.Name) extensionsv1beta1listers.ReplicaSetLister + ReplicaSetClusterListerExpansion } type replicaSetClusterLister struct { @@ -44,6 +48,11 @@ type replicaSetClusterLister struct { } // NewReplicaSetClusterLister returns a new ReplicaSetClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewReplicaSetClusterLister(indexer cache.Indexer) *replicaSetClusterLister { return &replicaSetClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type replicaSetLister struct { // List lists all ReplicaSets in the indexer for a workspace. func (s *replicaSetLister) List(selector labels.Selector) (ret []*extensionsv1beta1.ReplicaSet, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*extensionsv1beta1.ReplicaSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*extensionsv1beta1.ReplicaSet)) + }) return ret, err } @@ -104,28 +98,9 @@ type replicaSetNamespaceLister struct { // List lists all ReplicaSets in the indexer for a given workspace and namespace. func (s *replicaSetNamespaceLister) List(selector labels.Selector) (ret []*extensionsv1beta1.ReplicaSet, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*extensionsv1beta1.ReplicaSet) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*extensionsv1beta1.ReplicaSet)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/replicaset_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/replicaset_expansion.go index 74114c2bd7d9b..53f5b3e1caf9a 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/replicaset_expansion.go +++ b/vendor/github.com/kcp-dev/client-go/listers/extensions/v1beta1/replicaset_expansion.go @@ -25,6 +25,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ) +// ReplicaSetClusterListerExpansion allows custom methods to be added to +// ReplicaSetClusterLister. +type ReplicaSetClusterListerExpansion interface{} + // ReplicaSetListerExpansion allows custom methods to be added to // ReplicaSetLister. type ReplicaSetListerExpansion interface { diff --git a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1alpha1/flowschema.go b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1alpha1/flowschema.go index e84d8416a31b7..87017f30458af 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1alpha1/flowschema.go +++ b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1alpha1/flowschema.go @@ -23,7 +23,7 @@ package v1alpha1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1alpha1 "k8s.io/api/flowcontrol/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // FlowSchemaClusterLister can list FlowSchemas across all workspaces, or scope down to a FlowSchemaLister for one workspace. +// All objects returned here must be treated as read-only. type FlowSchemaClusterLister interface { + // List lists all FlowSchemas in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*flowcontrolv1alpha1.FlowSchema, err error) + // Cluster returns a lister that can list and get FlowSchemas in one workspace. Cluster(cluster logicalcluster.Name) flowcontrolv1alpha1listers.FlowSchemaLister + FlowSchemaClusterListerExpansion } type flowSchemaClusterLister struct { @@ -43,6 +48,10 @@ type flowSchemaClusterLister struct { } // NewFlowSchemaClusterLister returns a new FlowSchemaClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewFlowSchemaClusterLister(indexer cache.Indexer) *flowSchemaClusterLister { return &flowSchemaClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type flowSchemaLister struct { // List lists all FlowSchemas in the indexer for a workspace. func (s *flowSchemaLister) List(selector labels.Selector) (ret []*flowcontrolv1alpha1.FlowSchema, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*flowcontrolv1alpha1.FlowSchema) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*flowcontrolv1alpha1.FlowSchema)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1alpha1/flowschema_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1alpha1/flowschema_expansion.go new file mode 100644 index 0000000000000..4da91d2261b68 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1alpha1/flowschema_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1alpha1 + +// FlowSchemaClusterListerExpansion allows custom methods to be added to FlowSchemaClusterLister. +type FlowSchemaClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1alpha1/prioritylevelconfiguration.go b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1alpha1/prioritylevelconfiguration.go index 430c445ef2a15..7910507263745 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1alpha1/prioritylevelconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1alpha1/prioritylevelconfiguration.go @@ -23,7 +23,7 @@ package v1alpha1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1alpha1 "k8s.io/api/flowcontrol/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // PriorityLevelConfigurationClusterLister can list PriorityLevelConfigurations across all workspaces, or scope down to a PriorityLevelConfigurationLister for one workspace. +// All objects returned here must be treated as read-only. type PriorityLevelConfigurationClusterLister interface { + // List lists all PriorityLevelConfigurations in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*flowcontrolv1alpha1.PriorityLevelConfiguration, err error) + // Cluster returns a lister that can list and get PriorityLevelConfigurations in one workspace. Cluster(cluster logicalcluster.Name) flowcontrolv1alpha1listers.PriorityLevelConfigurationLister + PriorityLevelConfigurationClusterListerExpansion } type priorityLevelConfigurationClusterLister struct { @@ -43,6 +48,10 @@ type priorityLevelConfigurationClusterLister struct { } // NewPriorityLevelConfigurationClusterLister returns a new PriorityLevelConfigurationClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewPriorityLevelConfigurationClusterLister(indexer cache.Indexer) *priorityLevelConfigurationClusterLister { return &priorityLevelConfigurationClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type priorityLevelConfigurationLister struct { // List lists all PriorityLevelConfigurations in the indexer for a workspace. func (s *priorityLevelConfigurationLister) List(selector labels.Selector) (ret []*flowcontrolv1alpha1.PriorityLevelConfiguration, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*flowcontrolv1alpha1.PriorityLevelConfiguration) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*flowcontrolv1alpha1.PriorityLevelConfiguration)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1alpha1/prioritylevelconfiguration_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1alpha1/prioritylevelconfiguration_expansion.go new file mode 100644 index 0000000000000..9179ae0d62bd0 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1alpha1/prioritylevelconfiguration_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1alpha1 + +// PriorityLevelConfigurationClusterListerExpansion allows custom methods to be added to PriorityLevelConfigurationClusterLister. +type PriorityLevelConfigurationClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta1/flowschema.go b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta1/flowschema.go index 7a440f4762524..5aae829d1349d 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta1/flowschema.go +++ b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta1/flowschema.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // FlowSchemaClusterLister can list FlowSchemas across all workspaces, or scope down to a FlowSchemaLister for one workspace. +// All objects returned here must be treated as read-only. type FlowSchemaClusterLister interface { + // List lists all FlowSchemas in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*flowcontrolv1beta1.FlowSchema, err error) + // Cluster returns a lister that can list and get FlowSchemas in one workspace. Cluster(cluster logicalcluster.Name) flowcontrolv1beta1listers.FlowSchemaLister + FlowSchemaClusterListerExpansion } type flowSchemaClusterLister struct { @@ -43,6 +48,10 @@ type flowSchemaClusterLister struct { } // NewFlowSchemaClusterLister returns a new FlowSchemaClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewFlowSchemaClusterLister(indexer cache.Indexer) *flowSchemaClusterLister { return &flowSchemaClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type flowSchemaLister struct { // List lists all FlowSchemas in the indexer for a workspace. func (s *flowSchemaLister) List(selector labels.Selector) (ret []*flowcontrolv1beta1.FlowSchema, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*flowcontrolv1beta1.FlowSchema) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*flowcontrolv1beta1.FlowSchema)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta1/flowschema_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta1/flowschema_expansion.go new file mode 100644 index 0000000000000..14fe7ca39755a --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta1/flowschema_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// FlowSchemaClusterListerExpansion allows custom methods to be added to FlowSchemaClusterLister. +type FlowSchemaClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta1/prioritylevelconfiguration.go b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta1/prioritylevelconfiguration.go index 45bd7297081a4..75565a9adf4cf 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta1/prioritylevelconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta1/prioritylevelconfiguration.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1beta1 "k8s.io/api/flowcontrol/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // PriorityLevelConfigurationClusterLister can list PriorityLevelConfigurations across all workspaces, or scope down to a PriorityLevelConfigurationLister for one workspace. +// All objects returned here must be treated as read-only. type PriorityLevelConfigurationClusterLister interface { + // List lists all PriorityLevelConfigurations in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*flowcontrolv1beta1.PriorityLevelConfiguration, err error) + // Cluster returns a lister that can list and get PriorityLevelConfigurations in one workspace. Cluster(cluster logicalcluster.Name) flowcontrolv1beta1listers.PriorityLevelConfigurationLister + PriorityLevelConfigurationClusterListerExpansion } type priorityLevelConfigurationClusterLister struct { @@ -43,6 +48,10 @@ type priorityLevelConfigurationClusterLister struct { } // NewPriorityLevelConfigurationClusterLister returns a new PriorityLevelConfigurationClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewPriorityLevelConfigurationClusterLister(indexer cache.Indexer) *priorityLevelConfigurationClusterLister { return &priorityLevelConfigurationClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type priorityLevelConfigurationLister struct { // List lists all PriorityLevelConfigurations in the indexer for a workspace. func (s *priorityLevelConfigurationLister) List(selector labels.Selector) (ret []*flowcontrolv1beta1.PriorityLevelConfiguration, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*flowcontrolv1beta1.PriorityLevelConfiguration) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*flowcontrolv1beta1.PriorityLevelConfiguration)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta1/prioritylevelconfiguration_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta1/prioritylevelconfiguration_expansion.go new file mode 100644 index 0000000000000..25ea6a230b7c4 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta1/prioritylevelconfiguration_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// PriorityLevelConfigurationClusterListerExpansion allows custom methods to be added to PriorityLevelConfigurationClusterLister. +type PriorityLevelConfigurationClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta2/flowschema.go b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta2/flowschema.go index 5e85b34bc27a8..51a6288fba427 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta2/flowschema.go +++ b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta2/flowschema.go @@ -23,7 +23,7 @@ package v1beta2 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // FlowSchemaClusterLister can list FlowSchemas across all workspaces, or scope down to a FlowSchemaLister for one workspace. +// All objects returned here must be treated as read-only. type FlowSchemaClusterLister interface { + // List lists all FlowSchemas in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*flowcontrolv1beta2.FlowSchema, err error) + // Cluster returns a lister that can list and get FlowSchemas in one workspace. Cluster(cluster logicalcluster.Name) flowcontrolv1beta2listers.FlowSchemaLister + FlowSchemaClusterListerExpansion } type flowSchemaClusterLister struct { @@ -43,6 +48,10 @@ type flowSchemaClusterLister struct { } // NewFlowSchemaClusterLister returns a new FlowSchemaClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewFlowSchemaClusterLister(indexer cache.Indexer) *flowSchemaClusterLister { return &flowSchemaClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type flowSchemaLister struct { // List lists all FlowSchemas in the indexer for a workspace. func (s *flowSchemaLister) List(selector labels.Selector) (ret []*flowcontrolv1beta2.FlowSchema, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*flowcontrolv1beta2.FlowSchema) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*flowcontrolv1beta2.FlowSchema)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta2/flowschema_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta2/flowschema_expansion.go new file mode 100644 index 0000000000000..002d1a0e1677b --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta2/flowschema_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta2 + +// FlowSchemaClusterListerExpansion allows custom methods to be added to FlowSchemaClusterLister. +type FlowSchemaClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta2/prioritylevelconfiguration.go b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta2/prioritylevelconfiguration.go index 22b9bb33be8e1..6432127b3f348 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta2/prioritylevelconfiguration.go +++ b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta2/prioritylevelconfiguration.go @@ -23,7 +23,7 @@ package v1beta2 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" flowcontrolv1beta2 "k8s.io/api/flowcontrol/v1beta2" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // PriorityLevelConfigurationClusterLister can list PriorityLevelConfigurations across all workspaces, or scope down to a PriorityLevelConfigurationLister for one workspace. +// All objects returned here must be treated as read-only. type PriorityLevelConfigurationClusterLister interface { + // List lists all PriorityLevelConfigurations in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*flowcontrolv1beta2.PriorityLevelConfiguration, err error) + // Cluster returns a lister that can list and get PriorityLevelConfigurations in one workspace. Cluster(cluster logicalcluster.Name) flowcontrolv1beta2listers.PriorityLevelConfigurationLister + PriorityLevelConfigurationClusterListerExpansion } type priorityLevelConfigurationClusterLister struct { @@ -43,6 +48,10 @@ type priorityLevelConfigurationClusterLister struct { } // NewPriorityLevelConfigurationClusterLister returns a new PriorityLevelConfigurationClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewPriorityLevelConfigurationClusterLister(indexer cache.Indexer) *priorityLevelConfigurationClusterLister { return &priorityLevelConfigurationClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type priorityLevelConfigurationLister struct { // List lists all PriorityLevelConfigurations in the indexer for a workspace. func (s *priorityLevelConfigurationLister) List(selector labels.Selector) (ret []*flowcontrolv1beta2.PriorityLevelConfiguration, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*flowcontrolv1beta2.PriorityLevelConfiguration) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*flowcontrolv1beta2.PriorityLevelConfiguration)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta2/prioritylevelconfiguration_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta2/prioritylevelconfiguration_expansion.go new file mode 100644 index 0000000000000..8fbfa4e135c55 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/flowcontrol/v1beta2/prioritylevelconfiguration_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta2 + +// PriorityLevelConfigurationClusterListerExpansion allows custom methods to be added to PriorityLevelConfigurationClusterLister. +type PriorityLevelConfigurationClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/networking/v1/ingress.go b/vendor/github.com/kcp-dev/client-go/listers/networking/v1/ingress.go index 4c3d9329965e5..3289104235152 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/networking/v1/ingress.go +++ b/vendor/github.com/kcp-dev/client-go/listers/networking/v1/ingress.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" networkingv1listers "k8s.io/client-go/listers/networking/v1" "k8s.io/client-go/tools/cache" ) // IngressClusterLister can list Ingresses across all workspaces, or scope down to a IngressLister for one workspace. +// All objects returned here must be treated as read-only. type IngressClusterLister interface { + // List lists all Ingresses in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*networkingv1.Ingress, err error) + // Cluster returns a lister that can list and get Ingresses in one workspace. Cluster(cluster logicalcluster.Name) networkingv1listers.IngressLister + IngressClusterListerExpansion } type ingressClusterLister struct { @@ -44,6 +48,11 @@ type ingressClusterLister struct { } // NewIngressClusterLister returns a new IngressClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewIngressClusterLister(indexer cache.Indexer) *ingressClusterLister { return &ingressClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type ingressLister struct { // List lists all Ingresses in the indexer for a workspace. func (s *ingressLister) List(selector labels.Selector) (ret []*networkingv1.Ingress, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*networkingv1.Ingress) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*networkingv1.Ingress)) + }) return ret, err } @@ -104,28 +98,9 @@ type ingressNamespaceLister struct { // List lists all Ingresses in the indexer for a given workspace and namespace. func (s *ingressNamespaceLister) List(selector labels.Selector) (ret []*networkingv1.Ingress, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*networkingv1.Ingress) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*networkingv1.Ingress)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/networking/v1/ingress_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/networking/v1/ingress_expansion.go new file mode 100644 index 0000000000000..a49d30393450f --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/networking/v1/ingress_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// IngressClusterListerExpansion allows custom methods to be added to IngressClusterLister. +type IngressClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/networking/v1/ingressclass.go b/vendor/github.com/kcp-dev/client-go/listers/networking/v1/ingressclass.go index d47ba9c1e506d..2501585c82092 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/networking/v1/ingressclass.go +++ b/vendor/github.com/kcp-dev/client-go/listers/networking/v1/ingressclass.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // IngressClassClusterLister can list IngressClasses across all workspaces, or scope down to a IngressClassLister for one workspace. +// All objects returned here must be treated as read-only. type IngressClassClusterLister interface { + // List lists all IngressClasses in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*networkingv1.IngressClass, err error) + // Cluster returns a lister that can list and get IngressClasses in one workspace. Cluster(cluster logicalcluster.Name) networkingv1listers.IngressClassLister + IngressClassClusterListerExpansion } type ingressClassClusterLister struct { @@ -43,6 +48,10 @@ type ingressClassClusterLister struct { } // NewIngressClassClusterLister returns a new IngressClassClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewIngressClassClusterLister(indexer cache.Indexer) *ingressClassClusterLister { return &ingressClassClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type ingressClassLister struct { // List lists all IngressClasses in the indexer for a workspace. func (s *ingressClassLister) List(selector labels.Selector) (ret []*networkingv1.IngressClass, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*networkingv1.IngressClass) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*networkingv1.IngressClass)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/networking/v1/ingressclass_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/networking/v1/ingressclass_expansion.go new file mode 100644 index 0000000000000..bc79925f8f8e3 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/networking/v1/ingressclass_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// IngressClassClusterListerExpansion allows custom methods to be added to IngressClassClusterLister. +type IngressClassClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/networking/v1/networkpolicy.go b/vendor/github.com/kcp-dev/client-go/listers/networking/v1/networkpolicy.go index cff9e982f1c08..00de28beff607 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/networking/v1/networkpolicy.go +++ b/vendor/github.com/kcp-dev/client-go/listers/networking/v1/networkpolicy.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" networkingv1listers "k8s.io/client-go/listers/networking/v1" "k8s.io/client-go/tools/cache" ) // NetworkPolicyClusterLister can list NetworkPolicies across all workspaces, or scope down to a NetworkPolicyLister for one workspace. +// All objects returned here must be treated as read-only. type NetworkPolicyClusterLister interface { + // List lists all NetworkPolicies in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*networkingv1.NetworkPolicy, err error) + // Cluster returns a lister that can list and get NetworkPolicies in one workspace. Cluster(cluster logicalcluster.Name) networkingv1listers.NetworkPolicyLister + NetworkPolicyClusterListerExpansion } type networkPolicyClusterLister struct { @@ -44,6 +48,11 @@ type networkPolicyClusterLister struct { } // NewNetworkPolicyClusterLister returns a new NetworkPolicyClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewNetworkPolicyClusterLister(indexer cache.Indexer) *networkPolicyClusterLister { return &networkPolicyClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type networkPolicyLister struct { // List lists all NetworkPolicies in the indexer for a workspace. func (s *networkPolicyLister) List(selector labels.Selector) (ret []*networkingv1.NetworkPolicy, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*networkingv1.NetworkPolicy) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*networkingv1.NetworkPolicy)) + }) return ret, err } @@ -104,28 +98,9 @@ type networkPolicyNamespaceLister struct { // List lists all NetworkPolicies in the indexer for a given workspace and namespace. func (s *networkPolicyNamespaceLister) List(selector labels.Selector) (ret []*networkingv1.NetworkPolicy, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*networkingv1.NetworkPolicy) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*networkingv1.NetworkPolicy)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/networking/v1/networkpolicy_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/networking/v1/networkpolicy_expansion.go new file mode 100644 index 0000000000000..593162319acef --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/networking/v1/networkpolicy_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// NetworkPolicyClusterListerExpansion allows custom methods to be added to NetworkPolicyClusterLister. +type NetworkPolicyClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/networking/v1beta1/ingress.go b/vendor/github.com/kcp-dev/client-go/listers/networking/v1beta1/ingress.go index baf1965fb30b6..152b482c9a65f 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/networking/v1beta1/ingress.go +++ b/vendor/github.com/kcp-dev/client-go/listers/networking/v1beta1/ingress.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1beta1 "k8s.io/api/networking/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" networkingv1beta1listers "k8s.io/client-go/listers/networking/v1beta1" "k8s.io/client-go/tools/cache" ) // IngressClusterLister can list Ingresses across all workspaces, or scope down to a IngressLister for one workspace. +// All objects returned here must be treated as read-only. type IngressClusterLister interface { + // List lists all Ingresses in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*networkingv1beta1.Ingress, err error) + // Cluster returns a lister that can list and get Ingresses in one workspace. Cluster(cluster logicalcluster.Name) networkingv1beta1listers.IngressLister + IngressClusterListerExpansion } type ingressClusterLister struct { @@ -44,6 +48,11 @@ type ingressClusterLister struct { } // NewIngressClusterLister returns a new IngressClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewIngressClusterLister(indexer cache.Indexer) *ingressClusterLister { return &ingressClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type ingressLister struct { // List lists all Ingresses in the indexer for a workspace. func (s *ingressLister) List(selector labels.Selector) (ret []*networkingv1beta1.Ingress, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*networkingv1beta1.Ingress) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*networkingv1beta1.Ingress)) + }) return ret, err } @@ -104,28 +98,9 @@ type ingressNamespaceLister struct { // List lists all Ingresses in the indexer for a given workspace and namespace. func (s *ingressNamespaceLister) List(selector labels.Selector) (ret []*networkingv1beta1.Ingress, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*networkingv1beta1.Ingress) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*networkingv1beta1.Ingress)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/networking/v1beta1/ingress_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/networking/v1beta1/ingress_expansion.go new file mode 100644 index 0000000000000..4f130cdf8e445 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/networking/v1beta1/ingress_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// IngressClusterListerExpansion allows custom methods to be added to IngressClusterLister. +type IngressClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/networking/v1beta1/ingressclass.go b/vendor/github.com/kcp-dev/client-go/listers/networking/v1beta1/ingressclass.go index 13e2f25d9ccc6..1fedb0d3c61e7 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/networking/v1beta1/ingressclass.go +++ b/vendor/github.com/kcp-dev/client-go/listers/networking/v1beta1/ingressclass.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" networkingv1beta1 "k8s.io/api/networking/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // IngressClassClusterLister can list IngressClasses across all workspaces, or scope down to a IngressClassLister for one workspace. +// All objects returned here must be treated as read-only. type IngressClassClusterLister interface { + // List lists all IngressClasses in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*networkingv1beta1.IngressClass, err error) + // Cluster returns a lister that can list and get IngressClasses in one workspace. Cluster(cluster logicalcluster.Name) networkingv1beta1listers.IngressClassLister + IngressClassClusterListerExpansion } type ingressClassClusterLister struct { @@ -43,6 +48,10 @@ type ingressClassClusterLister struct { } // NewIngressClassClusterLister returns a new IngressClassClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewIngressClassClusterLister(indexer cache.Indexer) *ingressClassClusterLister { return &ingressClassClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type ingressClassLister struct { // List lists all IngressClasses in the indexer for a workspace. func (s *ingressClassLister) List(selector labels.Selector) (ret []*networkingv1beta1.IngressClass, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*networkingv1beta1.IngressClass) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*networkingv1beta1.IngressClass)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/networking/v1beta1/ingressclass_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/networking/v1beta1/ingressclass_expansion.go new file mode 100644 index 0000000000000..c0ab6ad6fdd65 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/networking/v1beta1/ingressclass_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// IngressClassClusterListerExpansion allows custom methods to be added to IngressClassClusterLister. +type IngressClassClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/node/v1/runtimeclass.go b/vendor/github.com/kcp-dev/client-go/listers/node/v1/runtimeclass.go index 3daadb8c77683..10577cb0c2806 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/node/v1/runtimeclass.go +++ b/vendor/github.com/kcp-dev/client-go/listers/node/v1/runtimeclass.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" nodev1 "k8s.io/api/node/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // RuntimeClassClusterLister can list RuntimeClasses across all workspaces, or scope down to a RuntimeClassLister for one workspace. +// All objects returned here must be treated as read-only. type RuntimeClassClusterLister interface { + // List lists all RuntimeClasses in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*nodev1.RuntimeClass, err error) + // Cluster returns a lister that can list and get RuntimeClasses in one workspace. Cluster(cluster logicalcluster.Name) nodev1listers.RuntimeClassLister + RuntimeClassClusterListerExpansion } type runtimeClassClusterLister struct { @@ -43,6 +48,10 @@ type runtimeClassClusterLister struct { } // NewRuntimeClassClusterLister returns a new RuntimeClassClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewRuntimeClassClusterLister(indexer cache.Indexer) *runtimeClassClusterLister { return &runtimeClassClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type runtimeClassLister struct { // List lists all RuntimeClasses in the indexer for a workspace. func (s *runtimeClassLister) List(selector labels.Selector) (ret []*nodev1.RuntimeClass, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*nodev1.RuntimeClass) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*nodev1.RuntimeClass)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/node/v1/runtimeclass_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/node/v1/runtimeclass_expansion.go new file mode 100644 index 0000000000000..dc580f2e8c05f --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/node/v1/runtimeclass_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// RuntimeClassClusterListerExpansion allows custom methods to be added to RuntimeClassClusterLister. +type RuntimeClassClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/node/v1alpha1/runtimeclass.go b/vendor/github.com/kcp-dev/client-go/listers/node/v1alpha1/runtimeclass.go index d4270485d01e1..d53679111a89a 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/node/v1alpha1/runtimeclass.go +++ b/vendor/github.com/kcp-dev/client-go/listers/node/v1alpha1/runtimeclass.go @@ -23,7 +23,7 @@ package v1alpha1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" nodev1alpha1 "k8s.io/api/node/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // RuntimeClassClusterLister can list RuntimeClasses across all workspaces, or scope down to a RuntimeClassLister for one workspace. +// All objects returned here must be treated as read-only. type RuntimeClassClusterLister interface { + // List lists all RuntimeClasses in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*nodev1alpha1.RuntimeClass, err error) + // Cluster returns a lister that can list and get RuntimeClasses in one workspace. Cluster(cluster logicalcluster.Name) nodev1alpha1listers.RuntimeClassLister + RuntimeClassClusterListerExpansion } type runtimeClassClusterLister struct { @@ -43,6 +48,10 @@ type runtimeClassClusterLister struct { } // NewRuntimeClassClusterLister returns a new RuntimeClassClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewRuntimeClassClusterLister(indexer cache.Indexer) *runtimeClassClusterLister { return &runtimeClassClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type runtimeClassLister struct { // List lists all RuntimeClasses in the indexer for a workspace. func (s *runtimeClassLister) List(selector labels.Selector) (ret []*nodev1alpha1.RuntimeClass, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*nodev1alpha1.RuntimeClass) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*nodev1alpha1.RuntimeClass)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/node/v1alpha1/runtimeclass_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/node/v1alpha1/runtimeclass_expansion.go new file mode 100644 index 0000000000000..50f1bc0f8107f --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/node/v1alpha1/runtimeclass_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1alpha1 + +// RuntimeClassClusterListerExpansion allows custom methods to be added to RuntimeClassClusterLister. +type RuntimeClassClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/node/v1beta1/runtimeclass.go b/vendor/github.com/kcp-dev/client-go/listers/node/v1beta1/runtimeclass.go index dfccd5c01c6b1..e7fd797b15a9d 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/node/v1beta1/runtimeclass.go +++ b/vendor/github.com/kcp-dev/client-go/listers/node/v1beta1/runtimeclass.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" nodev1beta1 "k8s.io/api/node/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // RuntimeClassClusterLister can list RuntimeClasses across all workspaces, or scope down to a RuntimeClassLister for one workspace. +// All objects returned here must be treated as read-only. type RuntimeClassClusterLister interface { + // List lists all RuntimeClasses in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*nodev1beta1.RuntimeClass, err error) + // Cluster returns a lister that can list and get RuntimeClasses in one workspace. Cluster(cluster logicalcluster.Name) nodev1beta1listers.RuntimeClassLister + RuntimeClassClusterListerExpansion } type runtimeClassClusterLister struct { @@ -43,6 +48,10 @@ type runtimeClassClusterLister struct { } // NewRuntimeClassClusterLister returns a new RuntimeClassClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewRuntimeClassClusterLister(indexer cache.Indexer) *runtimeClassClusterLister { return &runtimeClassClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type runtimeClassLister struct { // List lists all RuntimeClasses in the indexer for a workspace. func (s *runtimeClassLister) List(selector labels.Selector) (ret []*nodev1beta1.RuntimeClass, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*nodev1beta1.RuntimeClass) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*nodev1beta1.RuntimeClass)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/node/v1beta1/runtimeclass_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/node/v1beta1/runtimeclass_expansion.go new file mode 100644 index 0000000000000..c4617b6162262 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/node/v1beta1/runtimeclass_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// RuntimeClassClusterListerExpansion allows custom methods to be added to RuntimeClassClusterLister. +type RuntimeClassClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/policy/v1/poddisruptionbudget.go b/vendor/github.com/kcp-dev/client-go/listers/policy/v1/poddisruptionbudget.go index 67888d94f7f34..1d1630826c102 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/policy/v1/poddisruptionbudget.go +++ b/vendor/github.com/kcp-dev/client-go/listers/policy/v1/poddisruptionbudget.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" policyv1 "k8s.io/api/policy/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" policyv1listers "k8s.io/client-go/listers/policy/v1" "k8s.io/client-go/tools/cache" ) // PodDisruptionBudgetClusterLister can list PodDisruptionBudgets across all workspaces, or scope down to a PodDisruptionBudgetLister for one workspace. +// All objects returned here must be treated as read-only. type PodDisruptionBudgetClusterLister interface { + // List lists all PodDisruptionBudgets in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*policyv1.PodDisruptionBudget, err error) + // Cluster returns a lister that can list and get PodDisruptionBudgets in one workspace. Cluster(cluster logicalcluster.Name) policyv1listers.PodDisruptionBudgetLister + PodDisruptionBudgetClusterListerExpansion } type podDisruptionBudgetClusterLister struct { @@ -44,6 +48,11 @@ type podDisruptionBudgetClusterLister struct { } // NewPodDisruptionBudgetClusterLister returns a new PodDisruptionBudgetClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewPodDisruptionBudgetClusterLister(indexer cache.Indexer) *podDisruptionBudgetClusterLister { return &podDisruptionBudgetClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type podDisruptionBudgetLister struct { // List lists all PodDisruptionBudgets in the indexer for a workspace. func (s *podDisruptionBudgetLister) List(selector labels.Selector) (ret []*policyv1.PodDisruptionBudget, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*policyv1.PodDisruptionBudget) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*policyv1.PodDisruptionBudget)) + }) return ret, err } @@ -104,28 +98,9 @@ type podDisruptionBudgetNamespaceLister struct { // List lists all PodDisruptionBudgets in the indexer for a given workspace and namespace. func (s *podDisruptionBudgetNamespaceLister) List(selector labels.Selector) (ret []*policyv1.PodDisruptionBudget, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*policyv1.PodDisruptionBudget) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*policyv1.PodDisruptionBudget)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/policy/v1/poddisruptionbudget_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/policy/v1/poddisruptionbudget_expansion.go index 115ee3f004766..c947b7f708235 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/policy/v1/poddisruptionbudget_expansion.go +++ b/vendor/github.com/kcp-dev/client-go/listers/policy/v1/poddisruptionbudget_expansion.go @@ -25,6 +25,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ) +// PodDisruptionBudgetClusterListerExpansion allows custom methods to be added to +// PodDisruptionBudgetClusterLister. +type PodDisruptionBudgetClusterListerExpansion interface{} + // PodDisruptionBudgetListerExpansion allows custom methods to be added to // PodDisruptionBudgetLister. type PodDisruptionBudgetListerExpansion interface { diff --git a/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/poddisruptionbudget.go b/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/poddisruptionbudget.go index 0f1e44b102263..3a55a4cc425df 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/poddisruptionbudget.go +++ b/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/poddisruptionbudget.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" policyv1beta1 "k8s.io/api/policy/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" policyv1beta1listers "k8s.io/client-go/listers/policy/v1beta1" "k8s.io/client-go/tools/cache" ) // PodDisruptionBudgetClusterLister can list PodDisruptionBudgets across all workspaces, or scope down to a PodDisruptionBudgetLister for one workspace. +// All objects returned here must be treated as read-only. type PodDisruptionBudgetClusterLister interface { + // List lists all PodDisruptionBudgets in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*policyv1beta1.PodDisruptionBudget, err error) + // Cluster returns a lister that can list and get PodDisruptionBudgets in one workspace. Cluster(cluster logicalcluster.Name) policyv1beta1listers.PodDisruptionBudgetLister + PodDisruptionBudgetClusterListerExpansion } type podDisruptionBudgetClusterLister struct { @@ -44,6 +48,11 @@ type podDisruptionBudgetClusterLister struct { } // NewPodDisruptionBudgetClusterLister returns a new PodDisruptionBudgetClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewPodDisruptionBudgetClusterLister(indexer cache.Indexer) *podDisruptionBudgetClusterLister { return &podDisruptionBudgetClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type podDisruptionBudgetLister struct { // List lists all PodDisruptionBudgets in the indexer for a workspace. func (s *podDisruptionBudgetLister) List(selector labels.Selector) (ret []*policyv1beta1.PodDisruptionBudget, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*policyv1beta1.PodDisruptionBudget) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*policyv1beta1.PodDisruptionBudget)) + }) return ret, err } @@ -104,28 +98,9 @@ type podDisruptionBudgetNamespaceLister struct { // List lists all PodDisruptionBudgets in the indexer for a given workspace and namespace. func (s *podDisruptionBudgetNamespaceLister) List(selector labels.Selector) (ret []*policyv1beta1.PodDisruptionBudget, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*policyv1beta1.PodDisruptionBudget) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*policyv1beta1.PodDisruptionBudget)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/poddisruptionbudget_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/poddisruptionbudget_expansion.go index 994947c4f3c7b..38f4e08aecf1f 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/poddisruptionbudget_expansion.go +++ b/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/poddisruptionbudget_expansion.go @@ -25,6 +25,10 @@ import ( "k8s.io/apimachinery/pkg/labels" ) +// PodDisruptionBudgetClusterListerExpansion allows custom methods to be added to +// PodDisruptionBudgetClusterLister. +type PodDisruptionBudgetClusterListerExpansion interface{} + // PodDisruptionBudgetListerExpansion allows custom methods to be added to // PodDisruptionBudgetLister. type PodDisruptionBudgetListerExpansion interface { diff --git a/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/podsecuritypolicy.go b/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/podsecuritypolicy.go index 2221554c88bb2..91d3dc69b3755 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/podsecuritypolicy.go +++ b/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/podsecuritypolicy.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" policyv1beta1 "k8s.io/api/policy/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // PodSecurityPolicyClusterLister can list PodSecurityPolicies across all workspaces, or scope down to a PodSecurityPolicyLister for one workspace. +// All objects returned here must be treated as read-only. type PodSecurityPolicyClusterLister interface { + // List lists all PodSecurityPolicies in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*policyv1beta1.PodSecurityPolicy, err error) + // Cluster returns a lister that can list and get PodSecurityPolicies in one workspace. Cluster(cluster logicalcluster.Name) policyv1beta1listers.PodSecurityPolicyLister + PodSecurityPolicyClusterListerExpansion } type podSecurityPolicyClusterLister struct { @@ -43,6 +48,10 @@ type podSecurityPolicyClusterLister struct { } // NewPodSecurityPolicyClusterLister returns a new PodSecurityPolicyClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewPodSecurityPolicyClusterLister(indexer cache.Indexer) *podSecurityPolicyClusterLister { return &podSecurityPolicyClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type podSecurityPolicyLister struct { // List lists all PodSecurityPolicies in the indexer for a workspace. func (s *podSecurityPolicyLister) List(selector labels.Selector) (ret []*policyv1beta1.PodSecurityPolicy, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*policyv1beta1.PodSecurityPolicy) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*policyv1beta1.PodSecurityPolicy)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/podsecuritypolicy_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/podsecuritypolicy_expansion.go new file mode 100644 index 0000000000000..775adac818f85 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/policy/v1beta1/podsecuritypolicy_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// PodSecurityPolicyClusterListerExpansion allows custom methods to be added to PodSecurityPolicyClusterLister. +type PodSecurityPolicyClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/clusterrole.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/clusterrole.go index 04e48cb66be92..5cd01cda8e0f4 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/clusterrole.go +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/clusterrole.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // ClusterRoleClusterLister can list ClusterRoles across all workspaces, or scope down to a ClusterRoleLister for one workspace. +// All objects returned here must be treated as read-only. type ClusterRoleClusterLister interface { + // List lists all ClusterRoles in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*rbacv1.ClusterRole, err error) + // Cluster returns a lister that can list and get ClusterRoles in one workspace. Cluster(cluster logicalcluster.Name) rbacv1listers.ClusterRoleLister + ClusterRoleClusterListerExpansion } type clusterRoleClusterLister struct { @@ -43,6 +48,10 @@ type clusterRoleClusterLister struct { } // NewClusterRoleClusterLister returns a new ClusterRoleClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewClusterRoleClusterLister(indexer cache.Indexer) *clusterRoleClusterLister { return &clusterRoleClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type clusterRoleLister struct { // List lists all ClusterRoles in the indexer for a workspace. func (s *clusterRoleLister) List(selector labels.Selector) (ret []*rbacv1.ClusterRole, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1.ClusterRole) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1.ClusterRole)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/clusterrole_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/clusterrole_expansion.go new file mode 100644 index 0000000000000..bd22d482ae81f --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/clusterrole_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// ClusterRoleClusterListerExpansion allows custom methods to be added to ClusterRoleClusterLister. +type ClusterRoleClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/clusterrolebinding.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/clusterrolebinding.go index fd9cc7fb07ba7..65f20280c0190 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/clusterrolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/clusterrolebinding.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // ClusterRoleBindingClusterLister can list ClusterRoleBindings across all workspaces, or scope down to a ClusterRoleBindingLister for one workspace. +// All objects returned here must be treated as read-only. type ClusterRoleBindingClusterLister interface { + // List lists all ClusterRoleBindings in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*rbacv1.ClusterRoleBinding, err error) + // Cluster returns a lister that can list and get ClusterRoleBindings in one workspace. Cluster(cluster logicalcluster.Name) rbacv1listers.ClusterRoleBindingLister + ClusterRoleBindingClusterListerExpansion } type clusterRoleBindingClusterLister struct { @@ -43,6 +48,10 @@ type clusterRoleBindingClusterLister struct { } // NewClusterRoleBindingClusterLister returns a new ClusterRoleBindingClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewClusterRoleBindingClusterLister(indexer cache.Indexer) *clusterRoleBindingClusterLister { return &clusterRoleBindingClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type clusterRoleBindingLister struct { // List lists all ClusterRoleBindings in the indexer for a workspace. func (s *clusterRoleBindingLister) List(selector labels.Selector) (ret []*rbacv1.ClusterRoleBinding, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1.ClusterRoleBinding) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1.ClusterRoleBinding)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/clusterrolebinding_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/clusterrolebinding_expansion.go new file mode 100644 index 0000000000000..7a1db9139df64 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/clusterrolebinding_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// ClusterRoleBindingClusterListerExpansion allows custom methods to be added to ClusterRoleBindingClusterLister. +type ClusterRoleBindingClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/role.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/role.go index 79a8e186ca752..a47e32e6399af 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/role.go +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/role.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" rbacv1listers "k8s.io/client-go/listers/rbac/v1" "k8s.io/client-go/tools/cache" ) // RoleClusterLister can list Roles across all workspaces, or scope down to a RoleLister for one workspace. +// All objects returned here must be treated as read-only. type RoleClusterLister interface { + // List lists all Roles in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*rbacv1.Role, err error) + // Cluster returns a lister that can list and get Roles in one workspace. Cluster(cluster logicalcluster.Name) rbacv1listers.RoleLister + RoleClusterListerExpansion } type roleClusterLister struct { @@ -44,6 +48,11 @@ type roleClusterLister struct { } // NewRoleClusterLister returns a new RoleClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewRoleClusterLister(indexer cache.Indexer) *roleClusterLister { return &roleClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type roleLister struct { // List lists all Roles in the indexer for a workspace. func (s *roleLister) List(selector labels.Selector) (ret []*rbacv1.Role, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1.Role) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1.Role)) + }) return ret, err } @@ -104,28 +98,9 @@ type roleNamespaceLister struct { // List lists all Roles in the indexer for a given workspace and namespace. func (s *roleNamespaceLister) List(selector labels.Selector) (ret []*rbacv1.Role, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1.Role) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1.Role)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/role_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/role_expansion.go new file mode 100644 index 0000000000000..c1c0e9d5b423e --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/role_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// RoleClusterListerExpansion allows custom methods to be added to RoleClusterLister. +type RoleClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/rolebinding.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/rolebinding.go index 003467264ec90..4bc1db2bf52e9 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/rolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/rolebinding.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" rbacv1listers "k8s.io/client-go/listers/rbac/v1" "k8s.io/client-go/tools/cache" ) // RoleBindingClusterLister can list RoleBindings across all workspaces, or scope down to a RoleBindingLister for one workspace. +// All objects returned here must be treated as read-only. type RoleBindingClusterLister interface { + // List lists all RoleBindings in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*rbacv1.RoleBinding, err error) + // Cluster returns a lister that can list and get RoleBindings in one workspace. Cluster(cluster logicalcluster.Name) rbacv1listers.RoleBindingLister + RoleBindingClusterListerExpansion } type roleBindingClusterLister struct { @@ -44,6 +48,11 @@ type roleBindingClusterLister struct { } // NewRoleBindingClusterLister returns a new RoleBindingClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewRoleBindingClusterLister(indexer cache.Indexer) *roleBindingClusterLister { return &roleBindingClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type roleBindingLister struct { // List lists all RoleBindings in the indexer for a workspace. func (s *roleBindingLister) List(selector labels.Selector) (ret []*rbacv1.RoleBinding, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1.RoleBinding) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1.RoleBinding)) + }) return ret, err } @@ -104,28 +98,9 @@ type roleBindingNamespaceLister struct { // List lists all RoleBindings in the indexer for a given workspace and namespace. func (s *roleBindingNamespaceLister) List(selector labels.Selector) (ret []*rbacv1.RoleBinding, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1.RoleBinding) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1.RoleBinding)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/rolebinding_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/rolebinding_expansion.go new file mode 100644 index 0000000000000..84d93c840c3cd --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1/rolebinding_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// RoleBindingClusterListerExpansion allows custom methods to be added to RoleBindingClusterLister. +type RoleBindingClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/clusterrole.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/clusterrole.go index cf2fbb3204a0d..25a163e03fbc6 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/clusterrole.go +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/clusterrole.go @@ -23,7 +23,7 @@ package v1alpha1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // ClusterRoleClusterLister can list ClusterRoles across all workspaces, or scope down to a ClusterRoleLister for one workspace. +// All objects returned here must be treated as read-only. type ClusterRoleClusterLister interface { + // List lists all ClusterRoles in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*rbacv1alpha1.ClusterRole, err error) + // Cluster returns a lister that can list and get ClusterRoles in one workspace. Cluster(cluster logicalcluster.Name) rbacv1alpha1listers.ClusterRoleLister + ClusterRoleClusterListerExpansion } type clusterRoleClusterLister struct { @@ -43,6 +48,10 @@ type clusterRoleClusterLister struct { } // NewClusterRoleClusterLister returns a new ClusterRoleClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewClusterRoleClusterLister(indexer cache.Indexer) *clusterRoleClusterLister { return &clusterRoleClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type clusterRoleLister struct { // List lists all ClusterRoles in the indexer for a workspace. func (s *clusterRoleLister) List(selector labels.Selector) (ret []*rbacv1alpha1.ClusterRole, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1alpha1.ClusterRole) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1alpha1.ClusterRole)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/clusterrole_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/clusterrole_expansion.go new file mode 100644 index 0000000000000..9bcbe1e43b87f --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/clusterrole_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1alpha1 + +// ClusterRoleClusterListerExpansion allows custom methods to be added to ClusterRoleClusterLister. +type ClusterRoleClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/clusterrolebinding.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/clusterrolebinding.go index 2fbec3ed6a700..092428730104d 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/clusterrolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/clusterrolebinding.go @@ -23,7 +23,7 @@ package v1alpha1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // ClusterRoleBindingClusterLister can list ClusterRoleBindings across all workspaces, or scope down to a ClusterRoleBindingLister for one workspace. +// All objects returned here must be treated as read-only. type ClusterRoleBindingClusterLister interface { + // List lists all ClusterRoleBindings in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*rbacv1alpha1.ClusterRoleBinding, err error) + // Cluster returns a lister that can list and get ClusterRoleBindings in one workspace. Cluster(cluster logicalcluster.Name) rbacv1alpha1listers.ClusterRoleBindingLister + ClusterRoleBindingClusterListerExpansion } type clusterRoleBindingClusterLister struct { @@ -43,6 +48,10 @@ type clusterRoleBindingClusterLister struct { } // NewClusterRoleBindingClusterLister returns a new ClusterRoleBindingClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewClusterRoleBindingClusterLister(indexer cache.Indexer) *clusterRoleBindingClusterLister { return &clusterRoleBindingClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type clusterRoleBindingLister struct { // List lists all ClusterRoleBindings in the indexer for a workspace. func (s *clusterRoleBindingLister) List(selector labels.Selector) (ret []*rbacv1alpha1.ClusterRoleBinding, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1alpha1.ClusterRoleBinding) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1alpha1.ClusterRoleBinding)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/clusterrolebinding_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/clusterrolebinding_expansion.go new file mode 100644 index 0000000000000..6f1748539e4c4 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/clusterrolebinding_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1alpha1 + +// ClusterRoleBindingClusterListerExpansion allows custom methods to be added to ClusterRoleBindingClusterLister. +type ClusterRoleBindingClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/role.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/role.go index 2e4e3063c7243..76dbb5c6bf6df 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/role.go +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/role.go @@ -23,20 +23,24 @@ package v1alpha1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" rbacv1alpha1listers "k8s.io/client-go/listers/rbac/v1alpha1" "k8s.io/client-go/tools/cache" ) // RoleClusterLister can list Roles across all workspaces, or scope down to a RoleLister for one workspace. +// All objects returned here must be treated as read-only. type RoleClusterLister interface { + // List lists all Roles in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*rbacv1alpha1.Role, err error) + // Cluster returns a lister that can list and get Roles in one workspace. Cluster(cluster logicalcluster.Name) rbacv1alpha1listers.RoleLister + RoleClusterListerExpansion } type roleClusterLister struct { @@ -44,6 +48,11 @@ type roleClusterLister struct { } // NewRoleClusterLister returns a new RoleClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewRoleClusterLister(indexer cache.Indexer) *roleClusterLister { return &roleClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type roleLister struct { // List lists all Roles in the indexer for a workspace. func (s *roleLister) List(selector labels.Selector) (ret []*rbacv1alpha1.Role, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1alpha1.Role) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1alpha1.Role)) + }) return ret, err } @@ -104,28 +98,9 @@ type roleNamespaceLister struct { // List lists all Roles in the indexer for a given workspace and namespace. func (s *roleNamespaceLister) List(selector labels.Selector) (ret []*rbacv1alpha1.Role, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1alpha1.Role) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1alpha1.Role)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/role_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/role_expansion.go new file mode 100644 index 0000000000000..178b21fc81715 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/role_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1alpha1 + +// RoleClusterListerExpansion allows custom methods to be added to RoleClusterLister. +type RoleClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/rolebinding.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/rolebinding.go index c12c400c83bed..9322ff21c154f 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/rolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/rolebinding.go @@ -23,20 +23,24 @@ package v1alpha1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" rbacv1alpha1listers "k8s.io/client-go/listers/rbac/v1alpha1" "k8s.io/client-go/tools/cache" ) // RoleBindingClusterLister can list RoleBindings across all workspaces, or scope down to a RoleBindingLister for one workspace. +// All objects returned here must be treated as read-only. type RoleBindingClusterLister interface { + // List lists all RoleBindings in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*rbacv1alpha1.RoleBinding, err error) + // Cluster returns a lister that can list and get RoleBindings in one workspace. Cluster(cluster logicalcluster.Name) rbacv1alpha1listers.RoleBindingLister + RoleBindingClusterListerExpansion } type roleBindingClusterLister struct { @@ -44,6 +48,11 @@ type roleBindingClusterLister struct { } // NewRoleBindingClusterLister returns a new RoleBindingClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewRoleBindingClusterLister(indexer cache.Indexer) *roleBindingClusterLister { return &roleBindingClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type roleBindingLister struct { // List lists all RoleBindings in the indexer for a workspace. func (s *roleBindingLister) List(selector labels.Selector) (ret []*rbacv1alpha1.RoleBinding, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1alpha1.RoleBinding) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1alpha1.RoleBinding)) + }) return ret, err } @@ -104,28 +98,9 @@ type roleBindingNamespaceLister struct { // List lists all RoleBindings in the indexer for a given workspace and namespace. func (s *roleBindingNamespaceLister) List(selector labels.Selector) (ret []*rbacv1alpha1.RoleBinding, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1alpha1.RoleBinding) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1alpha1.RoleBinding)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/rolebinding_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/rolebinding_expansion.go new file mode 100644 index 0000000000000..3b62f279b43c1 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1alpha1/rolebinding_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1alpha1 + +// RoleBindingClusterListerExpansion allows custom methods to be added to RoleBindingClusterLister. +type RoleBindingClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/clusterrole.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/clusterrole.go index 7739d9a3ce11a..c46b3f3014026 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/clusterrole.go +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/clusterrole.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1beta1 "k8s.io/api/rbac/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // ClusterRoleClusterLister can list ClusterRoles across all workspaces, or scope down to a ClusterRoleLister for one workspace. +// All objects returned here must be treated as read-only. type ClusterRoleClusterLister interface { + // List lists all ClusterRoles in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*rbacv1beta1.ClusterRole, err error) + // Cluster returns a lister that can list and get ClusterRoles in one workspace. Cluster(cluster logicalcluster.Name) rbacv1beta1listers.ClusterRoleLister + ClusterRoleClusterListerExpansion } type clusterRoleClusterLister struct { @@ -43,6 +48,10 @@ type clusterRoleClusterLister struct { } // NewClusterRoleClusterLister returns a new ClusterRoleClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewClusterRoleClusterLister(indexer cache.Indexer) *clusterRoleClusterLister { return &clusterRoleClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type clusterRoleLister struct { // List lists all ClusterRoles in the indexer for a workspace. func (s *clusterRoleLister) List(selector labels.Selector) (ret []*rbacv1beta1.ClusterRole, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1beta1.ClusterRole) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1beta1.ClusterRole)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/clusterrole_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/clusterrole_expansion.go new file mode 100644 index 0000000000000..327e32253e87d --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/clusterrole_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// ClusterRoleClusterListerExpansion allows custom methods to be added to ClusterRoleClusterLister. +type ClusterRoleClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/clusterrolebinding.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/clusterrolebinding.go index c3d00728869c1..638a6d1794cb7 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/clusterrolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/clusterrolebinding.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1beta1 "k8s.io/api/rbac/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // ClusterRoleBindingClusterLister can list ClusterRoleBindings across all workspaces, or scope down to a ClusterRoleBindingLister for one workspace. +// All objects returned here must be treated as read-only. type ClusterRoleBindingClusterLister interface { + // List lists all ClusterRoleBindings in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*rbacv1beta1.ClusterRoleBinding, err error) + // Cluster returns a lister that can list and get ClusterRoleBindings in one workspace. Cluster(cluster logicalcluster.Name) rbacv1beta1listers.ClusterRoleBindingLister + ClusterRoleBindingClusterListerExpansion } type clusterRoleBindingClusterLister struct { @@ -43,6 +48,10 @@ type clusterRoleBindingClusterLister struct { } // NewClusterRoleBindingClusterLister returns a new ClusterRoleBindingClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewClusterRoleBindingClusterLister(indexer cache.Indexer) *clusterRoleBindingClusterLister { return &clusterRoleBindingClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type clusterRoleBindingLister struct { // List lists all ClusterRoleBindings in the indexer for a workspace. func (s *clusterRoleBindingLister) List(selector labels.Selector) (ret []*rbacv1beta1.ClusterRoleBinding, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1beta1.ClusterRoleBinding) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1beta1.ClusterRoleBinding)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/clusterrolebinding_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/clusterrolebinding_expansion.go new file mode 100644 index 0000000000000..19d0054a7d94b --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/clusterrolebinding_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// ClusterRoleBindingClusterListerExpansion allows custom methods to be added to ClusterRoleBindingClusterLister. +type ClusterRoleBindingClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/role.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/role.go index 4180a4128b0c8..17de1e19edac0 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/role.go +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/role.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1beta1 "k8s.io/api/rbac/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" rbacv1beta1listers "k8s.io/client-go/listers/rbac/v1beta1" "k8s.io/client-go/tools/cache" ) // RoleClusterLister can list Roles across all workspaces, or scope down to a RoleLister for one workspace. +// All objects returned here must be treated as read-only. type RoleClusterLister interface { + // List lists all Roles in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*rbacv1beta1.Role, err error) + // Cluster returns a lister that can list and get Roles in one workspace. Cluster(cluster logicalcluster.Name) rbacv1beta1listers.RoleLister + RoleClusterListerExpansion } type roleClusterLister struct { @@ -44,6 +48,11 @@ type roleClusterLister struct { } // NewRoleClusterLister returns a new RoleClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewRoleClusterLister(indexer cache.Indexer) *roleClusterLister { return &roleClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type roleLister struct { // List lists all Roles in the indexer for a workspace. func (s *roleLister) List(selector labels.Selector) (ret []*rbacv1beta1.Role, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1beta1.Role) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1beta1.Role)) + }) return ret, err } @@ -104,28 +98,9 @@ type roleNamespaceLister struct { // List lists all Roles in the indexer for a given workspace and namespace. func (s *roleNamespaceLister) List(selector labels.Selector) (ret []*rbacv1beta1.Role, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1beta1.Role) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1beta1.Role)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/role_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/role_expansion.go new file mode 100644 index 0000000000000..4084bb8a68efa --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/role_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// RoleClusterListerExpansion allows custom methods to be added to RoleClusterLister. +type RoleClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/rolebinding.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/rolebinding.go index 94bcdece61bfb..012d3064e3ea2 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/rolebinding.go +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/rolebinding.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" rbacv1beta1 "k8s.io/api/rbac/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" rbacv1beta1listers "k8s.io/client-go/listers/rbac/v1beta1" "k8s.io/client-go/tools/cache" ) // RoleBindingClusterLister can list RoleBindings across all workspaces, or scope down to a RoleBindingLister for one workspace. +// All objects returned here must be treated as read-only. type RoleBindingClusterLister interface { + // List lists all RoleBindings in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*rbacv1beta1.RoleBinding, err error) + // Cluster returns a lister that can list and get RoleBindings in one workspace. Cluster(cluster logicalcluster.Name) rbacv1beta1listers.RoleBindingLister + RoleBindingClusterListerExpansion } type roleBindingClusterLister struct { @@ -44,6 +48,11 @@ type roleBindingClusterLister struct { } // NewRoleBindingClusterLister returns a new RoleBindingClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewRoleBindingClusterLister(indexer cache.Indexer) *roleBindingClusterLister { return &roleBindingClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type roleBindingLister struct { // List lists all RoleBindings in the indexer for a workspace. func (s *roleBindingLister) List(selector labels.Selector) (ret []*rbacv1beta1.RoleBinding, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1beta1.RoleBinding) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1beta1.RoleBinding)) + }) return ret, err } @@ -104,28 +98,9 @@ type roleBindingNamespaceLister struct { // List lists all RoleBindings in the indexer for a given workspace and namespace. func (s *roleBindingNamespaceLister) List(selector labels.Selector) (ret []*rbacv1beta1.RoleBinding, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*rbacv1beta1.RoleBinding) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*rbacv1beta1.RoleBinding)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/rolebinding_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/rolebinding_expansion.go new file mode 100644 index 0000000000000..deeabe7f3546d --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/rbac/v1beta1/rolebinding_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// RoleBindingClusterListerExpansion allows custom methods to be added to RoleBindingClusterLister. +type RoleBindingClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1/priorityclass.go b/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1/priorityclass.go index dffb586871143..11d52fa2e0a63 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1/priorityclass.go +++ b/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1/priorityclass.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" schedulingv1 "k8s.io/api/scheduling/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // PriorityClassClusterLister can list PriorityClasses across all workspaces, or scope down to a PriorityClassLister for one workspace. +// All objects returned here must be treated as read-only. type PriorityClassClusterLister interface { + // List lists all PriorityClasses in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*schedulingv1.PriorityClass, err error) + // Cluster returns a lister that can list and get PriorityClasses in one workspace. Cluster(cluster logicalcluster.Name) schedulingv1listers.PriorityClassLister + PriorityClassClusterListerExpansion } type priorityClassClusterLister struct { @@ -43,6 +48,10 @@ type priorityClassClusterLister struct { } // NewPriorityClassClusterLister returns a new PriorityClassClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewPriorityClassClusterLister(indexer cache.Indexer) *priorityClassClusterLister { return &priorityClassClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type priorityClassLister struct { // List lists all PriorityClasses in the indexer for a workspace. func (s *priorityClassLister) List(selector labels.Selector) (ret []*schedulingv1.PriorityClass, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*schedulingv1.PriorityClass) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*schedulingv1.PriorityClass)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1/priorityclass_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1/priorityclass_expansion.go new file mode 100644 index 0000000000000..f4fa35e7d9c27 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1/priorityclass_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// PriorityClassClusterListerExpansion allows custom methods to be added to PriorityClassClusterLister. +type PriorityClassClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1alpha1/priorityclass.go b/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1alpha1/priorityclass.go index 82abd96478005..46340e39f9304 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1alpha1/priorityclass.go +++ b/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1alpha1/priorityclass.go @@ -23,7 +23,7 @@ package v1alpha1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" schedulingv1alpha1 "k8s.io/api/scheduling/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // PriorityClassClusterLister can list PriorityClasses across all workspaces, or scope down to a PriorityClassLister for one workspace. +// All objects returned here must be treated as read-only. type PriorityClassClusterLister interface { + // List lists all PriorityClasses in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*schedulingv1alpha1.PriorityClass, err error) + // Cluster returns a lister that can list and get PriorityClasses in one workspace. Cluster(cluster logicalcluster.Name) schedulingv1alpha1listers.PriorityClassLister + PriorityClassClusterListerExpansion } type priorityClassClusterLister struct { @@ -43,6 +48,10 @@ type priorityClassClusterLister struct { } // NewPriorityClassClusterLister returns a new PriorityClassClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewPriorityClassClusterLister(indexer cache.Indexer) *priorityClassClusterLister { return &priorityClassClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type priorityClassLister struct { // List lists all PriorityClasses in the indexer for a workspace. func (s *priorityClassLister) List(selector labels.Selector) (ret []*schedulingv1alpha1.PriorityClass, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*schedulingv1alpha1.PriorityClass) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*schedulingv1alpha1.PriorityClass)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1alpha1/priorityclass_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1alpha1/priorityclass_expansion.go new file mode 100644 index 0000000000000..5306a9f394753 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1alpha1/priorityclass_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1alpha1 + +// PriorityClassClusterListerExpansion allows custom methods to be added to PriorityClassClusterLister. +type PriorityClassClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1beta1/priorityclass.go b/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1beta1/priorityclass.go index 35796bfa494ae..7d74259cde1b4 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1beta1/priorityclass.go +++ b/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1beta1/priorityclass.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" schedulingv1beta1 "k8s.io/api/scheduling/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // PriorityClassClusterLister can list PriorityClasses across all workspaces, or scope down to a PriorityClassLister for one workspace. +// All objects returned here must be treated as read-only. type PriorityClassClusterLister interface { + // List lists all PriorityClasses in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*schedulingv1beta1.PriorityClass, err error) + // Cluster returns a lister that can list and get PriorityClasses in one workspace. Cluster(cluster logicalcluster.Name) schedulingv1beta1listers.PriorityClassLister + PriorityClassClusterListerExpansion } type priorityClassClusterLister struct { @@ -43,6 +48,10 @@ type priorityClassClusterLister struct { } // NewPriorityClassClusterLister returns a new PriorityClassClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewPriorityClassClusterLister(indexer cache.Indexer) *priorityClassClusterLister { return &priorityClassClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type priorityClassLister struct { // List lists all PriorityClasses in the indexer for a workspace. func (s *priorityClassLister) List(selector labels.Selector) (ret []*schedulingv1beta1.PriorityClass, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*schedulingv1beta1.PriorityClass) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*schedulingv1beta1.PriorityClass)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1beta1/priorityclass_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1beta1/priorityclass_expansion.go new file mode 100644 index 0000000000000..934611db6235c --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/scheduling/v1beta1/priorityclass_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// PriorityClassClusterListerExpansion allows custom methods to be added to PriorityClassClusterLister. +type PriorityClassClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csidriver.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csidriver.go index 7b0a70f69071c..419973c8002ce 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csidriver.go +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csidriver.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // CSIDriverClusterLister can list CSIDrivers across all workspaces, or scope down to a CSIDriverLister for one workspace. +// All objects returned here must be treated as read-only. type CSIDriverClusterLister interface { + // List lists all CSIDrivers in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*storagev1.CSIDriver, err error) + // Cluster returns a lister that can list and get CSIDrivers in one workspace. Cluster(cluster logicalcluster.Name) storagev1listers.CSIDriverLister + CSIDriverClusterListerExpansion } type cSIDriverClusterLister struct { @@ -43,6 +48,10 @@ type cSIDriverClusterLister struct { } // NewCSIDriverClusterLister returns a new CSIDriverClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewCSIDriverClusterLister(indexer cache.Indexer) *cSIDriverClusterLister { return &cSIDriverClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type cSIDriverLister struct { // List lists all CSIDrivers in the indexer for a workspace. func (s *cSIDriverLister) List(selector labels.Selector) (ret []*storagev1.CSIDriver, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1.CSIDriver) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1.CSIDriver)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csidriver_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csidriver_expansion.go new file mode 100644 index 0000000000000..cf198daf008cf --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csidriver_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// CSIDriverClusterListerExpansion allows custom methods to be added to CSIDriverClusterLister. +type CSIDriverClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csinode.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csinode.go index 1062dcbb097ab..4f12b6ba6173d 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csinode.go +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csinode.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // CSINodeClusterLister can list CSINodes across all workspaces, or scope down to a CSINodeLister for one workspace. +// All objects returned here must be treated as read-only. type CSINodeClusterLister interface { + // List lists all CSINodes in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*storagev1.CSINode, err error) + // Cluster returns a lister that can list and get CSINodes in one workspace. Cluster(cluster logicalcluster.Name) storagev1listers.CSINodeLister + CSINodeClusterListerExpansion } type cSINodeClusterLister struct { @@ -43,6 +48,10 @@ type cSINodeClusterLister struct { } // NewCSINodeClusterLister returns a new CSINodeClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewCSINodeClusterLister(indexer cache.Indexer) *cSINodeClusterLister { return &cSINodeClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type cSINodeLister struct { // List lists all CSINodes in the indexer for a workspace. func (s *cSINodeLister) List(selector labels.Selector) (ret []*storagev1.CSINode, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1.CSINode) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1.CSINode)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csinode_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csinode_expansion.go new file mode 100644 index 0000000000000..1d0fc861aa861 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csinode_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// CSINodeClusterListerExpansion allows custom methods to be added to CSINodeClusterLister. +type CSINodeClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csistoragecapacity.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csistoragecapacity.go index 1757233591a7d..d3571d5dc7956 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csistoragecapacity.go +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csistoragecapacity.go @@ -23,20 +23,24 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" storagev1listers "k8s.io/client-go/listers/storage/v1" "k8s.io/client-go/tools/cache" ) // CSIStorageCapacityClusterLister can list CSIStorageCapacities across all workspaces, or scope down to a CSIStorageCapacityLister for one workspace. +// All objects returned here must be treated as read-only. type CSIStorageCapacityClusterLister interface { + // List lists all CSIStorageCapacities in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*storagev1.CSIStorageCapacity, err error) + // Cluster returns a lister that can list and get CSIStorageCapacities in one workspace. Cluster(cluster logicalcluster.Name) storagev1listers.CSIStorageCapacityLister + CSIStorageCapacityClusterListerExpansion } type cSIStorageCapacityClusterLister struct { @@ -44,6 +48,11 @@ type cSIStorageCapacityClusterLister struct { } // NewCSIStorageCapacityClusterLister returns a new CSIStorageCapacityClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewCSIStorageCapacityClusterLister(indexer cache.Indexer) *cSIStorageCapacityClusterLister { return &cSIStorageCapacityClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type cSIStorageCapacityLister struct { // List lists all CSIStorageCapacities in the indexer for a workspace. func (s *cSIStorageCapacityLister) List(selector labels.Selector) (ret []*storagev1.CSIStorageCapacity, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1.CSIStorageCapacity) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1.CSIStorageCapacity)) + }) return ret, err } @@ -104,28 +98,9 @@ type cSIStorageCapacityNamespaceLister struct { // List lists all CSIStorageCapacities in the indexer for a given workspace and namespace. func (s *cSIStorageCapacityNamespaceLister) List(selector labels.Selector) (ret []*storagev1.CSIStorageCapacity, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1.CSIStorageCapacity) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1.CSIStorageCapacity)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csistoragecapacity_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csistoragecapacity_expansion.go new file mode 100644 index 0000000000000..f12e835ebf348 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/csistoragecapacity_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// CSIStorageCapacityClusterListerExpansion allows custom methods to be added to CSIStorageCapacityClusterLister. +type CSIStorageCapacityClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/storageclass.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/storageclass.go index 211c21ffb749b..d6bade5ddef62 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/storageclass.go +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/storageclass.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // StorageClassClusterLister can list StorageClasses across all workspaces, or scope down to a StorageClassLister for one workspace. +// All objects returned here must be treated as read-only. type StorageClassClusterLister interface { + // List lists all StorageClasses in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*storagev1.StorageClass, err error) + // Cluster returns a lister that can list and get StorageClasses in one workspace. Cluster(cluster logicalcluster.Name) storagev1listers.StorageClassLister + StorageClassClusterListerExpansion } type storageClassClusterLister struct { @@ -43,6 +48,10 @@ type storageClassClusterLister struct { } // NewStorageClassClusterLister returns a new StorageClassClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewStorageClassClusterLister(indexer cache.Indexer) *storageClassClusterLister { return &storageClassClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type storageClassLister struct { // List lists all StorageClasses in the indexer for a workspace. func (s *storageClassLister) List(selector labels.Selector) (ret []*storagev1.StorageClass, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1.StorageClass) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1.StorageClass)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/storageclass_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/storageclass_expansion.go new file mode 100644 index 0000000000000..2d8414c1a5aac --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/storageclass_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// StorageClassClusterListerExpansion allows custom methods to be added to StorageClassClusterLister. +type StorageClassClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/volumeattachment.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/volumeattachment.go index fc1c89230ac42..e657eee40d975 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/volumeattachment.go +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/volumeattachment.go @@ -23,7 +23,7 @@ package v1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // VolumeAttachmentClusterLister can list VolumeAttachments across all workspaces, or scope down to a VolumeAttachmentLister for one workspace. +// All objects returned here must be treated as read-only. type VolumeAttachmentClusterLister interface { + // List lists all VolumeAttachments in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*storagev1.VolumeAttachment, err error) + // Cluster returns a lister that can list and get VolumeAttachments in one workspace. Cluster(cluster logicalcluster.Name) storagev1listers.VolumeAttachmentLister + VolumeAttachmentClusterListerExpansion } type volumeAttachmentClusterLister struct { @@ -43,6 +48,10 @@ type volumeAttachmentClusterLister struct { } // NewVolumeAttachmentClusterLister returns a new VolumeAttachmentClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewVolumeAttachmentClusterLister(indexer cache.Indexer) *volumeAttachmentClusterLister { return &volumeAttachmentClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type volumeAttachmentLister struct { // List lists all VolumeAttachments in the indexer for a workspace. func (s *volumeAttachmentLister) List(selector labels.Selector) (ret []*storagev1.VolumeAttachment, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1.VolumeAttachment) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1.VolumeAttachment)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1/volumeattachment_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/volumeattachment_expansion.go new file mode 100644 index 0000000000000..50f9b263f2a2b --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1/volumeattachment_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1 + +// VolumeAttachmentClusterListerExpansion allows custom methods to be added to VolumeAttachmentClusterLister. +type VolumeAttachmentClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1alpha1/csistoragecapacity.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1alpha1/csistoragecapacity.go index 6d4fa5e345115..bf77132a6cae8 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/storage/v1alpha1/csistoragecapacity.go +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1alpha1/csistoragecapacity.go @@ -23,20 +23,24 @@ package v1alpha1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1alpha1 "k8s.io/api/storage/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" storagev1alpha1listers "k8s.io/client-go/listers/storage/v1alpha1" "k8s.io/client-go/tools/cache" ) // CSIStorageCapacityClusterLister can list CSIStorageCapacities across all workspaces, or scope down to a CSIStorageCapacityLister for one workspace. +// All objects returned here must be treated as read-only. type CSIStorageCapacityClusterLister interface { + // List lists all CSIStorageCapacities in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*storagev1alpha1.CSIStorageCapacity, err error) + // Cluster returns a lister that can list and get CSIStorageCapacities in one workspace. Cluster(cluster logicalcluster.Name) storagev1alpha1listers.CSIStorageCapacityLister + CSIStorageCapacityClusterListerExpansion } type cSIStorageCapacityClusterLister struct { @@ -44,6 +48,11 @@ type cSIStorageCapacityClusterLister struct { } // NewCSIStorageCapacityClusterLister returns a new CSIStorageCapacityClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewCSIStorageCapacityClusterLister(indexer cache.Indexer) *cSIStorageCapacityClusterLister { return &cSIStorageCapacityClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type cSIStorageCapacityLister struct { // List lists all CSIStorageCapacities in the indexer for a workspace. func (s *cSIStorageCapacityLister) List(selector labels.Selector) (ret []*storagev1alpha1.CSIStorageCapacity, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1alpha1.CSIStorageCapacity) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1alpha1.CSIStorageCapacity)) + }) return ret, err } @@ -104,28 +98,9 @@ type cSIStorageCapacityNamespaceLister struct { // List lists all CSIStorageCapacities in the indexer for a given workspace and namespace. func (s *cSIStorageCapacityNamespaceLister) List(selector labels.Selector) (ret []*storagev1alpha1.CSIStorageCapacity, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1alpha1.CSIStorageCapacity) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1alpha1.CSIStorageCapacity)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1alpha1/csistoragecapacity_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1alpha1/csistoragecapacity_expansion.go new file mode 100644 index 0000000000000..44d25078fcbf7 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1alpha1/csistoragecapacity_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1alpha1 + +// CSIStorageCapacityClusterListerExpansion allows custom methods to be added to CSIStorageCapacityClusterLister. +type CSIStorageCapacityClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1alpha1/volumeattachment.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1alpha1/volumeattachment.go index 4d015d75af7d9..b68f69af504f0 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/storage/v1alpha1/volumeattachment.go +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1alpha1/volumeattachment.go @@ -23,7 +23,7 @@ package v1alpha1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1alpha1 "k8s.io/api/storage/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // VolumeAttachmentClusterLister can list VolumeAttachments across all workspaces, or scope down to a VolumeAttachmentLister for one workspace. +// All objects returned here must be treated as read-only. type VolumeAttachmentClusterLister interface { + // List lists all VolumeAttachments in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*storagev1alpha1.VolumeAttachment, err error) + // Cluster returns a lister that can list and get VolumeAttachments in one workspace. Cluster(cluster logicalcluster.Name) storagev1alpha1listers.VolumeAttachmentLister + VolumeAttachmentClusterListerExpansion } type volumeAttachmentClusterLister struct { @@ -43,6 +48,10 @@ type volumeAttachmentClusterLister struct { } // NewVolumeAttachmentClusterLister returns a new VolumeAttachmentClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewVolumeAttachmentClusterLister(indexer cache.Indexer) *volumeAttachmentClusterLister { return &volumeAttachmentClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type volumeAttachmentLister struct { // List lists all VolumeAttachments in the indexer for a workspace. func (s *volumeAttachmentLister) List(selector labels.Selector) (ret []*storagev1alpha1.VolumeAttachment, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1alpha1.VolumeAttachment) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1alpha1.VolumeAttachment)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1alpha1/volumeattachment_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1alpha1/volumeattachment_expansion.go new file mode 100644 index 0000000000000..b91ad6142ee59 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1alpha1/volumeattachment_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1alpha1 + +// VolumeAttachmentClusterListerExpansion allows custom methods to be added to VolumeAttachmentClusterLister. +type VolumeAttachmentClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csidriver.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csidriver.go index e323ee0daaeaa..d10b3dbe40dcd 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csidriver.go +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csidriver.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // CSIDriverClusterLister can list CSIDrivers across all workspaces, or scope down to a CSIDriverLister for one workspace. +// All objects returned here must be treated as read-only. type CSIDriverClusterLister interface { + // List lists all CSIDrivers in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*storagev1beta1.CSIDriver, err error) + // Cluster returns a lister that can list and get CSIDrivers in one workspace. Cluster(cluster logicalcluster.Name) storagev1beta1listers.CSIDriverLister + CSIDriverClusterListerExpansion } type cSIDriverClusterLister struct { @@ -43,6 +48,10 @@ type cSIDriverClusterLister struct { } // NewCSIDriverClusterLister returns a new CSIDriverClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewCSIDriverClusterLister(indexer cache.Indexer) *cSIDriverClusterLister { return &cSIDriverClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type cSIDriverLister struct { // List lists all CSIDrivers in the indexer for a workspace. func (s *cSIDriverLister) List(selector labels.Selector) (ret []*storagev1beta1.CSIDriver, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1beta1.CSIDriver) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1beta1.CSIDriver)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csidriver_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csidriver_expansion.go new file mode 100644 index 0000000000000..228c7b274b005 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csidriver_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// CSIDriverClusterListerExpansion allows custom methods to be added to CSIDriverClusterLister. +type CSIDriverClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csinode.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csinode.go index 992bcfe860d9a..1373b2a32262a 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csinode.go +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csinode.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // CSINodeClusterLister can list CSINodes across all workspaces, or scope down to a CSINodeLister for one workspace. +// All objects returned here must be treated as read-only. type CSINodeClusterLister interface { + // List lists all CSINodes in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*storagev1beta1.CSINode, err error) + // Cluster returns a lister that can list and get CSINodes in one workspace. Cluster(cluster logicalcluster.Name) storagev1beta1listers.CSINodeLister + CSINodeClusterListerExpansion } type cSINodeClusterLister struct { @@ -43,6 +48,10 @@ type cSINodeClusterLister struct { } // NewCSINodeClusterLister returns a new CSINodeClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewCSINodeClusterLister(indexer cache.Indexer) *cSINodeClusterLister { return &cSINodeClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type cSINodeLister struct { // List lists all CSINodes in the indexer for a workspace. func (s *cSINodeLister) List(selector labels.Selector) (ret []*storagev1beta1.CSINode, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1beta1.CSINode) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1beta1.CSINode)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csinode_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csinode_expansion.go new file mode 100644 index 0000000000000..97e83410a3e57 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csinode_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// CSINodeClusterListerExpansion allows custom methods to be added to CSINodeClusterLister. +type CSINodeClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csistoragecapacity.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csistoragecapacity.go index 790fb1c037881..df345c1e23d49 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csistoragecapacity.go +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csistoragecapacity.go @@ -23,20 +23,24 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" storagev1beta1listers "k8s.io/client-go/listers/storage/v1beta1" "k8s.io/client-go/tools/cache" ) // CSIStorageCapacityClusterLister can list CSIStorageCapacities across all workspaces, or scope down to a CSIStorageCapacityLister for one workspace. +// All objects returned here must be treated as read-only. type CSIStorageCapacityClusterLister interface { + // List lists all CSIStorageCapacities in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*storagev1beta1.CSIStorageCapacity, err error) + // Cluster returns a lister that can list and get CSIStorageCapacities in one workspace. Cluster(cluster logicalcluster.Name) storagev1beta1listers.CSIStorageCapacityLister + CSIStorageCapacityClusterListerExpansion } type cSIStorageCapacityClusterLister struct { @@ -44,6 +48,11 @@ type cSIStorageCapacityClusterLister struct { } // NewCSIStorageCapacityClusterLister returns a new CSIStorageCapacityClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index +// - has the kcpcache.ClusterAndNamespaceIndex as an index func NewCSIStorageCapacityClusterLister(indexer cache.Indexer) *cSIStorageCapacityClusterLister { return &cSIStorageCapacityClusterLister{indexer: indexer} } @@ -69,24 +78,9 @@ type cSIStorageCapacityLister struct { // List lists all CSIStorageCapacities in the indexer for a workspace. func (s *cSIStorageCapacityLister) List(selector labels.Selector) (ret []*storagev1beta1.CSIStorageCapacity, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1beta1.CSIStorageCapacity) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1beta1.CSIStorageCapacity)) + }) return ret, err } @@ -104,28 +98,9 @@ type cSIStorageCapacityNamespaceLister struct { // List lists all CSIStorageCapacities in the indexer for a given workspace and namespace. func (s *cSIStorageCapacityNamespaceLister) List(selector labels.Selector) (ret []*storagev1beta1.CSIStorageCapacity, err error) { - selectAll := selector == nil || selector.Empty() - - var list []interface{} - if s.namespace == metav1.NamespaceAll { - list, err = s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - } else { - list, err = s.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(s.cluster, s.namespace)) - } - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1beta1.CSIStorageCapacity) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } + err = kcpcache.ListAllByClusterAndNamespace(s.indexer, s.cluster, s.namespace, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1beta1.CSIStorageCapacity)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csistoragecapacity_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csistoragecapacity_expansion.go new file mode 100644 index 0000000000000..82fc7075a9b86 --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/csistoragecapacity_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// CSIStorageCapacityClusterListerExpansion allows custom methods to be added to CSIStorageCapacityClusterLister. +type CSIStorageCapacityClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/storageclass.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/storageclass.go index 967cddafd846e..c7b1ef13c0cb7 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/storageclass.go +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/storageclass.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // StorageClassClusterLister can list StorageClasses across all workspaces, or scope down to a StorageClassLister for one workspace. +// All objects returned here must be treated as read-only. type StorageClassClusterLister interface { + // List lists all StorageClasses in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*storagev1beta1.StorageClass, err error) + // Cluster returns a lister that can list and get StorageClasses in one workspace. Cluster(cluster logicalcluster.Name) storagev1beta1listers.StorageClassLister + StorageClassClusterListerExpansion } type storageClassClusterLister struct { @@ -43,6 +48,10 @@ type storageClassClusterLister struct { } // NewStorageClassClusterLister returns a new StorageClassClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewStorageClassClusterLister(indexer cache.Indexer) *storageClassClusterLister { return &storageClassClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type storageClassLister struct { // List lists all StorageClasses in the indexer for a workspace. func (s *storageClassLister) List(selector labels.Selector) (ret []*storagev1beta1.StorageClass, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1beta1.StorageClass) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1beta1.StorageClass)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/storageclass_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/storageclass_expansion.go new file mode 100644 index 0000000000000..9ab464b009fac --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/storageclass_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// StorageClassClusterListerExpansion allows custom methods to be added to StorageClassClusterLister. +type StorageClassClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/volumeattachment.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/volumeattachment.go index 8f10245ff35b4..209e052bb12b3 100644 --- a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/volumeattachment.go +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/volumeattachment.go @@ -23,7 +23,7 @@ package v1beta1 import ( kcpcache "github.com/kcp-dev/apimachinery/pkg/cache" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" storagev1beta1 "k8s.io/api/storage/v1beta1" "k8s.io/apimachinery/pkg/api/errors" @@ -33,9 +33,14 @@ import ( ) // VolumeAttachmentClusterLister can list VolumeAttachments across all workspaces, or scope down to a VolumeAttachmentLister for one workspace. +// All objects returned here must be treated as read-only. type VolumeAttachmentClusterLister interface { + // List lists all VolumeAttachments in the indexer. + // Objects returned here must be treated as read-only. List(selector labels.Selector) (ret []*storagev1beta1.VolumeAttachment, err error) + // Cluster returns a lister that can list and get VolumeAttachments in one workspace. Cluster(cluster logicalcluster.Name) storagev1beta1listers.VolumeAttachmentLister + VolumeAttachmentClusterListerExpansion } type volumeAttachmentClusterLister struct { @@ -43,6 +48,10 @@ type volumeAttachmentClusterLister struct { } // NewVolumeAttachmentClusterLister returns a new VolumeAttachmentClusterLister. +// We assume that the indexer: +// - is fed by a cross-workspace LIST+WATCH +// - uses kcpcache.MetaClusterNamespaceKeyFunc as the key function +// - has the kcpcache.ClusterIndex as an index func NewVolumeAttachmentClusterLister(indexer cache.Indexer) *volumeAttachmentClusterLister { return &volumeAttachmentClusterLister{indexer: indexer} } @@ -68,24 +77,9 @@ type volumeAttachmentLister struct { // List lists all VolumeAttachments in the indexer for a workspace. func (s *volumeAttachmentLister) List(selector labels.Selector) (ret []*storagev1beta1.VolumeAttachment, err error) { - selectAll := selector == nil || selector.Empty() - - list, err := s.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(s.cluster)) - if err != nil { - return nil, err - } - - for i := range list { - obj := list[i].(*storagev1beta1.VolumeAttachment) - if selectAll { - ret = append(ret, obj) - } else { - if selector.Matches(labels.Set(obj.GetLabels())) { - ret = append(ret, obj) - } - } - } - + err = kcpcache.ListAllByCluster(s.indexer, s.cluster, selector, func(i interface{}) { + ret = append(ret, i.(*storagev1beta1.VolumeAttachment)) + }) return ret, err } diff --git a/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/volumeattachment_expansion.go b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/volumeattachment_expansion.go new file mode 100644 index 0000000000000..f0bac78ba07aa --- /dev/null +++ b/vendor/github.com/kcp-dev/client-go/listers/storage/v1beta1/volumeattachment_expansion.go @@ -0,0 +1,25 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Code generated by kcp code-generator. DO NOT EDIT. + +package v1beta1 + +// VolumeAttachmentClusterListerExpansion allows custom methods to be added to VolumeAttachmentClusterLister. +type VolumeAttachmentClusterListerExpansion interface{} diff --git a/vendor/github.com/kcp-dev/client-go/metadata/clientset.go b/vendor/github.com/kcp-dev/client-go/metadata/clientset.go index 1dbe650c1704d..32b6a08f1f302 100644 --- a/vendor/github.com/kcp-dev/client-go/metadata/clientset.go +++ b/vendor/github.com/kcp-dev/client-go/metadata/clientset.go @@ -22,7 +22,7 @@ import ( "net/http" kcpclient "github.com/kcp-dev/apimachinery/pkg/client" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" @@ -39,8 +39,8 @@ type ClusterClientset struct { } // Cluster scopes the client down to a particular cluster. -func (c *ClusterClientset) Cluster(name logicalcluster.Name) metadata.Interface { - return c.clientCache.ClusterOrDie(name) +func (c *ClusterClientset) Cluster(path logicalcluster.Path) metadata.Interface { + return c.clientCache.ClusterOrDie(path) } func (c *ClusterClientset) Resource(resource schema.GroupVersionResource) ResourceClusterInterface { @@ -107,8 +107,8 @@ type ClusterResourceClient struct { } // Cluster scopes the client down to a particular cluster. -func (c *ClusterResourceClient) Cluster(name logicalcluster.Name) metadata.Getter { - if name == logicalcluster.Wildcard { +func (c *ClusterResourceClient) Cluster(name logicalcluster.Path) metadata.Getter { + if name == logicalcluster.WildcardPath { panic("A specific cluster must be provided when scoping, not the wildcard.") } @@ -117,10 +117,10 @@ func (c *ClusterResourceClient) Cluster(name logicalcluster.Name) metadata.Gette // List returns the entire collection of all resources across all clusters. func (c *ClusterResourceClient) List(ctx context.Context, opts metav1.ListOptions) (*metav1.PartialObjectMetadataList, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Resource(c.resource).List(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Resource(c.resource).List(ctx, opts) } // Watch begins to watch all resources across all clusters. func (c *ClusterResourceClient) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.clientCache.ClusterOrDie(logicalcluster.Wildcard).Resource(c.resource).Watch(ctx, opts) + return c.clientCache.ClusterOrDie(logicalcluster.WildcardPath).Resource(c.resource).Watch(ctx, opts) } diff --git a/vendor/github.com/kcp-dev/client-go/metadata/interface.go b/vendor/github.com/kcp-dev/client-go/metadata/interface.go index 852f76be3661d..3f81515c8f92c 100644 --- a/vendor/github.com/kcp-dev/client-go/metadata/interface.go +++ b/vendor/github.com/kcp-dev/client-go/metadata/interface.go @@ -19,7 +19,7 @@ package metadata import ( "context" - "github.com/kcp-dev/logicalcluster/v2" + "github.com/kcp-dev/logicalcluster/v3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" @@ -28,12 +28,12 @@ import ( ) type ClusterInterface interface { - Cluster(logicalcluster.Name) metadata.Interface + Cluster(logicalcluster.Path) metadata.Interface Resource(resource schema.GroupVersionResource) ResourceClusterInterface } type ResourceClusterInterface interface { - Cluster(logicalcluster.Name) metadata.Getter + Cluster(logicalcluster.Path) metadata.Getter List(ctx context.Context, opts metav1.ListOptions) (*metav1.PartialObjectMetadataList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) } diff --git a/vendor/github.com/kcp-dev/logicalcluster/v3/.ci-operator.yaml b/vendor/github.com/kcp-dev/logicalcluster/v3/.ci-operator.yaml new file mode 100644 index 0000000000000..b5bc5371324cb --- /dev/null +++ b/vendor/github.com/kcp-dev/logicalcluster/v3/.ci-operator.yaml @@ -0,0 +1,4 @@ +build_root_image: + namespace: ci + name: kcp-dev-build-root + tag: "1.18" diff --git a/vendor/github.com/kcp-dev/logicalcluster/v3/.gitignore b/vendor/github.com/kcp-dev/logicalcluster/v3/.gitignore new file mode 100644 index 0000000000000..8ccb26f1673b3 --- /dev/null +++ b/vendor/github.com/kcp-dev/logicalcluster/v3/.gitignore @@ -0,0 +1,20 @@ +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, built with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Dependency directories +vendor/ + +# IDE files +.idea + +hack/tools diff --git a/vendor/github.com/kcp-dev/logicalcluster/v3/CONTRIBUTING.md b/vendor/github.com/kcp-dev/logicalcluster/v3/CONTRIBUTING.md new file mode 100644 index 0000000000000..6a1f17597f030 --- /dev/null +++ b/vendor/github.com/kcp-dev/logicalcluster/v3/CONTRIBUTING.md @@ -0,0 +1,11 @@ +# Contributing to logicalcluster + +kcp is [Apache 2.0 licensed](LICENSE) and we accept contributions via +GitHub pull requests. + +## Certificate of Origin + +By contributing to this project you agree to the Developer Certificate of +Origin (DCO). This document was created by the Linux Kernel community and is a +simple statement that you, as a contributor, have the legal right to make the +contribution. See the [DCO](DCO) file for details. \ No newline at end of file diff --git a/vendor/github.com/kcp-dev/logicalcluster/v3/DCO b/vendor/github.com/kcp-dev/logicalcluster/v3/DCO new file mode 100644 index 0000000000000..d950df0c3f68c --- /dev/null +++ b/vendor/github.com/kcp-dev/logicalcluster/v3/DCO @@ -0,0 +1,34 @@ +Developer Certificate of Origin +Version 1.1 + +Copyright (C) 2004, 2006 The Linux Foundation and its contributors. + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + + +Developer's Certificate of Origin 1.1 + +By making a contribution to this project, I certify that: + +(a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + +(b) The contribution is based upon previous work that, to the best + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + +(c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + +(d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including all + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved. \ No newline at end of file diff --git a/vendor/github.com/kcp-dev/logicalcluster/v3/LICENSE b/vendor/github.com/kcp-dev/logicalcluster/v3/LICENSE new file mode 100644 index 0000000000000..d645695673349 --- /dev/null +++ b/vendor/github.com/kcp-dev/logicalcluster/v3/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/kcp-dev/logicalcluster/v3/Makefile b/vendor/github.com/kcp-dev/logicalcluster/v3/Makefile new file mode 100644 index 0000000000000..b0de3b419eba5 --- /dev/null +++ b/vendor/github.com/kcp-dev/logicalcluster/v3/Makefile @@ -0,0 +1,52 @@ +# Copyright 2022 The KCP Authors. +# +# 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 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +SHELL := /usr/bin/env bash + +GO_INSTALL = ./hack/go-install.sh + +TOOLS_DIR=hack/tools +GOBIN_DIR := $(abspath $(TOOLS_DIR)) + +GOLANGCI_LINT_VER := v1.44.2 +GOLANGCI_LINT_BIN := golangci-lint +GOLANGCI_LINT := $(GOBIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER) + +$(GOLANGCI_LINT): + GOBIN=$(GOBIN_DIR) $(GO_INSTALL) github.com/golangci/golangci-lint/cmd/golangci-lint $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER) + +$(TOOLS_DIR)/verify_boilerplate.py: + mkdir -p $(TOOLS_DIR) + curl --fail --retry 3 -L -o $(TOOLS_DIR)/verify_boilerplate.py https://raw.githubusercontent.com/kubernetes/repo-infra/master/hack/verify_boilerplate.py + chmod +x $(TOOLS_DIR)/verify_boilerplate.py + +.PHONY: verify-boilerplate +verify-boilerplate: $(TOOLS_DIR)/verify_boilerplate.py + $(TOOLS_DIR)/verify_boilerplate.py --boilerplate-dir=hack/boilerplate + +.PHONY: verify-imports +verify-imports: + hack/reject-k8s-imports.sh + +.PHONY: lint +lint: $(GOLANGCI_LINT) + $(GOLANGCI_LINT) run --timeout=10m ./... + +.PHONY: test +test: + go test ./... + +.PHONY: help +help: ## Show this help. + @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' diff --git a/vendor/github.com/kcp-dev/logicalcluster/v3/OWNERS b/vendor/github.com/kcp-dev/logicalcluster/v3/OWNERS new file mode 100644 index 0000000000000..f6b0fc3d4e975 --- /dev/null +++ b/vendor/github.com/kcp-dev/logicalcluster/v3/OWNERS @@ -0,0 +1,5 @@ +approvers: +- ncdc +- sttts +- stevekuznetsov +- davidfestal diff --git a/vendor/github.com/kcp-dev/logicalcluster/v3/README.md b/vendor/github.com/kcp-dev/logicalcluster/v3/README.md new file mode 100644 index 0000000000000..812993e28fcf1 --- /dev/null +++ b/vendor/github.com/kcp-dev/logicalcluster/v3/README.md @@ -0,0 +1,5 @@ +# logicalcluster + +A library for logical-cluster-aware code. + +For contributions, issues, or general discussion, please see the [kcp repository](https://github.com/kcp-dev/kcp). diff --git a/vendor/github.com/kcp-dev/logicalcluster/v3/context.go b/vendor/github.com/kcp-dev/logicalcluster/v3/context.go new file mode 100644 index 0000000000000..08b169a565b49 --- /dev/null +++ b/vendor/github.com/kcp-dev/logicalcluster/v3/context.go @@ -0,0 +1,36 @@ +/* +Copyright 2022 The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package logicalcluster + +import "context" + +type key int + +const ( + keyCluster key = iota +) + +// WithCluster injects a cluster name into a context +func WithCluster(ctx context.Context, cluster Name) context.Context { + return context.WithValue(ctx, keyCluster, cluster) +} + +// ClusterFromContext extracts a cluster name from the context +func ClusterFromContext(ctx context.Context) (Name, bool) { + s, ok := ctx.Value(keyCluster).(Name) + return s, ok +} diff --git a/vendor/github.com/kcp-dev/logicalcluster/v3/go.mod b/vendor/github.com/kcp-dev/logicalcluster/v3/go.mod new file mode 100644 index 0000000000000..79cbc5dcd4b79 --- /dev/null +++ b/vendor/github.com/kcp-dev/logicalcluster/v3/go.mod @@ -0,0 +1,3 @@ +module github.com/kcp-dev/logicalcluster/v3 + +go 1.18 diff --git a/vendor/github.com/kcp-dev/logicalcluster/v3/go.sum b/vendor/github.com/kcp-dev/logicalcluster/v3/go.sum new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/vendor/github.com/kcp-dev/logicalcluster/v3/name.go b/vendor/github.com/kcp-dev/logicalcluster/v3/name.go new file mode 100644 index 0000000000000..9969625fc18b5 --- /dev/null +++ b/vendor/github.com/kcp-dev/logicalcluster/v3/name.go @@ -0,0 +1,77 @@ +/* +Copyright 2022 The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package logicalcluster + +import "regexp" + +var ( + // Wildcard is the Name indicating cross-workspace requests. + Wildcard = Name{"*"} + + clusterNameRegExp = regexp.MustCompile(clusterNameString) +) + +const ( + clusterNameString string = "^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?" +) + +// Name represent a cluster name. A cluster name +// 1. can be used to access a cluster via `/cluster/` +// 2. is part of an etcd key path +// 3. is used to uniquely reference a logical cluster. There is at most one cluster name for a logical cluster, but many logical cluster string can point to the same cluster name. +type Name struct { + value string +} + +// NewName returns a Name from a string. +func NewName(value string) Name { + return Name{value} +} + +// Path returns a Path (a logical cluster) out of the Name +func (n Name) Path() Path { + return New(n.value) +} + +// String returns the string representation of the cluster name. +func (n Name) String() string { + return n.value +} + +// IsValid returns true if the name is a Wildcard starts with a lower-case letter and contains only lower-case letters, digits and hyphens. +func (n Name) IsValid() bool { + return n.value == "*" || clusterNameRegExp.MatchString(n.value) +} + +// Empty returns true if the cluster name is unset. +func (n Name) Empty() bool { + return n.value == "" +} + +// Object is a local interface representation of the Kubernetes metav1.Object, to avoid dependencies on +// k8s.io/apimachinery. +type Object interface { + GetAnnotations() map[string]string +} + +// AnnotationKey is the name of the annotation key used to denote an object's logical cluster. +const AnnotationKey = "kcp.dev/cluster" + +// From returns the logical cluster name for obj. +func From(obj Object) Name { + return Name{obj.GetAnnotations()[AnnotationKey]} +} diff --git a/vendor/github.com/kcp-dev/logicalcluster/v3/path.go b/vendor/github.com/kcp-dev/logicalcluster/v3/path.go new file mode 100644 index 0000000000000..4a9f068f0c4da --- /dev/null +++ b/vendor/github.com/kcp-dev/logicalcluster/v3/path.go @@ -0,0 +1,146 @@ +/* +Copyright 2022 The KCP Authors. + +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 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package logicalcluster + +import ( + "encoding/json" + "path" + "regexp" + "strings" +) + +var ( + // WildcardPath is the Path indicating cross-workspace requests. + WildcardPath = Path{"*"} + + // None is the name indicating a cluster-unaware context. + None = New("") + + // TODO is a value created by automated refactoring tools that should be replaced by a real Name. + TODO = None +) + +const ( + + // ClusterHeader set to "" on a request is an alternative to accessing the + // cluster via /clusters/. With that the can be access via normal kube-like + // /api and /apis endpoints. + ClusterHeader = "X-Kubernetes-Cluster" + + separator = ":" +) + +// Path represents a colon separated list of words describing a path in a logical cluster hierarchy, like a file path in a file-system. +type Path struct { + value string +} + +// New returns a Path from a string. +func New(value string) Path { + return Path{value} +} + +// NewValidated returns a Path from a string and whether it is a valid logical cluster. +// A valid logical cluster returns true on IsValid(). +func NewValidated(value string) (Path, bool) { + n := Path{value} + return n, n.IsValid() +} + +// Empty returns true if the logical cluster value is unset. +func (n Path) Empty() bool { + return n.value == "" +} + +// Name translates a logical cluster (a Path) into a Name. +// If the Path has a parent we cannot translate into a valid Name. +// Otherwise, the Path becomes a Name. +func (n Path) Name() (Name, bool) { + if _, hasParent := n.Parent(); hasParent { + return Name{}, false + } + return NewName(n.value), true +} + +// RequestPath returns a path segment for the logical cluster to access its API. +func (n Path) RequestPath() string { + return path.Join("/clusters", n.value) +} + +// String returns the string representation of the logical cluster name. +func (n Path) String() string { + return n.value +} + +// Parent returns the parent logical cluster name of the given logical cluster name. +func (n Path) Parent() (Path, bool) { + parent, _ := n.Split() + return parent, parent.value != "" +} + +// Split splits logical cluster immediately following the final colon, +// separating it into a parent logical cluster and name component. +// If there is no colon in path, Split returns an empty logical cluster name +// and name set to path. +func (n Path) Split() (parent Path, name string) { + i := strings.LastIndex(n.value, separator) + if i < 0 { + return Path{}, n.value + } + return Path{n.value[:i]}, n.value[i+1:] +} + +// Base returns the last component of the logical cluster name. +func (n Path) Base() string { + _, name := n.Split() + return name +} + +// Join joins a parent logical cluster name and a name component. +func (n Path) Join(name string) Path { + if n.value == "" { + return Path{name} + } + return Path{n.value + separator + name} +} + +func (n Path) MarshalJSON() ([]byte, error) { + return json.Marshal(&n.value) +} + +func (n *Path) UnmarshalJSON(data []byte) error { + var s string + if err := json.Unmarshal(data, &s); err != nil { + return err + } + n.value = s + return nil +} + +func (n Path) HasPrefix(other Path) bool { + return strings.HasPrefix(n.value, other.value) +} + +const lclusterNameFmt string = "[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?" + +var lclusterRegExp = regexp.MustCompile("^" + lclusterNameFmt + "(:" + lclusterNameFmt + ")*$") + +// IsValid returns true if the name is a Wildcard or a colon separated list of words where each word +// starts with a lower-case letter and contains only lower-case letters, digits and hyphens. +func (n Path) IsValid() bool { + return lclusterRegExp.MatchString(n.value) +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 1a5d55c4205be..282be750b0eef 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -482,12 +482,12 @@ github.com/josharian/intern github.com/json-iterator/go # github.com/karrick/godirwalk v1.16.1 => github.com/karrick/godirwalk v1.16.1 github.com/karrick/godirwalk -# github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be => github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be +# github.com/kcp-dev/apimachinery v0.0.0-20221205120156-b90e084cbd56 => github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 ## explicit github.com/kcp-dev/apimachinery/pkg/cache github.com/kcp-dev/apimachinery/pkg/client github.com/kcp-dev/apimachinery/third_party/informers -# github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 => github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 +# github.com/kcp-dev/client-go v0.0.0-20221205150201-dfa4fc4b06bb => github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb ## explicit github.com/kcp-dev/client-go/informers github.com/kcp-dev/client-go/informers/admissionregistration @@ -642,6 +642,9 @@ github.com/kcp-dev/client-go/third_party/k8s.io/client-go/tools/cache # github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 => github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 ## explicit github.com/kcp-dev/logicalcluster/v2 +# github.com/kcp-dev/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 => github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 +## explicit +github.com/kcp-dev/logicalcluster/v3 # github.com/libopenstorage/openstorage v1.0.0 => github.com/libopenstorage/openstorage v1.0.0 ## explicit github.com/libopenstorage/openstorage/api @@ -2755,9 +2758,10 @@ sigs.k8s.io/yaml # github.com/julienschmidt/httprouter => github.com/julienschmidt/httprouter v1.3.0 # github.com/jung-kurt/gofpdf => github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5 # github.com/karrick/godirwalk => github.com/karrick/godirwalk v1.16.1 -# github.com/kcp-dev/apimachinery => github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be -# github.com/kcp-dev/client-go => github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 +# github.com/kcp-dev/apimachinery => github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 +# github.com/kcp-dev/client-go => github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb # github.com/kcp-dev/logicalcluster/v2 => github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 +# github.com/kcp-dev/logicalcluster/v3 => github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 # github.com/kisielk/errcheck => github.com/kisielk/errcheck v1.5.0 # github.com/kisielk/gotool => github.com/kisielk/gotool v1.0.0 # github.com/konsorten/go-windows-terminal-sequences => github.com/konsorten/go-windows-terminal-sequences v1.0.2