Merge branch 'main' into laverya/sc-97016/enforce-using-the-same-binary-on-each-node

Author: laverya

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

web/src/features/Dashboard/components/Dashboard.tsx

@@ -757,7 +757,7 @@ const Dashboard = (props: Props) => {
             >
               <div className="Modal-body">
                 <p className="u-fontSize--large u-fontWeight--bold u-textColor--primary">
-                  Error uploading airgap buundle
+                  Error uploading airgap bundle
                 </p>
                 <div className="ExpandedError--wrapper u-marginTop--10 u-marginBottom--10">
                   <p className="u-fontSize--normal u-textColor--error">