From 4cd62691477c1556c6fcbb1c3d40ed6ef4930ffe Mon Sep 17 00:00:00 2001 From: Sean Knight Date: Fri, 11 Mar 2022 17:56:58 -0800 Subject: [PATCH] Preserve path for cluster server endpoints (fixes virtctl with Rancher) Signed-off-by: Sean Knight --- staging/src/kubevirt.io/client-go/kubecli/vmi.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/staging/src/kubevirt.io/client-go/kubecli/vmi.go b/staging/src/kubevirt.io/client-go/kubecli/vmi.go index 3364ce8fd92a..794cbe24a74d 100644 --- a/staging/src/kubevirt.io/client-go/kubecli/vmi.go +++ b/staging/src/kubevirt.io/client-go/kubecli/vmi.go @@ -27,6 +27,7 @@ import ( "io/ioutil" "net/http" "net/url" + "path" "strconv" "strings" "time" @@ -147,7 +148,10 @@ func RequestFromConfig(config *rest.Config, resource, name, namespace, subresour return nil, fmt.Errorf("Unsupported Protocol %s", u.Scheme) } - u.Path = fmt.Sprintf("/apis/subresources.kubevirt.io/%s/namespaces/%s/%s/%s/%s", v1.ApiStorageVersion, namespace, resource, name, subresource) + u.Path = path.Join( + u.Path, + fmt.Sprintf("/apis/subresources.kubevirt.io/%s/namespaces/%s/%s/%s/%s", v1.ApiStorageVersion, namespace, resource, name, subresource), + ) req := &http.Request{ Method: http.MethodGet, URL: u,