remove GetRESTConfigFromSecret

Author: qliang

controllers/clustercache/cluster_accessor.go

@@ -437,19 +437,6 @@ func (ca *clusterAccessor) KubeConfigUpdated(ctx context.Context) (bool, error)
 	return kubeconfigSecret.ResourceVersion != ca.lockedState.kubeconfigResourceVersion, nil
 }
 
-func (ca *clusterAccessor) GetRESTConfigFromSecret(ctx context.Context) (*rest.Config, error) {
-	ca.rLock(ctx)
-	defer ca.rUnlock(ctx)
-
-	log := ctrl.LoggerFrom(ctx)
-	log.V(6).Info("Creating REST config")
-	restConfig, err := createRESTConfig(ctx, ca.config.Client, ca.config.SecretClient, ca.cluster)
-	if err != nil {
-		return nil, err
-	}
-	return restConfig, nil
-}
-
 func (ca *clusterAccessor) GetClientCertificatePrivateKey(ctx context.Context) *rsa.PrivateKey {
 	ca.rLock(ctx)
 	defer ca.rUnlock(ctx)

controllers/clustercache/cluster_cache.go

@@ -137,10 +137,6 @@ type ClusterCache interface {
 	// If there is no connection to the workload cluster ErrClusterNotConnected will be returned.
 	GetRESTConfig(ctx context.Context, cluster client.ObjectKey) (*rest.Config, error)
 
-	// GetRESTConfigFromSecret returns a REST config for the given cluster.
-	// It reads the REST config from kubeconfig secret directly.
-	GetRESTConfigFromSecret(ctx context.Context, cluster client.ObjectKey) (*rest.Config, error)
-
 	// GetClientCertificatePrivateKey returns a private key that is generated once for a cluster
 	// and can then be used to generate client certificates. This is e.g. used in KCP to generate a client
 	// cert to communicate with etcd.
@@ -388,14 +384,6 @@ func (cc *clusterCache) GetRESTConfig(ctx context.Context, cluster client.Object
 	return accessor.GetRESTConfig(ctx)
 }
 
-func (cc *clusterCache) GetRESTConfigFromSecret(ctx context.Context, cluster client.ObjectKey) (*rest.Config, error) {
-	accessor := cc.getClusterAccessor(cluster)
-	if accessor == nil {
-		return nil, errors.Wrapf(ErrClusterNotConnected, "error getting REST config")
-	}
-	return accessor.GetRESTConfigFromSecret(ctx)
-}
-
 func (cc *clusterCache) GetClientCertificatePrivateKey(ctx context.Context, cluster client.ObjectKey) (*rsa.PrivateKey, error) {
 	accessor := cc.getClusterAccessor(cluster)
 	if accessor == nil {