karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2325 from XiShanYongYe-Chang/update-import-aliases 

update import aliases
This commit is contained in:
karmada-bot 2022-08-04 17:25:02 +08:00 committed by GitHub
parent 393bf843de 2457cee11c
commit 0694d0cdd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/.import-aliases
View File

@ -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"
}

6
pkg/search/backendstore/opensearch.go
View File

@ -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")
}

4
pkg/search/backendstore/store.go
View File

@ -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()

12
pkg/search/controller.go
View File

@ -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(

4
pkg/util/gclient/gclient.go
View File

@ -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