Update providers and examples to use multicluster.ErrClusterNotFound

On-behalf-of: SAP <[email protected]>
Signed-off-by: Marvin Beckers <[email protected]>

Author: embik

examples/cluster-api/main.go

@@ -40,6 +40,7 @@ import (
 
 	mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
 	mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
+	"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
 	mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
 	capi "sigs.k8s.io/multicluster-runtime/providers/cluster-api"
 )
@@ -103,6 +104,10 @@ func main() {
 
 				cl, err := mcMgr.GetCluster(ctx, req.ClusterName)
 				if err != nil {
+					if errors.Is(err, multicluster.ErrClusterNotFound) {
+						log.Info("Cluster not found, might have been disengaged")
+						return reconcile.Result{}, nil
+					}
 					return reconcile.Result{}, err
 				}
 

examples/kind/main.go

@@ -35,6 +35,7 @@ import (
 
 	mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
 	mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
+	"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
 	mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
 	"sigs.k8s.io/multicluster-runtime/providers/kind"
 )
@@ -61,7 +62,10 @@ func main() {
 
 				cl, err := mgr.GetCluster(ctx, req.ClusterName)
 				if err != nil {
-					return reconcile.Result{}, err
+					if errors.Is(err, multicluster.ErrClusterNotFound) {
+						log.Info("Cluster not found, might have been disengaged")
+						return reconcile.Result{}, nil
+					}
 				}
 
 				cm := &corev1.ConfigMap{}

examples/namespace/main.go

@@ -43,6 +43,7 @@ import (
 
 	mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
 	mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
+	"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
 	mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
 	"sigs.k8s.io/multicluster-runtime/providers/namespace"
 )
@@ -127,6 +128,10 @@ func main() {
 
 				cl, err := mgr.GetCluster(ctx, req.ClusterName)
 				if err != nil {
+					if errors.Is(err, multicluster.ErrClusterNotFound) {
+						log.Info("Cluster not found, might have been disengaged")
+						return reconcile.Result{}, nil
+					}
 					return reconcile.Result{}, err
 				}
 

providers/cluster-api/provider.go

@@ -123,7 +123,7 @@ func (p *Provider) Get(_ context.Context, clusterName string) (cluster.Cluster,
 		return cl, nil
 	}
 
-	return nil, fmt.Errorf("cluster %s not found", clusterName)
+	return nil, multicluster.ErrClusterNotFound
 }
 
 // Run starts the provider and blocks.

providers/kind/provider.go

@@ -73,7 +73,7 @@ func (p *Provider) Get(ctx context.Context, clusterName string) (cluster.Cluster
 		return cl, nil
 	}
 
-	return nil, fmt.Errorf("cluster %s not found", clusterName)
+	return nil, multicluster.ErrClusterNotFound
 }
 
 // Run starts the provider and blocks.

providers/namespace/provider.go

@@ -134,7 +134,8 @@ func (p *Provider) Get(_ context.Context, clusterName string) (cluster.Cluster,
 	if cl, ok := p.clusters[clusterName]; ok {
 		return cl, nil
 	}
-	return nil, fmt.Errorf("cluster %s not found", clusterName)
+
+	return nil, multicluster.ErrClusterNotFound
 }
 
 // IndexField indexes a field on all clusters.

providers/nop/provider.go

@@ -18,7 +18,6 @@ package namespace
 
 import (
 	"context"
-	"fmt"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/cluster"
@@ -45,7 +44,7 @@ func (p *Provider) Run(ctx context.Context, _ mcmanager.Manager) error {
 
 // Get returns an error for any cluster name.
 func (p *Provider) Get(_ context.Context, clusterName string) (cluster.Cluster, error) {
-	return nil, fmt.Errorf("cluster %s not found", clusterName)
+	return nil, multicluster.ErrClusterNotFound
 }
 
 // IndexField does nothing.

providers/single/provider.go

@@ -18,7 +18,6 @@ package namespace
 
 import (
 	"context"
-	"fmt"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/cluster"
@@ -55,7 +54,7 @@ func (p *Provider) Get(_ context.Context, clusterName string) (cluster.Cluster,
 	if clusterName == p.name {
 		return p.cl, nil
 	}
-	return nil, fmt.Errorf("cluster %s not found", clusterName)
+	return nil, multicluster.ErrClusterNotFound
 }
 
 // IndexField calls IndexField on the single cluster.