Merge pull request #66 from sttts/sttts-remove-cluster-roundtripper

🌱 remove unused ClusterRoundTripper

Author: openshift-merge-robot

pkg/client/cluster_config.go

@@ -17,25 +17,11 @@ limitations under the License.
 package client
 
 import (
-	"net/http"
-
 	"github.com/kcp-dev/logicalcluster/v3"
 
 	"k8s.io/client-go/rest"
 )
 
-// SetMultiClusterRoundTripper wraps an existing config's roundtripper
-// with a custom cluster aware roundtripper.
-//
-// Note: it is the caller responsibility to make a copy of the rest config
-func SetMultiClusterRoundTripper(cfg *rest.Config) *rest.Config {
-	cfg.Wrap(func(rt http.RoundTripper) http.RoundTripper {
-		return NewClusterRoundTripper(rt)
-	})
-
-	return cfg
-}
-
 // SetCluster modifies the config host path to include the
 // cluster endpoint.
 //

pkg/client/round_tripper.go

@@ -18,35 +18,12 @@ package client
 
 import (
 	"fmt"
-	"net/http"
 	"regexp"
 	"strings"
 
 	"github.com/kcp-dev/logicalcluster/v3"
 )
 
-// ClusterRoundTripper is a cluster aware wrapper around http.RoundTripper
-type ClusterRoundTripper struct {
-	delegate http.RoundTripper
-}
-
-// NewClusterRoundTripper creates a new cluster aware round tripper
-func NewClusterRoundTripper(delegate http.RoundTripper) *ClusterRoundTripper {
-	return &ClusterRoundTripper{
-		delegate: delegate,
-	}
-}
-
-func (c *ClusterRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	cluster, ok := logicalcluster.ClusterFromContext(req.Context())
-	if ok {
-		req = req.Clone(req.Context())
-		req.URL.Path = generatePath(req.URL.Path, cluster.Path())
-		req.URL.RawPath = generatePath(req.URL.RawPath, cluster.Path())
-	}
-	return c.delegate.RoundTrip(req)
-}
-
 // apiRegex matches any string that has /api/ or /apis/ in it.
 var apiRegex = regexp.MustCompile(`(/api/|/apis/)`)