diff --git a/Makefile b/Makefile index 74fe9b28b..c4dabb826 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ TMPDIR := $(shell mktemp -d) CODE_GENERATOR_VER := v2.4.0 CODE_GENERATOR_BIN := code-generator -CODE_GENERATOR := $(TOOLS_DIR)/$(CODE_GENERATOR_BIN)-$(CODE_GENERATOR_VER) +CODE_GENERATOR := go run github.com/ntnn/kcp-code-generator/v2@v2.3.1-0.20250502174131-b2154dca874d export CODE_GENERATOR # so hack scripts can use it $(CODE_GENERATOR): diff --git a/apiextensions/listers/apiextensions/v1/customresourcedefinition_expansion.go b/apiextensions/listers/apiextensions/v1/customresourcedefinition_expansion.go index 0ec8ae5e7..83f3da029 100644 --- a/apiextensions/listers/apiextensions/v1/customresourcedefinition_expansion.go +++ b/apiextensions/listers/apiextensions/v1/customresourcedefinition_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/apiextensions/listers/apiextensions/v1beta1/customresourcedefinition_expansion.go b/apiextensions/listers/apiextensions/v1beta1/customresourcedefinition_expansion.go index aa4933a72..92dccdcb6 100644 --- a/apiextensions/listers/apiextensions/v1beta1/customresourcedefinition_expansion.go +++ b/apiextensions/listers/apiextensions/v1beta1/customresourcedefinition_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/go.mod b/go.mod index 7d217408e..5d1660326 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,10 @@ require ( k8s.io/klog/v2 v2.130.1 ) +replace github.com/kcp-dev/apimachinery/v2 => github.com/ntnn/kcp-apimachinery/v2 v2.0.1-0.20250428144613-bc81e2899ce5 + +replace github.com/kcp-dev/code-generator/v2 => github.com/ntnn/kcp-code-generator/v2 v2.3.1-0.20250502174131-b2154dca874d + require ( cel.dev/expr v0.19.1 // indirect github.com/antlr4-go/antlr/v4 v4.13.1 // indirect diff --git a/go.sum b/go.sum index 031a2964c..743a5e5da 100644 --- a/go.sum +++ b/go.sum @@ -72,8 +72,6 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= 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/kcp-dev/apimachinery/v2 v2.0.1-0.20250207161408-e1833e4a94f2 h1:6MeV6CBJhNxF3DhkdwhcqeyEc8Al2MGeKFNA0O95icc= -github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250207161408-e1833e4a94f2/go.mod h1:jnMZxVnCuKlkIXc4J1Qtmy1Lyo171CDF/RQhNAo0tvA= github.com/kcp-dev/logicalcluster/v3 v3.0.5 h1:JbYakokb+5Uinz09oTXomSUJVQsqfxEvU4RyHUYxHOU= github.com/kcp-dev/logicalcluster/v3 v3.0.5/go.mod h1:EWBUBxdr49fUB1cLMO4nOdBWmYifLbP1LfoL20KkXYY= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -95,6 +93,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= 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/ntnn/kcp-apimachinery/v2 v2.0.1-0.20250428144613-bc81e2899ce5 h1:mX0T75UptYapqS2S9FGpFv9Ot3d3Igu5WQdvqXNwJxg= +github.com/ntnn/kcp-apimachinery/v2 v2.0.1-0.20250428144613-bc81e2899ce5/go.mod h1:jnMZxVnCuKlkIXc4J1Qtmy1Lyo171CDF/RQhNAo0tvA= github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= diff --git a/listers/admissionregistration/v1/mutatingwebhookconfiguration_expansion.go b/listers/admissionregistration/v1/mutatingwebhookconfiguration_expansion.go index ad9ad945b..a5e155e39 100644 --- a/listers/admissionregistration/v1/mutatingwebhookconfiguration_expansion.go +++ b/listers/admissionregistration/v1/mutatingwebhookconfiguration_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/admissionregistration/v1/validatingadmissionpolicy_expansion.go b/listers/admissionregistration/v1/validatingadmissionpolicy_expansion.go index 29fbe81fa..726ce2ea4 100644 --- a/listers/admissionregistration/v1/validatingadmissionpolicy_expansion.go +++ b/listers/admissionregistration/v1/validatingadmissionpolicy_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/admissionregistration/v1/validatingadmissionpolicybinding_expansion.go b/listers/admissionregistration/v1/validatingadmissionpolicybinding_expansion.go index 0adb47da3..d1deade29 100644 --- a/listers/admissionregistration/v1/validatingadmissionpolicybinding_expansion.go +++ b/listers/admissionregistration/v1/validatingadmissionpolicybinding_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/admissionregistration/v1/validatingwebhookconfiguration_expansion.go b/listers/admissionregistration/v1/validatingwebhookconfiguration_expansion.go index bb551f8ed..f7aa161de 100644 --- a/listers/admissionregistration/v1/validatingwebhookconfiguration_expansion.go +++ b/listers/admissionregistration/v1/validatingwebhookconfiguration_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/admissionregistration/v1alpha1/validatingadmissionpolicy_expansion.go b/listers/admissionregistration/v1alpha1/validatingadmissionpolicy_expansion.go index edbb3d388..d9b418cd5 100644 --- a/listers/admissionregistration/v1alpha1/validatingadmissionpolicy_expansion.go +++ b/listers/admissionregistration/v1alpha1/validatingadmissionpolicy_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/admissionregistration/v1alpha1/validatingadmissionpolicybinding_expansion.go b/listers/admissionregistration/v1alpha1/validatingadmissionpolicybinding_expansion.go index b08ac3f77..ee8b51134 100644 --- a/listers/admissionregistration/v1alpha1/validatingadmissionpolicybinding_expansion.go +++ b/listers/admissionregistration/v1alpha1/validatingadmissionpolicybinding_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/admissionregistration/v1beta1/mutatingwebhookconfiguration_expansion.go b/listers/admissionregistration/v1beta1/mutatingwebhookconfiguration_expansion.go index cb7937733..dc0b6257a 100644 --- a/listers/admissionregistration/v1beta1/mutatingwebhookconfiguration_expansion.go +++ b/listers/admissionregistration/v1beta1/mutatingwebhookconfiguration_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/admissionregistration/v1beta1/validatingadmissionpolicy_expansion.go b/listers/admissionregistration/v1beta1/validatingadmissionpolicy_expansion.go index e954f6319..b5632aad5 100644 --- a/listers/admissionregistration/v1beta1/validatingadmissionpolicy_expansion.go +++ b/listers/admissionregistration/v1beta1/validatingadmissionpolicy_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/admissionregistration/v1beta1/validatingadmissionpolicybinding_expansion.go b/listers/admissionregistration/v1beta1/validatingadmissionpolicybinding_expansion.go index ccfd6a32d..00a24cabb 100644 --- a/listers/admissionregistration/v1beta1/validatingadmissionpolicybinding_expansion.go +++ b/listers/admissionregistration/v1beta1/validatingadmissionpolicybinding_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/admissionregistration/v1beta1/validatingwebhookconfiguration_expansion.go b/listers/admissionregistration/v1beta1/validatingwebhookconfiguration_expansion.go index ce50f471d..f3e99e6fb 100644 --- a/listers/admissionregistration/v1beta1/validatingwebhookconfiguration_expansion.go +++ b/listers/admissionregistration/v1beta1/validatingwebhookconfiguration_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/apiserverinternal/v1alpha1/storageversion_expansion.go b/listers/apiserverinternal/v1alpha1/storageversion_expansion.go index 63038d3f2..8e2db395c 100644 --- a/listers/apiserverinternal/v1alpha1/storageversion_expansion.go +++ b/listers/apiserverinternal/v1alpha1/storageversion_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/apps/v1/controllerrevision_expansion.go b/listers/apps/v1/controllerrevision_expansion.go index 121e47ec6..066da888a 100644 --- a/listers/apps/v1/controllerrevision_expansion.go +++ b/listers/apps/v1/controllerrevision_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/apps/v1/deployment_expansion.go b/listers/apps/v1/deployment_expansion.go index b0dcdac73..eb37c3f65 100644 --- a/listers/apps/v1/deployment_expansion.go +++ b/listers/apps/v1/deployment_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/apps/v1beta1/controllerrevision_expansion.go b/listers/apps/v1beta1/controllerrevision_expansion.go index c0745283c..431159d57 100644 --- a/listers/apps/v1beta1/controllerrevision_expansion.go +++ b/listers/apps/v1beta1/controllerrevision_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/apps/v1beta1/deployment_expansion.go b/listers/apps/v1beta1/deployment_expansion.go index 11a6cf51c..3c43c24f7 100644 --- a/listers/apps/v1beta1/deployment_expansion.go +++ b/listers/apps/v1beta1/deployment_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/apps/v1beta2/controllerrevision_expansion.go b/listers/apps/v1beta2/controllerrevision_expansion.go index 0bb948b3e..6dc8757e2 100644 --- a/listers/apps/v1beta2/controllerrevision_expansion.go +++ b/listers/apps/v1beta2/controllerrevision_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/apps/v1beta2/deployment_expansion.go b/listers/apps/v1beta2/deployment_expansion.go index df847acec..9464078de 100644 --- a/listers/apps/v1beta2/deployment_expansion.go +++ b/listers/apps/v1beta2/deployment_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/autoscaling/v1/horizontalpodautoscaler_expansion.go b/listers/autoscaling/v1/horizontalpodautoscaler_expansion.go index 65785806b..860110654 100644 --- a/listers/autoscaling/v1/horizontalpodautoscaler_expansion.go +++ b/listers/autoscaling/v1/horizontalpodautoscaler_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/autoscaling/v2/horizontalpodautoscaler_expansion.go b/listers/autoscaling/v2/horizontalpodautoscaler_expansion.go index f186ef85d..57334c551 100644 --- a/listers/autoscaling/v2/horizontalpodautoscaler_expansion.go +++ b/listers/autoscaling/v2/horizontalpodautoscaler_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/autoscaling/v2beta1/horizontalpodautoscaler_expansion.go b/listers/autoscaling/v2beta1/horizontalpodautoscaler_expansion.go index 30954c982..d7993a256 100644 --- a/listers/autoscaling/v2beta1/horizontalpodautoscaler_expansion.go +++ b/listers/autoscaling/v2beta1/horizontalpodautoscaler_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/autoscaling/v2beta2/horizontalpodautoscaler_expansion.go b/listers/autoscaling/v2beta2/horizontalpodautoscaler_expansion.go index 9d264c8ef..b5624ae75 100644 --- a/listers/autoscaling/v2beta2/horizontalpodautoscaler_expansion.go +++ b/listers/autoscaling/v2beta2/horizontalpodautoscaler_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/batch/v1/cronjob_expansion.go b/listers/batch/v1/cronjob_expansion.go index b398acdae..41c86205c 100644 --- a/listers/batch/v1/cronjob_expansion.go +++ b/listers/batch/v1/cronjob_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/batch/v1beta1/cronjob_expansion.go b/listers/batch/v1beta1/cronjob_expansion.go index a9de967e3..c8bed8a7e 100644 --- a/listers/batch/v1beta1/cronjob_expansion.go +++ b/listers/batch/v1beta1/cronjob_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/certificates/v1/certificatesigningrequest_expansion.go b/listers/certificates/v1/certificatesigningrequest_expansion.go index 35c07886d..a3eed0c84 100644 --- a/listers/certificates/v1/certificatesigningrequest_expansion.go +++ b/listers/certificates/v1/certificatesigningrequest_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/certificates/v1alpha1/clustertrustbundle_expansion.go b/listers/certificates/v1alpha1/clustertrustbundle_expansion.go index 4a8a493e7..96e41b1bd 100644 --- a/listers/certificates/v1alpha1/clustertrustbundle_expansion.go +++ b/listers/certificates/v1alpha1/clustertrustbundle_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/certificates/v1beta1/certificatesigningrequest_expansion.go b/listers/certificates/v1beta1/certificatesigningrequest_expansion.go index 91dc37427..8f1bc06dd 100644 --- a/listers/certificates/v1beta1/certificatesigningrequest_expansion.go +++ b/listers/certificates/v1beta1/certificatesigningrequest_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/coordination/v1/lease_expansion.go b/listers/coordination/v1/lease_expansion.go index 614b152fb..70360ca1e 100644 --- a/listers/coordination/v1/lease_expansion.go +++ b/listers/coordination/v1/lease_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/coordination/v1beta1/lease_expansion.go b/listers/coordination/v1beta1/lease_expansion.go index 0f27bbd50..379bafcd5 100644 --- a/listers/coordination/v1beta1/lease_expansion.go +++ b/listers/coordination/v1beta1/lease_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/componentstatus_expansion.go b/listers/core/v1/componentstatus_expansion.go index 68585eb2b..301d9113a 100644 --- a/listers/core/v1/componentstatus_expansion.go +++ b/listers/core/v1/componentstatus_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/configmap_expansion.go b/listers/core/v1/configmap_expansion.go index 42a2c1707..67ab850e3 100644 --- a/listers/core/v1/configmap_expansion.go +++ b/listers/core/v1/configmap_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/endpoints_expansion.go b/listers/core/v1/endpoints_expansion.go index 8183e8065..099ab4270 100644 --- a/listers/core/v1/endpoints_expansion.go +++ b/listers/core/v1/endpoints_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/event_expansion.go b/listers/core/v1/event_expansion.go index bdb79e6ed..d43a29751 100644 --- a/listers/core/v1/event_expansion.go +++ b/listers/core/v1/event_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/limitrange_expansion.go b/listers/core/v1/limitrange_expansion.go index 7c72c7177..eb916f700 100644 --- a/listers/core/v1/limitrange_expansion.go +++ b/listers/core/v1/limitrange_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/namespace_expansion.go b/listers/core/v1/namespace_expansion.go index ea8e99ced..cd7eb0f54 100644 --- a/listers/core/v1/namespace_expansion.go +++ b/listers/core/v1/namespace_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/node_expansion.go b/listers/core/v1/node_expansion.go index 3a2f35bfd..4c228c130 100644 --- a/listers/core/v1/node_expansion.go +++ b/listers/core/v1/node_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/persistentvolume_expansion.go b/listers/core/v1/persistentvolume_expansion.go index 1cf27f753..8b21ac0ab 100644 --- a/listers/core/v1/persistentvolume_expansion.go +++ b/listers/core/v1/persistentvolume_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/persistentvolumeclaim_expansion.go b/listers/core/v1/persistentvolumeclaim_expansion.go index 94e33ca0b..107f37297 100644 --- a/listers/core/v1/persistentvolumeclaim_expansion.go +++ b/listers/core/v1/persistentvolumeclaim_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/pod_expansion.go b/listers/core/v1/pod_expansion.go index e4bfca6a6..05fac6885 100644 --- a/listers/core/v1/pod_expansion.go +++ b/listers/core/v1/pod_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/podtemplate_expansion.go b/listers/core/v1/podtemplate_expansion.go index 778cf1723..485c13260 100644 --- a/listers/core/v1/podtemplate_expansion.go +++ b/listers/core/v1/podtemplate_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/resourcequota_expansion.go b/listers/core/v1/resourcequota_expansion.go index a7d6eaed9..98776b0ff 100644 --- a/listers/core/v1/resourcequota_expansion.go +++ b/listers/core/v1/resourcequota_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/secret_expansion.go b/listers/core/v1/secret_expansion.go index 717fd920c..72bc44feb 100644 --- a/listers/core/v1/secret_expansion.go +++ b/listers/core/v1/secret_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/service_expansion.go b/listers/core/v1/service_expansion.go index c9c2c3af3..c812d5019 100644 --- a/listers/core/v1/service_expansion.go +++ b/listers/core/v1/service_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/core/v1/serviceaccount_expansion.go b/listers/core/v1/serviceaccount_expansion.go index 4d4047a51..f8042e1b5 100644 --- a/listers/core/v1/serviceaccount_expansion.go +++ b/listers/core/v1/serviceaccount_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/discovery/v1/endpointslice_expansion.go b/listers/discovery/v1/endpointslice_expansion.go index 35e480934..298e5f701 100644 --- a/listers/discovery/v1/endpointslice_expansion.go +++ b/listers/discovery/v1/endpointslice_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/discovery/v1beta1/endpointslice_expansion.go b/listers/discovery/v1beta1/endpointslice_expansion.go index 8e5c10af3..8103228ee 100644 --- a/listers/discovery/v1beta1/endpointslice_expansion.go +++ b/listers/discovery/v1beta1/endpointslice_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/events/v1/event_expansion.go b/listers/events/v1/event_expansion.go index bdb79e6ed..d43a29751 100644 --- a/listers/events/v1/event_expansion.go +++ b/listers/events/v1/event_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/events/v1beta1/event_expansion.go b/listers/events/v1beta1/event_expansion.go index c9901ed25..c1472469a 100644 --- a/listers/events/v1beta1/event_expansion.go +++ b/listers/events/v1beta1/event_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/extensions/v1beta1/deployment_expansion.go b/listers/extensions/v1beta1/deployment_expansion.go index 11a6cf51c..3c43c24f7 100644 --- a/listers/extensions/v1beta1/deployment_expansion.go +++ b/listers/extensions/v1beta1/deployment_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/extensions/v1beta1/ingress_expansion.go b/listers/extensions/v1beta1/ingress_expansion.go index 4f130cdf8..d81ed6bcc 100644 --- a/listers/extensions/v1beta1/ingress_expansion.go +++ b/listers/extensions/v1beta1/ingress_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/extensions/v1beta1/networkpolicy_expansion.go b/listers/extensions/v1beta1/networkpolicy_expansion.go index e9d5f4ec1..90d8ecb09 100644 --- a/listers/extensions/v1beta1/networkpolicy_expansion.go +++ b/listers/extensions/v1beta1/networkpolicy_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/flowcontrol/v1/flowschema_expansion.go b/listers/flowcontrol/v1/flowschema_expansion.go index daadff169..ea1bcff31 100644 --- a/listers/flowcontrol/v1/flowschema_expansion.go +++ b/listers/flowcontrol/v1/flowschema_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/flowcontrol/v1/prioritylevelconfiguration_expansion.go b/listers/flowcontrol/v1/prioritylevelconfiguration_expansion.go index cd43625e2..183d33c39 100644 --- a/listers/flowcontrol/v1/prioritylevelconfiguration_expansion.go +++ b/listers/flowcontrol/v1/prioritylevelconfiguration_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/flowcontrol/v1beta1/flowschema_expansion.go b/listers/flowcontrol/v1beta1/flowschema_expansion.go index 14fe7ca39..707b36dc9 100644 --- a/listers/flowcontrol/v1beta1/flowschema_expansion.go +++ b/listers/flowcontrol/v1beta1/flowschema_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/flowcontrol/v1beta1/prioritylevelconfiguration_expansion.go b/listers/flowcontrol/v1beta1/prioritylevelconfiguration_expansion.go index 25ea6a230..8c57993bb 100644 --- a/listers/flowcontrol/v1beta1/prioritylevelconfiguration_expansion.go +++ b/listers/flowcontrol/v1beta1/prioritylevelconfiguration_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/flowcontrol/v1beta2/flowschema_expansion.go b/listers/flowcontrol/v1beta2/flowschema_expansion.go index 002d1a0e1..f18fcb623 100644 --- a/listers/flowcontrol/v1beta2/flowschema_expansion.go +++ b/listers/flowcontrol/v1beta2/flowschema_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/flowcontrol/v1beta2/prioritylevelconfiguration_expansion.go b/listers/flowcontrol/v1beta2/prioritylevelconfiguration_expansion.go index 8fbfa4e13..b3501744e 100644 --- a/listers/flowcontrol/v1beta2/prioritylevelconfiguration_expansion.go +++ b/listers/flowcontrol/v1beta2/prioritylevelconfiguration_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/flowcontrol/v1beta3/flowschema_expansion.go b/listers/flowcontrol/v1beta3/flowschema_expansion.go index e10efeabb..28d4c0d74 100644 --- a/listers/flowcontrol/v1beta3/flowschema_expansion.go +++ b/listers/flowcontrol/v1beta3/flowschema_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/flowcontrol/v1beta3/prioritylevelconfiguration_expansion.go b/listers/flowcontrol/v1beta3/prioritylevelconfiguration_expansion.go index dc4114b39..f4a6c9093 100644 --- a/listers/flowcontrol/v1beta3/prioritylevelconfiguration_expansion.go +++ b/listers/flowcontrol/v1beta3/prioritylevelconfiguration_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/networking/v1/ingress_expansion.go b/listers/networking/v1/ingress_expansion.go index a49d30393..358c6bbcb 100644 --- a/listers/networking/v1/ingress_expansion.go +++ b/listers/networking/v1/ingress_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/networking/v1/ingressclass_expansion.go b/listers/networking/v1/ingressclass_expansion.go index bc79925f8..18ea025e7 100644 --- a/listers/networking/v1/ingressclass_expansion.go +++ b/listers/networking/v1/ingressclass_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/networking/v1/networkpolicy_expansion.go b/listers/networking/v1/networkpolicy_expansion.go index 593162319..c2a0cf702 100644 --- a/listers/networking/v1/networkpolicy_expansion.go +++ b/listers/networking/v1/networkpolicy_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/networking/v1alpha1/ipaddress_expansion.go b/listers/networking/v1alpha1/ipaddress_expansion.go index 6769ff5dd..c97c40707 100644 --- a/listers/networking/v1alpha1/ipaddress_expansion.go +++ b/listers/networking/v1alpha1/ipaddress_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/networking/v1alpha1/servicecidr_expansion.go b/listers/networking/v1alpha1/servicecidr_expansion.go index 1c2513923..2d504c619 100644 --- a/listers/networking/v1alpha1/servicecidr_expansion.go +++ b/listers/networking/v1alpha1/servicecidr_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/networking/v1beta1/ingress_expansion.go b/listers/networking/v1beta1/ingress_expansion.go index 4f130cdf8..d81ed6bcc 100644 --- a/listers/networking/v1beta1/ingress_expansion.go +++ b/listers/networking/v1beta1/ingress_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/networking/v1beta1/ingressclass_expansion.go b/listers/networking/v1beta1/ingressclass_expansion.go index c0ab6ad6f..0ac483f43 100644 --- a/listers/networking/v1beta1/ingressclass_expansion.go +++ b/listers/networking/v1beta1/ingressclass_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/networking/v1beta1/ipaddress_expansion.go b/listers/networking/v1beta1/ipaddress_expansion.go index c9fb25469..ad0016d09 100644 --- a/listers/networking/v1beta1/ipaddress_expansion.go +++ b/listers/networking/v1beta1/ipaddress_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/networking/v1beta1/servicecidr_expansion.go b/listers/networking/v1beta1/servicecidr_expansion.go index a5cfa0d4c..b14065b30 100644 --- a/listers/networking/v1beta1/servicecidr_expansion.go +++ b/listers/networking/v1beta1/servicecidr_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/node/v1/runtimeclass_expansion.go b/listers/node/v1/runtimeclass_expansion.go index dc580f2e8..119137cef 100644 --- a/listers/node/v1/runtimeclass_expansion.go +++ b/listers/node/v1/runtimeclass_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/node/v1alpha1/runtimeclass_expansion.go b/listers/node/v1alpha1/runtimeclass_expansion.go index 50f1bc0f8..b325c0850 100644 --- a/listers/node/v1alpha1/runtimeclass_expansion.go +++ b/listers/node/v1alpha1/runtimeclass_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/node/v1beta1/runtimeclass_expansion.go b/listers/node/v1beta1/runtimeclass_expansion.go index c4617b616..de6dea995 100644 --- a/listers/node/v1beta1/runtimeclass_expansion.go +++ b/listers/node/v1beta1/runtimeclass_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/rbac/v1/clusterrole_expansion.go b/listers/rbac/v1/clusterrole_expansion.go index bd22d482a..5a2da830b 100644 --- a/listers/rbac/v1/clusterrole_expansion.go +++ b/listers/rbac/v1/clusterrole_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/rbac/v1/clusterrolebinding_expansion.go b/listers/rbac/v1/clusterrolebinding_expansion.go index 7a1db9139..3a95b4d11 100644 --- a/listers/rbac/v1/clusterrolebinding_expansion.go +++ b/listers/rbac/v1/clusterrolebinding_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/rbac/v1/role_expansion.go b/listers/rbac/v1/role_expansion.go index c1c0e9d5b..6175fd52e 100644 --- a/listers/rbac/v1/role_expansion.go +++ b/listers/rbac/v1/role_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/rbac/v1/rolebinding_expansion.go b/listers/rbac/v1/rolebinding_expansion.go index 84d93c840..480753a98 100644 --- a/listers/rbac/v1/rolebinding_expansion.go +++ b/listers/rbac/v1/rolebinding_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/rbac/v1alpha1/clusterrole_expansion.go b/listers/rbac/v1alpha1/clusterrole_expansion.go index 9bcbe1e43..26b2940b4 100644 --- a/listers/rbac/v1alpha1/clusterrole_expansion.go +++ b/listers/rbac/v1alpha1/clusterrole_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/rbac/v1alpha1/clusterrolebinding_expansion.go b/listers/rbac/v1alpha1/clusterrolebinding_expansion.go index 6f1748539..0f6d21e61 100644 --- a/listers/rbac/v1alpha1/clusterrolebinding_expansion.go +++ b/listers/rbac/v1alpha1/clusterrolebinding_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/rbac/v1alpha1/role_expansion.go b/listers/rbac/v1alpha1/role_expansion.go index 178b21fc8..f84ead668 100644 --- a/listers/rbac/v1alpha1/role_expansion.go +++ b/listers/rbac/v1alpha1/role_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/rbac/v1alpha1/rolebinding_expansion.go b/listers/rbac/v1alpha1/rolebinding_expansion.go index 3b62f279b..723cf9224 100644 --- a/listers/rbac/v1alpha1/rolebinding_expansion.go +++ b/listers/rbac/v1alpha1/rolebinding_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/rbac/v1beta1/clusterrole_expansion.go b/listers/rbac/v1beta1/clusterrole_expansion.go index 327e32253..c39dd4f1d 100644 --- a/listers/rbac/v1beta1/clusterrole_expansion.go +++ b/listers/rbac/v1beta1/clusterrole_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/rbac/v1beta1/clusterrolebinding_expansion.go b/listers/rbac/v1beta1/clusterrolebinding_expansion.go index 19d0054a7..610e39d06 100644 --- a/listers/rbac/v1beta1/clusterrolebinding_expansion.go +++ b/listers/rbac/v1beta1/clusterrolebinding_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/rbac/v1beta1/role_expansion.go b/listers/rbac/v1beta1/role_expansion.go index 4084bb8a6..f6520eaf8 100644 --- a/listers/rbac/v1beta1/role_expansion.go +++ b/listers/rbac/v1beta1/role_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/rbac/v1beta1/rolebinding_expansion.go b/listers/rbac/v1beta1/rolebinding_expansion.go index deeabe7f3..6b9499d23 100644 --- a/listers/rbac/v1beta1/rolebinding_expansion.go +++ b/listers/rbac/v1beta1/rolebinding_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/resource/v1alpha3/deviceclass_expansion.go b/listers/resource/v1alpha3/deviceclass_expansion.go index e33928e0a..366780cf9 100644 --- a/listers/resource/v1alpha3/deviceclass_expansion.go +++ b/listers/resource/v1alpha3/deviceclass_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/resource/v1alpha3/resourceclaim_expansion.go b/listers/resource/v1alpha3/resourceclaim_expansion.go index f942069fb..28141932b 100644 --- a/listers/resource/v1alpha3/resourceclaim_expansion.go +++ b/listers/resource/v1alpha3/resourceclaim_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/resource/v1alpha3/resourceclaimtemplate_expansion.go b/listers/resource/v1alpha3/resourceclaimtemplate_expansion.go index 757ee62b6..646543e51 100644 --- a/listers/resource/v1alpha3/resourceclaimtemplate_expansion.go +++ b/listers/resource/v1alpha3/resourceclaimtemplate_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/resource/v1alpha3/resourceslice_expansion.go b/listers/resource/v1alpha3/resourceslice_expansion.go index 9ddaf8ca3..54c0b83d1 100644 --- a/listers/resource/v1alpha3/resourceslice_expansion.go +++ b/listers/resource/v1alpha3/resourceslice_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/scheduling/v1/priorityclass_expansion.go b/listers/scheduling/v1/priorityclass_expansion.go index f4fa35e7d..aae4d68c6 100644 --- a/listers/scheduling/v1/priorityclass_expansion.go +++ b/listers/scheduling/v1/priorityclass_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/scheduling/v1alpha1/priorityclass_expansion.go b/listers/scheduling/v1alpha1/priorityclass_expansion.go index 5306a9f39..5cd814dec 100644 --- a/listers/scheduling/v1alpha1/priorityclass_expansion.go +++ b/listers/scheduling/v1alpha1/priorityclass_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/scheduling/v1beta1/priorityclass_expansion.go b/listers/scheduling/v1beta1/priorityclass_expansion.go index 934611db6..a4222853e 100644 --- a/listers/scheduling/v1beta1/priorityclass_expansion.go +++ b/listers/scheduling/v1beta1/priorityclass_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storage/v1/csidriver_expansion.go b/listers/storage/v1/csidriver_expansion.go index cf198daf0..4ccefa009 100644 --- a/listers/storage/v1/csidriver_expansion.go +++ b/listers/storage/v1/csidriver_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storage/v1/csinode_expansion.go b/listers/storage/v1/csinode_expansion.go index 1d0fc861a..7071e2a88 100644 --- a/listers/storage/v1/csinode_expansion.go +++ b/listers/storage/v1/csinode_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storage/v1/csistoragecapacity_expansion.go b/listers/storage/v1/csistoragecapacity_expansion.go index f12e835eb..68afd44ad 100644 --- a/listers/storage/v1/csistoragecapacity_expansion.go +++ b/listers/storage/v1/csistoragecapacity_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storage/v1/storageclass_expansion.go b/listers/storage/v1/storageclass_expansion.go index 2d8414c1a..736fc4442 100644 --- a/listers/storage/v1/storageclass_expansion.go +++ b/listers/storage/v1/storageclass_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storage/v1/volumeattachment_expansion.go b/listers/storage/v1/volumeattachment_expansion.go index 50f9b263f..26f5ae008 100644 --- a/listers/storage/v1/volumeattachment_expansion.go +++ b/listers/storage/v1/volumeattachment_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storage/v1alpha1/csistoragecapacity_expansion.go b/listers/storage/v1alpha1/csistoragecapacity_expansion.go index 44d25078f..bc76f6e4b 100644 --- a/listers/storage/v1alpha1/csistoragecapacity_expansion.go +++ b/listers/storage/v1alpha1/csistoragecapacity_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storage/v1alpha1/volumeattachment_expansion.go b/listers/storage/v1alpha1/volumeattachment_expansion.go index b91ad6142..15c559246 100644 --- a/listers/storage/v1alpha1/volumeattachment_expansion.go +++ b/listers/storage/v1alpha1/volumeattachment_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storage/v1alpha1/volumeattributesclass_expansion.go b/listers/storage/v1alpha1/volumeattributesclass_expansion.go index 5d3e3113b..8feb26f2c 100644 --- a/listers/storage/v1alpha1/volumeattributesclass_expansion.go +++ b/listers/storage/v1alpha1/volumeattributesclass_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storage/v1beta1/csidriver_expansion.go b/listers/storage/v1beta1/csidriver_expansion.go index 228c7b274..858f59289 100644 --- a/listers/storage/v1beta1/csidriver_expansion.go +++ b/listers/storage/v1beta1/csidriver_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storage/v1beta1/csinode_expansion.go b/listers/storage/v1beta1/csinode_expansion.go index 97e83410a..c5f4e4bbf 100644 --- a/listers/storage/v1beta1/csinode_expansion.go +++ b/listers/storage/v1beta1/csinode_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storage/v1beta1/csistoragecapacity_expansion.go b/listers/storage/v1beta1/csistoragecapacity_expansion.go index 82fc7075a..2695d3fdc 100644 --- a/listers/storage/v1beta1/csistoragecapacity_expansion.go +++ b/listers/storage/v1beta1/csistoragecapacity_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storage/v1beta1/storageclass_expansion.go b/listers/storage/v1beta1/storageclass_expansion.go index 9ab464b00..07e942a18 100644 --- a/listers/storage/v1beta1/storageclass_expansion.go +++ b/listers/storage/v1beta1/storageclass_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storage/v1beta1/volumeattachment_expansion.go b/listers/storage/v1beta1/volumeattachment_expansion.go index f0bac78ba..f4d8d8d8f 100644 --- a/listers/storage/v1beta1/volumeattachment_expansion.go +++ b/listers/storage/v1beta1/volumeattachment_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storage/v1beta1/volumeattributesclass_expansion.go b/listers/storage/v1beta1/volumeattributesclass_expansion.go index c3352780a..31d9126f5 100644 --- a/listers/storage/v1beta1/volumeattributesclass_expansion.go +++ b/listers/storage/v1beta1/volumeattributesclass_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/listers/storagemigration/v1alpha1/storageversionmigration_expansion.go b/listers/storagemigration/v1alpha1/storageversionmigration_expansion.go index dbd4b6c1b..11468190f 100644 --- a/listers/storagemigration/v1alpha1/storageversionmigration_expansion.go +++ b/listers/storagemigration/v1alpha1/storageversionmigration_expansion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/metadata/clientset.go b/metadata/clientset.go index 0a1c56e63..d816669df 100644 --- a/metadata/clientset.go +++ b/metadata/clientset.go @@ -43,6 +43,13 @@ func (c *ClusterClientset) Cluster(clusterPath logicalcluster.Path) metadata.Int return c.clientCache.ClusterOrDie(clusterPath) } +// ClusterWithContext is only implemented to satisfy the +// ClusterInterface and silently ignores the context, the client is not +// actually context aware. +func (c *ClusterClientset) ClusterWithContext(ctx context.Context, clusterPath logicalcluster.Path) metadata.Interface { + return c.clientCache.ClusterOrDie(clusterPath) +} + func (c *ClusterClientset) Resource(resource schema.GroupVersionResource) ResourceClusterInterface { return &ClusterResourceClient{clientCache: c.clientCache, resource: resource} } diff --git a/metadata/interface.go b/metadata/interface.go index 3f81515c8..fd4c02d9b 100644 --- a/metadata/interface.go +++ b/metadata/interface.go @@ -29,6 +29,7 @@ import ( type ClusterInterface interface { Cluster(logicalcluster.Path) metadata.Interface + ClusterWithContext(context.Context, logicalcluster.Path) metadata.Interface Resource(resource schema.GroupVersionResource) ResourceClusterInterface } diff --git a/third_party/k8s.io/client-go/metadata/fake/simple.go b/third_party/k8s.io/client-go/metadata/fake/simple.go index a2521df67..ac0e1fb8f 100644 --- a/third_party/k8s.io/client-go/metadata/fake/simple.go +++ b/third_party/k8s.io/client-go/metadata/fake/simple.go @@ -98,6 +98,10 @@ func (c *FakeMetadataClusterClientset) Tracker() kcptesting.ObjectTracker { } func (c *FakeMetadataClusterClientset) Cluster(clusterPath logicalcluster.Path) metadata.Interface { + return c.ClusterWithContext(context.Background(), clusterPath) +} + +func (c *FakeMetadataClusterClientset) ClusterWithContext(ctx context.Context, clusterPath logicalcluster.Path) metadata.Interface { if clusterPath == logicalcluster.Wildcard { panic("A specific cluster must be provided when scoping, not the wildcard.") }