fix import cycle

Author: maciaszczykm

modules/common/client/cache/client/cache.go renamed to modules/common/client/cache/client/common/resourcelister.go

@@ -1,4 +1,4 @@
-package client
+package common
 
 import (
 	"context"
@@ -7,9 +7,9 @@ import (
 	authorizationapiv1 "k8s.io/api/authorization/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	authorizationv1 "k8s.io/client-go/kubernetes/typed/authorization/v1"
+	"k8s.io/dashboard/client/cache"
 	"k8s.io/klog/v2"
 
-	"k8s.io/dashboard/client/cache"
 	"k8s.io/dashboard/errors"
 	"k8s.io/dashboard/types"
 )

modules/common/client/cache/client/core/configmaps.go

@@ -7,8 +7,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	authorizationv1 "k8s.io/client-go/kubernetes/typed/authorization/v1"
 	v1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/dashboard/client/cache/client"
-
+	"k8s.io/dashboard/client/cache/client/common"
 	"k8s.io/dashboard/types"
 )
 
@@ -21,7 +20,7 @@ type configmaps struct {
 }
 
 func (in *configmaps) List(ctx context.Context, opts metav1.ListOptions) (*corev1.ConfigMapList, error) {
-	return client.NewCachedResourceLister[corev1.ConfigMapList](
+	return common.NewCachedResourceLister[corev1.ConfigMapList](
 		in.authorizationV1,
 		in.namespace,
 		in.token,

modules/common/client/cache/client/core/namespaces.go

@@ -7,7 +7,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	authorizationv1 "k8s.io/client-go/kubernetes/typed/authorization/v1"
 	v1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/dashboard/client/cache/client"
+	"k8s.io/dashboard/client/cache/client/common"
 
 	"k8s.io/dashboard/types"
 )
@@ -20,7 +20,7 @@ type namespaces struct {
 }
 
 func (in *namespaces) List(ctx context.Context, opts metav1.ListOptions) (*corev1.NamespaceList, error) {
-	return client.NewCachedClusterScopedResourceLister[corev1.NamespaceList](
+	return common.NewCachedClusterScopedResourceLister[corev1.NamespaceList](
 		in.authorizationV1,
 		in.token,
 		types.ResourceKindNamespace,

modules/common/client/cache/client/core/nodes.go

@@ -7,8 +7,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	authorizationv1 "k8s.io/client-go/kubernetes/typed/authorization/v1"
 	v1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/dashboard/client/cache/client"
-
+	"k8s.io/dashboard/client/cache/client/common"
 	"k8s.io/dashboard/types"
 )
 
@@ -20,7 +19,7 @@ type nodes struct {
 }
 
 func (in *nodes) List(ctx context.Context, opts metav1.ListOptions) (*corev1.NodeList, error) {
-	return client.NewCachedClusterScopedResourceLister[corev1.NodeList](
+	return common.NewCachedClusterScopedResourceLister[corev1.NodeList](
 		in.authorizationV1,
 		in.token,
 		types.ResourceKindNode,

modules/common/client/cache/client/core/persistentvolumeclaims.go

@@ -7,8 +7,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	authorizationv1 "k8s.io/client-go/kubernetes/typed/authorization/v1"
 	v1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/dashboard/client/cache/client"
-
+	"k8s.io/dashboard/client/cache/client/common"
 	"k8s.io/dashboard/types"
 )
 
@@ -21,7 +20,7 @@ type persistentVolumeClaims struct {
 }
 
 func (in *persistentVolumeClaims) List(ctx context.Context, opts metav1.ListOptions) (*corev1.PersistentVolumeClaimList, error) {
-	return client.NewCachedResourceLister[corev1.PersistentVolumeClaimList](
+	return common.NewCachedResourceLister[corev1.PersistentVolumeClaimList](
 		in.authorizationV1,
 		in.namespace,
 		in.token,

modules/common/client/cache/client/core/persistentvolumes.go

@@ -7,8 +7,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	authorizationv1 "k8s.io/client-go/kubernetes/typed/authorization/v1"
 	v1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/dashboard/client/cache/client"
-
+	"k8s.io/dashboard/client/cache/client/common"
 	"k8s.io/dashboard/types"
 )
 
@@ -20,7 +19,7 @@ type persistentVolumes struct {
 }
 
 func (in *persistentVolumes) List(ctx context.Context, opts metav1.ListOptions) (*corev1.PersistentVolumeList, error) {
-	return client.NewCachedClusterScopedResourceLister[corev1.PersistentVolumeList](
+	return common.NewCachedClusterScopedResourceLister[corev1.PersistentVolumeList](
 		in.authorizationV1,
 		in.token,
 		types.ResourceKindPersistentVolume,

modules/common/client/cache/client/core/pods.go

@@ -7,8 +7,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	authorizationv1 "k8s.io/client-go/kubernetes/typed/authorization/v1"
 	v1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/dashboard/client/cache/client"
-
+	"k8s.io/dashboard/client/cache/client/common"
 	"k8s.io/dashboard/types"
 )
 
@@ -21,7 +20,7 @@ type pods struct {
 }
 
 func (in *pods) List(ctx context.Context, opts metav1.ListOptions) (*corev1.PodList, error) {
-	return client.NewCachedResourceLister[corev1.PodList](
+	return common.NewCachedResourceLister[corev1.PodList](
 		in.authorizationV1,
 		in.namespace,
 		in.token,

modules/common/client/cache/client/core/secrets.go

@@ -7,8 +7,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	authorizationv1 "k8s.io/client-go/kubernetes/typed/authorization/v1"
 	v1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/dashboard/client/cache/client"
-
+	"k8s.io/dashboard/client/cache/client/common"
 	"k8s.io/dashboard/types"
 )
 
@@ -21,7 +20,7 @@ type secrets struct {
 }
 
 func (in *secrets) List(ctx context.Context, opts metav1.ListOptions) (*corev1.SecretList, error) {
-	return client.NewCachedResourceLister[corev1.SecretList](
+	return common.NewCachedResourceLister[corev1.SecretList](
 		in.authorizationV1,
 		in.namespace,
 		in.token,