Merge pull request #1054 from stoneshi-yunify/master

fix argocd controller

Author: stoneshi-yunify

controllers/argocd/multi-cluster-controller.go

@@ -62,11 +62,6 @@ func (r *MultiClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		}
 	}
 
-	// ignore the host cluster
-	if ignore(cluster) {
-		return
-	}
-
 	ownerRef := getOwnerReference(cluster)
 	argoCluster := createArgoCluster(cluster)
 	argoCluster.SetNamespace(r.argocdNamespace)
@@ -196,14 +191,6 @@ func getCluster(client client.Reader, namespacedName types.NamespacedName) (clus
 	return
 }
 
-func ignore(cluster *unstructured.Unstructured) bool {
-	if cluster != nil {
-		_, ok := cluster.GetLabels()["cluster-role.kubesphere.io/host"]
-		return ok
-	}
-	return true
-}
-
 // GetName returns the name of this controller
 func (r *MultiClusterReconciler) GetName() string {
 	return "ArgoCDMultiClusterController"

controllers/argocd/multi-cluster-controller_test.go

@@ -37,49 +37,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 
-func Test_ignore(t *testing.T) {
-	sampleCluster := &unstructured.Unstructured{}
-	sampleCluster.SetKind("Cluster")
-	sampleCluster.SetAPIVersion("cluster.kubesphere.io/v1alpha1")
-
-	type args struct {
-		cluster func() *unstructured.Unstructured
-	}
-	tests := []struct {
-		name string
-		args args
-		want bool
-	}{{
-		name: "cluster is nil",
-		want: true,
-	}, {
-		name: "cluster without the particular label",
-		args: args{cluster: func() *unstructured.Unstructured {
-			return sampleCluster.DeepCopy()
-		}},
-		want: false,
-	}, {
-		name: "with the particular label",
-		args: args{cluster: func() *unstructured.Unstructured {
-			cluster := sampleCluster.DeepCopy()
-			cluster.SetLabels(map[string]string{
-				"cluster-role.kubesphere.io/host": "",
-			})
-			return cluster
-		}},
-		want: true,
-	}}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var cluster *unstructured.Unstructured
-			if tt.args.cluster != nil {
-				cluster = tt.args.cluster()
-			}
-			assert.Equalf(t, tt.want, ignore(cluster), "ignore(%v)", tt.args.cluster)
-		})
-	}
-}
-
 func Test_createArgoCluster(t *testing.T) {
 	defaultCluster := &unstructured.Unstructured{}
 	defaultCluster.SetKind("Cluster")

controllers/fluxcd/multi-cluster-controller.go

@@ -57,26 +57,13 @@ func (r *MultiClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		return
 	}
 
-	// ignore the host cluster
-	if ignore(cluster) {
-		return
-	}
-
 	if err = r.reconcileCluster(ctx, cluster); err != nil {
 		return
 	}
 
 	return
 }
 
-func ignore(cluster *unstructured.Unstructured) bool {
-	if cluster != nil {
-		_, ok := cluster.GetLabels()["cluster-role.kubesphere.io/host"]
-		return ok
-	}
-	return true
-}
-
 func (r *MultiClusterReconciler) reconcileCluster(ctx context.Context, cluster *unstructured.Unstructured) (err error) {
 	name := cluster.GetName()
 	nsList := &v1.NamespaceList{}

controllers/fluxcd/multi-cluster-controller_test.go

@@ -37,49 +37,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
-func Test_ignore(t *testing.T) {
-	sampleCluster := &unstructured.Unstructured{}
-	sampleCluster.SetKind("Cluster")
-	sampleCluster.SetAPIVersion("cluster.kubesphere.io/v1alpha1")
-
-	type args struct {
-		cluster func() *unstructured.Unstructured
-	}
-	tests := []struct {
-		name string
-		args args
-		want bool
-	}{{
-		name: "cluster is nil",
-		want: true,
-	}, {
-		name: "cluster without the particular label",
-		args: args{cluster: func() *unstructured.Unstructured {
-			return sampleCluster.DeepCopy()
-		}},
-		want: false,
-	}, {
-		name: "with the particular label",
-		args: args{cluster: func() *unstructured.Unstructured {
-			cluster := sampleCluster.DeepCopy()
-			cluster.SetLabels(map[string]string{
-				"cluster-role.kubesphere.io/host": "",
-			})
-			return cluster
-		}},
-		want: true,
-	}}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var cluster *unstructured.Unstructured
-			if tt.args.cluster != nil {
-				cluster = tt.args.cluster()
-			}
-			assert.Equalf(t, tt.want, ignore(cluster), "ignore(%v)", tt.args.cluster)
-		})
-	}
-}
-
 func TestMultiClusterReconciler_Reconcile(t *testing.T) {
 	schema, err := v1alpha1.SchemeBuilder.Register().Build()
 	assert.Nil(t, err)