From 2457cee11c5a132411bbb9dfa6fa3090a5c3f787 Mon Sep 17 00:00:00 2001 From: changzhen Date: Thu, 4 Aug 2022 15:08:34 +0800 Subject: [PATCH] update import-aliases Signed-off-by: changzhen --- hack/.import-aliases | 6 +++++- pkg/search/backendstore/opensearch.go | 6 +++--- pkg/search/backendstore/store.go | 4 ++-- pkg/search/controller.go | 12 ++++++------ pkg/util/gclient/gclient.go | 4 ++-- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/hack/.import-aliases b/hack/.import-aliases index 129e8a518..a086cd31d 100644 --- a/hack/.import-aliases +++ b/hack/.import-aliases @@ -11,6 +11,7 @@ "k8s.io/api/authorization/v1": "authorizationv1", "k8s.io/api/authorization/v1beta1": "authorizationv1beta1", "k8s.io/api/autoscaling/v1": "autoscalingv1", + "k8s.io/api/autoscaling/v2": "autoscalingv2", "k8s.io/api/batch/v1": "batchv1", "k8s.io/api/batch/v1beta1": "batchv1beta1", "k8s.io/api/certificates/v1beta1": "certificatesv1beta1", @@ -52,6 +53,9 @@ "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1": "clusterv1alpha1", "github.com/karmada-io/karmada/pkg/apis/config/v1alpha1": "configv1alpha1", + "github.com/karmada-io/karmada/pkg/apis/networking/v1alpha1": "networkingv1alpha1", "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1": "policyv1alpha1", - "github.com/karmada-io/karmada/pkg/apis/work/v1alpha1": "workv1alpha1" + "github.com/karmada-io/karmada/pkg/apis/search/v1alpha1": "searchv1alpha1", + "github.com/karmada-io/karmada/pkg/apis/work/v1alpha1": "workv1alpha1", + "github.com/karmada-io/karmada/pkg/apis/work/v1alpha2": "workv1alpha2" } diff --git a/pkg/search/backendstore/opensearch.go b/pkg/search/backendstore/opensearch.go index 5655ba6e7..0519f2c48 100644 --- a/pkg/search/backendstore/opensearch.go +++ b/pkg/search/backendstore/opensearch.go @@ -17,7 +17,7 @@ import ( "k8s.io/klog/v2" clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" - "github.com/karmada-io/karmada/pkg/apis/search/v1alpha1" + searchv1alpha1 "github.com/karmada-io/karmada/pkg/apis/search/v1alpha1" ) var defaultPrefix = "kubernetes" @@ -104,7 +104,7 @@ type OpenSearch struct { } // NewOpenSearch returns a new OpenSearch -func NewOpenSearch(cluster string, cfg *v1alpha1.BackendStoreConfig) (*OpenSearch, error) { +func NewOpenSearch(cluster string, cfg *searchv1alpha1.BackendStoreConfig) (*OpenSearch, error) { klog.Infof("create openserch backend store: %s", cluster) os := &OpenSearch{ cluster: cluster, @@ -258,7 +258,7 @@ func (os *OpenSearch) indexName(us *unstructured.Unstructured) (string, error) { return name, nil } -func (os *OpenSearch) initClient(bsc *v1alpha1.BackendStoreConfig) error { +func (os *OpenSearch) initClient(bsc *searchv1alpha1.BackendStoreConfig) error { if bsc == nil || bsc.OpenSearch == nil { return errors.New("opensearch config is nil") } diff --git a/pkg/search/backendstore/store.go b/pkg/search/backendstore/store.go index 491b8bc5e..090bd2cef 100644 --- a/pkg/search/backendstore/store.go +++ b/pkg/search/backendstore/store.go @@ -7,7 +7,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - "github.com/karmada-io/karmada/pkg/apis/search/v1alpha1" + searchv1alpha1 "github.com/karmada-io/karmada/pkg/apis/search/v1alpha1" ) // BackendStore define BackendStore interface @@ -31,7 +31,7 @@ func Init(cs *kubernetes.Clientset) { } // AddBackend add backend store -func AddBackend(cluster string, cfg *v1alpha1.BackendStoreConfig) { +func AddBackend(cluster string, cfg *searchv1alpha1.BackendStoreConfig) { backendLock.Lock() defer backendLock.Unlock() diff --git a/pkg/search/controller.go b/pkg/search/controller.go index 96b4736dd..14be1f475 100644 --- a/pkg/search/controller.go +++ b/pkg/search/controller.go @@ -20,7 +20,7 @@ import ( clusterV1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" - "github.com/karmada-io/karmada/pkg/apis/search/v1alpha1" + searchv1alpha1 "github.com/karmada-io/karmada/pkg/apis/search/v1alpha1" karmadaclientset "github.com/karmada-io/karmada/pkg/generated/clientset/versioned" informerfactory "github.com/karmada-io/karmada/pkg/generated/informers/externalversions" clusterlister "github.com/karmada-io/karmada/pkg/generated/listers/cluster/v1alpha1" @@ -231,7 +231,7 @@ func (c *Controller) doCacheCluster(cluster string) error { // addResourceRegistry parse the resourceRegistry object and add Cluster to the queue func (c *Controller) addResourceRegistry(obj interface{}) { - rr := obj.(*v1alpha1.ResourceRegistry) + rr := obj.(*searchv1alpha1.ResourceRegistry) resources := c.getResources(rr.Spec.ResourceSelectors) for _, cluster := range c.getClusters(rr.Spec.TargetCluster) { @@ -260,8 +260,8 @@ func (c *Controller) addResourceRegistry(obj interface{}) { // updateResourceRegistry parse the resourceRegistry object and add (added/deleted) Cluster to the queue func (c *Controller) updateResourceRegistry(oldObj, newObj interface{}) { - oldRR := oldObj.(*v1alpha1.ResourceRegistry) - newRR := newObj.(*v1alpha1.ResourceRegistry) + oldRR := oldObj.(*searchv1alpha1.ResourceRegistry) + newRR := newObj.(*searchv1alpha1.ResourceRegistry) if reflect.DeepEqual(oldRR.Spec, newRR.Spec) { klog.V(4).Infof("Ignore ResourceRegistry(%s) update event as spec not changed", newRR.Name) @@ -324,7 +324,7 @@ func (c *Controller) updateResourceRegistry(oldObj, newObj interface{}) { // deleteResourceRegistry parse the resourceRegistry object and add deleted Cluster to the queue func (c *Controller) deleteResourceRegistry(obj interface{}) { - rr := obj.(*v1alpha1.ResourceRegistry) + rr := obj.(*searchv1alpha1.ResourceRegistry) for _, cluster := range c.getClusters(rr.Spec.TargetCluster) { v, ok := c.clusterRegistry.Load(cluster) if !ok { @@ -420,7 +420,7 @@ func (c *Controller) getClusters(affinity policyv1alpha1.ClusterAffinity) []stri } // getClusterAndResource returns the cluster and resources from the resourceRegistry object -func (c *Controller) getResources(selectors []v1alpha1.ResourceSelector) []schema.GroupVersionResource { +func (c *Controller) getResources(selectors []searchv1alpha1.ResourceSelector) []schema.GroupVersionResource { resources := make([]schema.GroupVersionResource, 0) for _, rs := range selectors { gvr, err := restmapper.GetGroupVersionResource( diff --git a/pkg/util/gclient/gclient.go b/pkg/util/gclient/gclient.go index 1270e3662..50908fc0d 100644 --- a/pkg/util/gclient/gclient.go +++ b/pkg/util/gclient/gclient.go @@ -11,7 +11,7 @@ import ( clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" configv1alpha1 "github.com/karmada-io/karmada/pkg/apis/config/v1alpha1" - networkv1alpha1 "github.com/karmada-io/karmada/pkg/apis/networking/v1alpha1" + networkingv1alpha1 "github.com/karmada-io/karmada/pkg/apis/networking/v1alpha1" policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" searchv1alpha1 "github.com/karmada-io/karmada/pkg/apis/search/v1alpha1" workv1alpha1 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha1" @@ -25,7 +25,7 @@ func init() { var _ = scheme.AddToScheme(aggregatedScheme) // add Kubernetes schemes var _ = clusterv1alpha1.AddToScheme(aggregatedScheme) // add cluster schemes var _ = configv1alpha1.AddToScheme(aggregatedScheme) // add config v1alpha1 schemes - var _ = networkv1alpha1.AddToScheme(aggregatedScheme) // add network v1alpha1 schemes + var _ = networkingv1alpha1.AddToScheme(aggregatedScheme) // add network v1alpha1 schemes var _ = policyv1alpha1.AddToScheme(aggregatedScheme) // add propagation schemes var _ = workv1alpha1.AddToScheme(aggregatedScheme) // add work v1alpha1 schemes var _ = workv1alpha2.AddToScheme(aggregatedScheme) // add work v1alpha2 schemes