Merge pull request #57 from Colvin-Y/enhancement/kubeconfig-provider

✨ enhancement: kubeconfig provider support more params

Author: k8s-ci-robot

providers/kubeconfig/provider.go

@@ -29,8 +29,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -63,9 +62,6 @@ func New(opts Options) *Provider {
 	if opts.KubeconfigSecretKey == "" {
 		opts.KubeconfigSecretKey = DefaultKubeconfigSecretKey
 	}
-	if opts.Scheme == nil {
-		opts.Scheme = scheme.Scheme
-	}
 
 	return &Provider{
 		opts:     opts,
@@ -82,8 +78,10 @@ type Options struct {
 	KubeconfigSecretLabel string
 	// KubeconfigSecretKey is the key in the secret data that contains the kubeconfig.
 	KubeconfigSecretKey string
-	// Scheme is the scheme to use for the clusters.
-	Scheme *runtime.Scheme
+	// ClusterOptions is the list of options to pass to the cluster object.
+	ClusterOptions []cluster.Option
+	// RESTOptions is the list of options to pass to the rest client.
+	RESTOptions []func(cfg *rest.Config) error
 }
 
 type index struct {
@@ -259,11 +257,16 @@ func (p *Provider) createAndEngageCluster(ctx context.Context, clusterName strin
 		return fmt.Errorf("failed to parse kubeconfig: %w", err)
 	}
 
+	// Apply REST options
+	for _, opt := range p.opts.RESTOptions {
+		if err := opt(restConfig); err != nil {
+			return fmt.Errorf("failed to apply REST option: %w", err)
+		}
+	}
+
 	// Create a new cluster
 	log.Info("Creating new cluster from kubeconfig")
-	cl, err := cluster.New(restConfig, func(o *cluster.Options) {
-		o.Scheme = p.opts.Scheme
-	})
+	cl, err := cluster.New(restConfig, p.opts.ClusterOptions...)
 	if err != nil {
 		return fmt.Errorf("failed to create cluster: %w", err)
 	}

providers/kubeconfig/provider_test.go

@@ -28,6 +28,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/clientcmd/api"
@@ -42,6 +43,7 @@ import (
 
 	mcbuilder "sigs.k8s.io/multicluster-runtime/pkg/builder"
 	mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
+	mcluster "sigs.k8s.io/multicluster-runtime/pkg/multicluster"
 	mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -79,6 +81,18 @@ var _ = Describe("Provider Namespace", Ordered, func() {
 			KubeconfigSecretLabel: kubeconfigSecretLabel,
 			Namespace:             kubeconfigSecretNamespace,
 			KubeconfigSecretKey:   kubeconfigSecretKey,
+			RESTOptions: []func(cfg *rest.Config) error{
+				func(cfg *rest.Config) error {
+					cfg.QPS = 100
+					cfg.Burst = 200
+					return nil
+				},
+			},
+			ClusterOptions: []cluster.Option{
+				func(clusterOptions *cluster.Options) {
+					clusterOptions.Scheme = scheme.Scheme
+				},
+			},
 		})
 
 		By("Creating a namespace in the local cluster", func() {
@@ -432,7 +446,7 @@ var _ = Describe("Provider race condition", func() {
 				case 1:
 					// Concurrently get a cluster.
 					_, err := p.Get(context.Background(), "cluster-1")
-					Expect(err).To(Or(BeNil(), MatchError("cluster cluster-1 not found")))
+					Expect(err).To(Or(BeNil(), MatchError(mcluster.ErrClusterNotFound)))
 				case 2:
 					// Concurrently list clusters.
 					p.ListClusters()