From b69ae49ed4719720390e01627348e4f564c1bf5b Mon Sep 17 00:00:00 2001 From: Ammar Yasser Date: Wed, 22 Jan 2025 18:58:01 +0200 Subject: [PATCH] refactor: Move the policy report client to a different package to make room for multiple crds (#714) * refactor: Move the policy report client to a different package to make room for multiple crds * refactor: Remove the hyphen from the name Signed-off-by: aerosouund --- .gitignore | 1 + pkg/config/resolver.go | 4 ++-- .../{ => policyreport}/clientset/versioned/clientset.go | 2 +- .../client/{ => policyreport}/clientset/versioned/doc.go | 0 .../clientset/versioned/fake/clientset_generated.go | 6 +++--- .../{ => policyreport}/clientset/versioned/fake/doc.go | 0 .../{ => policyreport}/clientset/versioned/fake/register.go | 0 .../{ => policyreport}/clientset/versioned/scheme/doc.go | 0 .../clientset/versioned/scheme/register.go | 0 .../typed/policyreport/v1alpha2/clusterpolicyreport.go | 2 +- .../clientset/versioned/typed/policyreport/v1alpha2/doc.go | 0 .../versioned/typed/policyreport/v1alpha2/fake/doc.go | 0 .../policyreport/v1alpha2/fake/fake_clusterpolicyreport.go | 0 .../typed/policyreport/v1alpha2/fake/fake_policyreport.go | 0 .../policyreport/v1alpha2/fake/fake_policyreport_client.go | 2 +- .../typed/policyreport/v1alpha2/generated_expansion.go | 0 .../versioned/typed/policyreport/v1alpha2/policyreport.go | 2 +- .../typed/policyreport/v1alpha2/policyreport_client.go | 2 +- .../informers/externalversions/factory.go | 6 +++--- .../informers/externalversions/generic.go | 0 .../internalinterfaces/factory_interfaces.go | 2 +- .../informers/externalversions/policyreport/interface.go | 4 ++-- .../policyreport/v1alpha2/clusterpolicyreport.go | 6 +++--- .../externalversions/policyreport/v1alpha2/interface.go | 2 +- .../externalversions/policyreport/v1alpha2/policyreport.go | 6 +++--- .../listers/policyreport/v1alpha2/clusterpolicyreport.go | 0 .../listers/policyreport/v1alpha2/expansion_generated.go | 0 .../listers/policyreport/v1alpha2/policyreport.go | 0 pkg/email/summary/fixtures_test.go | 4 ++-- pkg/email/summary/generator.go | 2 +- pkg/email/violations/fixtures_test.go | 4 ++-- pkg/email/violations/generator.go | 2 +- pkg/kubernetes/fixtures_test.go | 4 ++-- pkg/kubernetes/queue.go | 2 +- 34 files changed, 33 insertions(+), 32 deletions(-) rename pkg/crd/client/{ => policyreport}/clientset/versioned/clientset.go (98%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/doc.go (100%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/fake/clientset_generated.go (91%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/fake/doc.go (100%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/fake/register.go (100%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/scheme/doc.go (100%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/scheme/register.go (100%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/typed/policyreport/v1alpha2/clusterpolicyreport.go (98%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/typed/policyreport/v1alpha2/doc.go (100%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/typed/policyreport/v1alpha2/fake/doc.go (100%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_clusterpolicyreport.go (100%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_policyreport.go (100%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_policyreport_client.go (91%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/typed/policyreport/v1alpha2/generated_expansion.go (100%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/typed/policyreport/v1alpha2/policyreport.go (98%) rename pkg/crd/client/{ => policyreport}/clientset/versioned/typed/policyreport/v1alpha2/policyreport_client.go (97%) rename pkg/crd/client/{ => policyreport}/informers/externalversions/factory.go (96%) rename pkg/crd/client/{ => policyreport}/informers/externalversions/generic.go (100%) rename pkg/crd/client/{ => policyreport}/informers/externalversions/internalinterfaces/factory_interfaces.go (93%) rename pkg/crd/client/{ => policyreport}/informers/externalversions/policyreport/interface.go (88%) rename pkg/crd/client/{ => policyreport}/informers/externalversions/policyreport/v1alpha2/clusterpolicyreport.go (93%) rename pkg/crd/client/{ => policyreport}/informers/externalversions/policyreport/v1alpha2/interface.go (96%) rename pkg/crd/client/{ => policyreport}/informers/externalversions/policyreport/v1alpha2/policyreport.go (93%) rename pkg/crd/client/{ => policyreport}/listers/policyreport/v1alpha2/clusterpolicyreport.go (100%) rename pkg/crd/client/{ => policyreport}/listers/policyreport/v1alpha2/expansion_generated.go (100%) rename pkg/crd/client/{ => policyreport}/listers/policyreport/v1alpha2/policyreport.go (100%) diff --git a/.gitignore b/.gitignore index 2d92d65d..e76decea 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ heap* /.env* .tools /.idea/ +.gopath \ No newline at end of file diff --git a/pkg/config/resolver.go b/pkg/config/resolver.go index 954eb412..4348f513 100644 --- a/pkg/config/resolver.go +++ b/pkg/config/resolver.go @@ -24,8 +24,8 @@ import ( "github.com/kyverno/policy-reporter/pkg/api" "github.com/kyverno/policy-reporter/pkg/cache" - "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned" - wgpolicyk8sv1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2" + "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned" + wgpolicyk8sv1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2" "github.com/kyverno/policy-reporter/pkg/database" "github.com/kyverno/policy-reporter/pkg/email" "github.com/kyverno/policy-reporter/pkg/email/summary" diff --git a/pkg/crd/client/clientset/versioned/clientset.go b/pkg/crd/client/policyreport/clientset/versioned/clientset.go similarity index 98% rename from pkg/crd/client/clientset/versioned/clientset.go rename to pkg/crd/client/policyreport/clientset/versioned/clientset.go index b2459916..97b4af52 100644 --- a/pkg/crd/client/clientset/versioned/clientset.go +++ b/pkg/crd/client/policyreport/clientset/versioned/clientset.go @@ -26,7 +26,7 @@ import ( rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - wgpolicyk8sv1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2" + wgpolicyk8sv1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2" ) type Interface interface { diff --git a/pkg/crd/client/clientset/versioned/doc.go b/pkg/crd/client/policyreport/clientset/versioned/doc.go similarity index 100% rename from pkg/crd/client/clientset/versioned/doc.go rename to pkg/crd/client/policyreport/clientset/versioned/doc.go diff --git a/pkg/crd/client/clientset/versioned/fake/clientset_generated.go b/pkg/crd/client/policyreport/clientset/versioned/fake/clientset_generated.go similarity index 91% rename from pkg/crd/client/clientset/versioned/fake/clientset_generated.go rename to pkg/crd/client/policyreport/clientset/versioned/fake/clientset_generated.go index 7125d373..fb381c9e 100644 --- a/pkg/crd/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/crd/client/policyreport/clientset/versioned/fake/clientset_generated.go @@ -25,9 +25,9 @@ import ( fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned" - wgpolicyk8sv1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2" - fakewgpolicyk8sv1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/fake" + clientset "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned" + wgpolicyk8sv1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2" + fakewgpolicyk8sv1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/pkg/crd/client/clientset/versioned/fake/doc.go b/pkg/crd/client/policyreport/clientset/versioned/fake/doc.go similarity index 100% rename from pkg/crd/client/clientset/versioned/fake/doc.go rename to pkg/crd/client/policyreport/clientset/versioned/fake/doc.go diff --git a/pkg/crd/client/clientset/versioned/fake/register.go b/pkg/crd/client/policyreport/clientset/versioned/fake/register.go similarity index 100% rename from pkg/crd/client/clientset/versioned/fake/register.go rename to pkg/crd/client/policyreport/clientset/versioned/fake/register.go diff --git a/pkg/crd/client/clientset/versioned/scheme/doc.go b/pkg/crd/client/policyreport/clientset/versioned/scheme/doc.go similarity index 100% rename from pkg/crd/client/clientset/versioned/scheme/doc.go rename to pkg/crd/client/policyreport/clientset/versioned/scheme/doc.go diff --git a/pkg/crd/client/clientset/versioned/scheme/register.go b/pkg/crd/client/policyreport/clientset/versioned/scheme/register.go similarity index 100% rename from pkg/crd/client/clientset/versioned/scheme/register.go rename to pkg/crd/client/policyreport/clientset/versioned/scheme/register.go diff --git a/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/clusterpolicyreport.go b/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/clusterpolicyreport.go similarity index 98% rename from pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/clusterpolicyreport.go rename to pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/clusterpolicyreport.go index 82e305ad..b311bafb 100644 --- a/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/clusterpolicyreport.go +++ b/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/clusterpolicyreport.go @@ -28,7 +28,7 @@ import ( rest "k8s.io/client-go/rest" v1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/api/policyreport/v1alpha2" - scheme "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/scheme" + scheme "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/scheme" ) // ClusterPolicyReportsGetter has a method to return a ClusterPolicyReportInterface. diff --git a/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/doc.go b/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/doc.go similarity index 100% rename from pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/doc.go rename to pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/doc.go diff --git a/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/fake/doc.go b/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/fake/doc.go similarity index 100% rename from pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/fake/doc.go rename to pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/fake/doc.go diff --git a/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_clusterpolicyreport.go b/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_clusterpolicyreport.go similarity index 100% rename from pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_clusterpolicyreport.go rename to pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_clusterpolicyreport.go diff --git a/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_policyreport.go b/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_policyreport.go similarity index 100% rename from pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_policyreport.go rename to pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_policyreport.go diff --git a/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_policyreport_client.go b/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_policyreport_client.go similarity index 91% rename from pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_policyreport_client.go rename to pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_policyreport_client.go index 6bed4aae..f1048ddc 100644 --- a/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_policyreport_client.go +++ b/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/fake/fake_policyreport_client.go @@ -22,7 +22,7 @@ import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2" + v1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2" ) type FakeWgpolicyk8sV1alpha2 struct { diff --git a/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/generated_expansion.go b/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/generated_expansion.go similarity index 100% rename from pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/generated_expansion.go rename to pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/generated_expansion.go diff --git a/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/policyreport.go b/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/policyreport.go similarity index 98% rename from pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/policyreport.go rename to pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/policyreport.go index 07a1a05b..7e27b777 100644 --- a/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/policyreport.go +++ b/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/policyreport.go @@ -28,7 +28,7 @@ import ( rest "k8s.io/client-go/rest" v1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/api/policyreport/v1alpha2" - scheme "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/scheme" + scheme "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/scheme" ) // PolicyReportsGetter has a method to return a PolicyReportInterface. diff --git a/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/policyreport_client.go b/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/policyreport_client.go similarity index 97% rename from pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/policyreport_client.go rename to pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/policyreport_client.go index 40072e8a..32fe6ab2 100644 --- a/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2/policyreport_client.go +++ b/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2/policyreport_client.go @@ -24,7 +24,7 @@ import ( rest "k8s.io/client-go/rest" v1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/api/policyreport/v1alpha2" - "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/scheme" + "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/scheme" ) type Wgpolicyk8sV1alpha2Interface interface { diff --git a/pkg/crd/client/informers/externalversions/factory.go b/pkg/crd/client/policyreport/informers/externalversions/factory.go similarity index 96% rename from pkg/crd/client/informers/externalversions/factory.go rename to pkg/crd/client/policyreport/informers/externalversions/factory.go index 40f0b932..25ba74ea 100644 --- a/pkg/crd/client/informers/externalversions/factory.go +++ b/pkg/crd/client/policyreport/informers/externalversions/factory.go @@ -28,9 +28,9 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - versioned "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned" - internalinterfaces "github.com/kyverno/policy-reporter/pkg/crd/client/informers/externalversions/internalinterfaces" - policyreport "github.com/kyverno/policy-reporter/pkg/crd/client/informers/externalversions/policyreport" + versioned "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned" + internalinterfaces "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/informers/externalversions/internalinterfaces" + policyreport "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/informers/externalversions/policyreport" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/pkg/crd/client/informers/externalversions/generic.go b/pkg/crd/client/policyreport/informers/externalversions/generic.go similarity index 100% rename from pkg/crd/client/informers/externalversions/generic.go rename to pkg/crd/client/policyreport/informers/externalversions/generic.go diff --git a/pkg/crd/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/crd/client/policyreport/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 93% rename from pkg/crd/client/informers/externalversions/internalinterfaces/factory_interfaces.go rename to pkg/crd/client/policyreport/informers/externalversions/internalinterfaces/factory_interfaces.go index caa38720..016a7889 100644 --- a/pkg/crd/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/crd/client/policyreport/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -25,7 +25,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - versioned "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned" + versioned "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned" ) // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. diff --git a/pkg/crd/client/informers/externalversions/policyreport/interface.go b/pkg/crd/client/policyreport/informers/externalversions/policyreport/interface.go similarity index 88% rename from pkg/crd/client/informers/externalversions/policyreport/interface.go rename to pkg/crd/client/policyreport/informers/externalversions/policyreport/interface.go index 29f841b3..56dc4f90 100644 --- a/pkg/crd/client/informers/externalversions/policyreport/interface.go +++ b/pkg/crd/client/policyreport/informers/externalversions/policyreport/interface.go @@ -19,8 +19,8 @@ limitations under the License. package policyreport import ( - internalinterfaces "github.com/kyverno/policy-reporter/pkg/crd/client/informers/externalversions/internalinterfaces" - v1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/informers/externalversions/policyreport/v1alpha2" + internalinterfaces "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/informers/externalversions/internalinterfaces" + v1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/informers/externalversions/policyreport/v1alpha2" ) // Interface provides access to each of this group's versions. diff --git a/pkg/crd/client/informers/externalversions/policyreport/v1alpha2/clusterpolicyreport.go b/pkg/crd/client/policyreport/informers/externalversions/policyreport/v1alpha2/clusterpolicyreport.go similarity index 93% rename from pkg/crd/client/informers/externalversions/policyreport/v1alpha2/clusterpolicyreport.go rename to pkg/crd/client/policyreport/informers/externalversions/policyreport/v1alpha2/clusterpolicyreport.go index 49e23690..78777e1d 100644 --- a/pkg/crd/client/informers/externalversions/policyreport/v1alpha2/clusterpolicyreport.go +++ b/pkg/crd/client/policyreport/informers/externalversions/policyreport/v1alpha2/clusterpolicyreport.go @@ -28,9 +28,9 @@ import ( cache "k8s.io/client-go/tools/cache" policyreportv1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/api/policyreport/v1alpha2" - versioned "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned" - internalinterfaces "github.com/kyverno/policy-reporter/pkg/crd/client/informers/externalversions/internalinterfaces" - v1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/listers/policyreport/v1alpha2" + versioned "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned" + internalinterfaces "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/informers/externalversions/internalinterfaces" + v1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/listers/policyreport/v1alpha2" ) // ClusterPolicyReportInformer provides access to a shared informer and lister for diff --git a/pkg/crd/client/informers/externalversions/policyreport/v1alpha2/interface.go b/pkg/crd/client/policyreport/informers/externalversions/policyreport/v1alpha2/interface.go similarity index 96% rename from pkg/crd/client/informers/externalversions/policyreport/v1alpha2/interface.go rename to pkg/crd/client/policyreport/informers/externalversions/policyreport/v1alpha2/interface.go index fc4099ee..fddaf284 100644 --- a/pkg/crd/client/informers/externalversions/policyreport/v1alpha2/interface.go +++ b/pkg/crd/client/policyreport/informers/externalversions/policyreport/v1alpha2/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha2 import ( - internalinterfaces "github.com/kyverno/policy-reporter/pkg/crd/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/crd/client/informers/externalversions/policyreport/v1alpha2/policyreport.go b/pkg/crd/client/policyreport/informers/externalversions/policyreport/v1alpha2/policyreport.go similarity index 93% rename from pkg/crd/client/informers/externalversions/policyreport/v1alpha2/policyreport.go rename to pkg/crd/client/policyreport/informers/externalversions/policyreport/v1alpha2/policyreport.go index 91ee5d34..79ef3caf 100644 --- a/pkg/crd/client/informers/externalversions/policyreport/v1alpha2/policyreport.go +++ b/pkg/crd/client/policyreport/informers/externalversions/policyreport/v1alpha2/policyreport.go @@ -28,9 +28,9 @@ import ( cache "k8s.io/client-go/tools/cache" policyreportv1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/api/policyreport/v1alpha2" - versioned "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned" - internalinterfaces "github.com/kyverno/policy-reporter/pkg/crd/client/informers/externalversions/internalinterfaces" - v1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/listers/policyreport/v1alpha2" + versioned "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned" + internalinterfaces "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/informers/externalversions/internalinterfaces" + v1alpha2 "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/listers/policyreport/v1alpha2" ) // PolicyReportInformer provides access to a shared informer and lister for diff --git a/pkg/crd/client/listers/policyreport/v1alpha2/clusterpolicyreport.go b/pkg/crd/client/policyreport/listers/policyreport/v1alpha2/clusterpolicyreport.go similarity index 100% rename from pkg/crd/client/listers/policyreport/v1alpha2/clusterpolicyreport.go rename to pkg/crd/client/policyreport/listers/policyreport/v1alpha2/clusterpolicyreport.go diff --git a/pkg/crd/client/listers/policyreport/v1alpha2/expansion_generated.go b/pkg/crd/client/policyreport/listers/policyreport/v1alpha2/expansion_generated.go similarity index 100% rename from pkg/crd/client/listers/policyreport/v1alpha2/expansion_generated.go rename to pkg/crd/client/policyreport/listers/policyreport/v1alpha2/expansion_generated.go diff --git a/pkg/crd/client/listers/policyreport/v1alpha2/policyreport.go b/pkg/crd/client/policyreport/listers/policyreport/v1alpha2/policyreport.go similarity index 100% rename from pkg/crd/client/listers/policyreport/v1alpha2/policyreport.go rename to pkg/crd/client/policyreport/listers/policyreport/v1alpha2/policyreport.go diff --git a/pkg/email/summary/fixtures_test.go b/pkg/email/summary/fixtures_test.go index 462854c0..9ed83f1b 100644 --- a/pkg/email/summary/fixtures_test.go +++ b/pkg/email/summary/fixtures_test.go @@ -3,8 +3,8 @@ package summary_test import ( "go.uber.org/zap" - "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/fake" - v1alpha2client "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2" + "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/fake" + v1alpha2client "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2" "github.com/kyverno/policy-reporter/pkg/email" "github.com/kyverno/policy-reporter/pkg/validate" ) diff --git a/pkg/email/summary/generator.go b/pkg/email/summary/generator.go index f01b0967..a0ec3603 100644 --- a/pkg/email/summary/generator.go +++ b/pkg/email/summary/generator.go @@ -8,7 +8,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/kyverno/policy-reporter/pkg/crd/api/policyreport/v1alpha2" - api "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2" + api "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2" "github.com/kyverno/policy-reporter/pkg/email" ) diff --git a/pkg/email/violations/fixtures_test.go b/pkg/email/violations/fixtures_test.go index dc38ce7e..0085c1ea 100644 --- a/pkg/email/violations/fixtures_test.go +++ b/pkg/email/violations/fixtures_test.go @@ -3,8 +3,8 @@ package violations_test import ( "go.uber.org/zap" - "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/fake" - v1alpha2client "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2" + "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/fake" + v1alpha2client "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2" "github.com/kyverno/policy-reporter/pkg/email" "github.com/kyverno/policy-reporter/pkg/validate" ) diff --git a/pkg/email/violations/generator.go b/pkg/email/violations/generator.go index 0aae6afc..4367c9fa 100644 --- a/pkg/email/violations/generator.go +++ b/pkg/email/violations/generator.go @@ -8,7 +8,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/kyverno/policy-reporter/pkg/crd/api/policyreport/v1alpha2" - api "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2" + api "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2" "github.com/kyverno/policy-reporter/pkg/email" ) diff --git a/pkg/kubernetes/fixtures_test.go b/pkg/kubernetes/fixtures_test.go index 10aebbca..fe4b21b5 100644 --- a/pkg/kubernetes/fixtures_test.go +++ b/pkg/kubernetes/fixtures_test.go @@ -7,8 +7,8 @@ import ( metafake "k8s.io/client-go/metadata/fake" pr "github.com/kyverno/policy-reporter/pkg/crd/api/policyreport/v1alpha2" - "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/fake" - v1alpha2client "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2" + "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/fake" + v1alpha2client "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2" "github.com/kyverno/policy-reporter/pkg/report" ) diff --git a/pkg/kubernetes/queue.go b/pkg/kubernetes/queue.go index fdd62235..f224d4b9 100644 --- a/pkg/kubernetes/queue.go +++ b/pkg/kubernetes/queue.go @@ -15,7 +15,7 @@ import ( "k8s.io/client-go/util/workqueue" pr "github.com/kyverno/policy-reporter/pkg/crd/api/policyreport/v1alpha2" - "github.com/kyverno/policy-reporter/pkg/crd/client/clientset/versioned/typed/policyreport/v1alpha2" + "github.com/kyverno/policy-reporter/pkg/crd/client/policyreport/clientset/versioned/typed/policyreport/v1alpha2" "github.com/kyverno/policy-reporter/pkg/report" "github.com/kyverno/policy-reporter/pkg/report/result" )