feat(cluster): support path in address

api/platform/types.go

@@ -248,6 +248,7 @@ type ClusterAddress struct {
  // The cluster address.
  Host string
  Port int32
+ Path string
 }
 
 // +genclient

api/platform/v1/types.go

@@ -253,6 +253,7 @@ type ClusterAddress struct {
  // The cluster address.
  Host string `json:"host" protobuf:"bytes,2,opt,name=host"`
  Port int32 `json:"port" protobuf:"varint,3,name=port"`
+ Path string `json:"path" protobuf:"bytes,4,opt,name=path"`
 }
 
 // +genclient

pkg/platform/provider/imported/validation/cluster.go

@@ -22,6 +22,7 @@ import (
  "context"
  "errors"
  "fmt"
+ "strings"
  "time"
 
  apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -76,7 +77,15 @@ func ValidatClusterAddresses(addresses []platform.ClusterAddress, fldPath *field
  for _, msg := range validation.IsValidPortNum(int(address.Port)) {
  allErrs = append(allErrs, field.Invalid(fldPath.Child("port"), address.Port, msg))
  }
- err := utilvalidation.IsHTTPSReachle(address.Host, address.Port, 5*time.Second)
+ if address.Path != "" && !strings.HasPrefix(address.Path, "/") {
+ allErrs = append(allErrs, field.Invalid(fldPath.Child("path"), address.Path, "must start by `/`"))
+ }
+
+ url := fmt.Sprintf("https://%s:%d", address.Host, address.Port)
+ if address.Path != "" {
+ url = fmt.Sprintf("%s%s", url, address.Path)
+ }
+ err := utilvalidation.IsValiadURL(url, 5*time.Second)
  if err != nil {
  allErrs = append(allErrs, field.Invalid(fldPath, address, err.Error()))
  }

pkg/platform/util/client.go

@@ -26,6 +26,7 @@ import (
  "math/rand"
  "net"
  "net/http"
+ "path"
  "strings"
  "time"
 
@@ -528,6 +529,20 @@ func BuildClientSet(ctx context.Context, cluster *platform.Cluster, credential *
 
 // ClusterHost returns host and port for kube-apiserver of cluster.
 func ClusterHost(cluster *platform.Cluster) (string, error) {
+ address, err := ClusterAddress(cluster)
+ if err != nil {
+ return "", err
+ }
+
+ result := fmt.Sprintf("%s:%d", address.Host, address.Port)
+ if address.Path != "" {
+ result = path.Join(result, address.Path)
+ }
+
+ return result, nil
+}
+
+func ClusterAddress(cluster *platform.Cluster) (*platform.ClusterAddress, error) {
  addrs := make(map[platform.AddressType][]platform.ClusterAddress)
  for _, one := range cluster.Status.Addresses {
  addrs[one.Type] = append(addrs[one.Type], one)
@@ -543,12 +558,11 @@ func ClusterHost(cluster *platform.Cluster) (string, error) {
  address = &addrs[platform.AddressReal][rand.Intn(len(addrs[platform.AddressReal]))]
  }
  }
-
  if address == nil {
- return "", pkgerrors.New("no valid address for the cluster")
+ return nil, pkgerrors.New("no valid address for the cluster")
  }
 
- return fmt.Sprintf("%s:%d", address.Host, address.Port), nil
+ return address, nil
 }
 
 // ClusterV1Host returns host and port for kube-apiserver of versioned cluster resource.

pkg/platform/util/location.go

@@ -23,6 +23,7 @@ import (
  "fmt"
  "net/http"
  "net/url"
+ "path"
 
  "tkestack.io/tke/pkg/apiserver/authentication"
  "tkestack.io/tke/pkg/platform/apiserver/filter"
@@ -63,7 +64,7 @@ func APIServerLocationByCluster(ctx context.Context, cluster *platform.Cluster,
  if err != nil {
  return nil, nil, "", errors.NewInternalError(err)
  }
- host, err := ClusterHost(cluster)
+ address, err := ClusterAddress(cluster)
  if err != nil {
  return nil, nil, "", errors.NewInternalError(err)
  }
@@ -72,12 +73,16 @@ func APIServerLocationByCluster(ctx context.Context, cluster *platform.Cluster,
  if clusterCredential.Token != nil {
  token = *clusterCredential.Token
  }
+ urlPath := requestInfo.Path
+ if address.Path != "" {
+ urlPath = path.Join(address.Path, requestInfo.Path)
+ }
 
  // Otherwise, return the requested scheme and port, and the proxy transport
  return &url.URL{
  Scheme: "https",
- Host: host,
- Path: requestInfo.Path,
+ Host: fmt.Sprintf("%v:%v", address.Host, address.Port),
+ Path: urlPath,
  }, transport, token, nil
 }
 

pkg/util/validation/validation.go

@@ -20,7 +20,6 @@ package validation
 
 import (
  "crypto/tls"
- "fmt"
  "net"
  "net/http"
  "time"
@@ -29,8 +28,8 @@ import (
  "tkestack.io/tke/pkg/util/ipallocator"
 )
 
-// IsHTTPSReachle tests that https://host:port is reachble in timeout.
-func IsHTTPSReachle(host string, port int32, timeout time.Duration) error {
+// IsValiadURL tests that https://host:port is reachble in timeout.
+func IsValiadURL(url string, timeout time.Duration) error {
  client := &http.Client{
  Transport: &http.Transport{
  Proxy: http.ProxyFromEnvironment,
@@ -41,7 +40,6 @@ func IsHTTPSReachle(host string, port int32, timeout time.Duration) error {
  },
  }
 
- url := fmt.Sprintf("https://%s:%d", host, port)
  request, err := http.NewRequest(http.MethodGet, url, nil)
  if err != nil {
  return err