Prepend Kubernetes API path, if present (#5256)

laverya · SSvilen · web-flow · commit f31ff2c1126c · 2025-04-16T15:48:12.000Z
* git push

* add api path to the request

---------

Co-authored-by: Svilen Sultanov &lt;sultanov_s@outlook.de&gt;
diff --git a/pkg/k8sutil/portforward.go b/pkg/k8sutil/portforward.go
@@ -360,7 +360,6 @@ func createDialer(cfg *rest.Config, namespace string, podName string) (httpstrea
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create roundtriper")
 	}
-	path := fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/portforward", namespace, podName)
 	scheme := ""
 	hostIP := cfg.Host
 
@@ -373,6 +372,7 @@ func createDialer(cfg *rest.Config, namespace string, podName string) (httpstrea
 		scheme = u.Scheme
 		hostIP = u.Host
 	}
+	path := fmt.Sprintf("%s/api/v1/namespaces/%s/pods/%s/portforward", u.Path, namespace, podName)
 
 	serverURL := url.URL{Scheme: scheme, Path: path, Host: hostIP}
 	return spdy.NewDialer(upgrader, &http.Client{Transport: roundTripper}, http.MethodPost, &serverURL), nil

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,6 @@ func createDialer(cfg *rest.Config, namespace string, podName string) (httpstrea`
`360`	`360`	`if err != nil {`
`361`	`361`	`return nil, errors.Wrap(err, "failed to create roundtriper")`
`362`	`362`	`}`
`363`		`- path := fmt.Sprintf("/api/v1/namespaces/%s/pods/%s/portforward", namespace, podName)`
`364`	`363`	`scheme := ""`
`365`	`364`	`hostIP := cfg.Host`
`366`	`365`
`@@ -373,6 +372,7 @@ func createDialer(cfg *rest.Config, namespace string, podName string) (httpstrea`
`373`	`372`	`scheme = u.Scheme`
`374`	`373`	`hostIP = u.Host`
`375`	`374`	`}`
	`375`	`+ path := fmt.Sprintf("%s/api/v1/namespaces/%s/pods/%s/portforward", u.Path, namespace, podName)`
`376`	`376`
`377`	`377`	`serverURL := url.URL{Scheme: scheme, Path: path, Host: hostIP}`
`378`	`378`	`return spdy.NewDialer(upgrader, &http.Client{Transport: roundTripper}, http.MethodPost, &serverURL), nil`