Merge pull request #1631 from k8s-infra-cherrypick-robot/cherry-pick-1514-to-release-1.32

[release-1.32] Update Supervisor API calls to use FQDN

Author: k8s-ci-robot

pkg/cloudprovider/vsphereparavirtual/config.go

@@ -129,10 +129,9 @@ func getRestConfig(svConfigPath string) (*rest.Config, error) {
 	}
 
 	return &rest.Config{
-		Host: "https://" + net.JoinHostPort(svEndpoint.Endpoint, svEndpoint.Port),
+		Host: "https://" + net.JoinHostPort(SupervisorAPIServerFQDN, svEndpoint.Port),
 		TLSClientConfig: rest.TLSClientConfig{
-			CAData:     rootCA,
-			ServerName: SupervisorAPIServerFQDN,
+			CAData: rootCA,
 		},
 		BearerToken: string(token),
 	}, nil

pkg/cloudprovider/vsphereparavirtual/config_test.go

@@ -186,21 +186,24 @@ func TestGetNameSpace(t *testing.T) {
 func TestGetRestConfig(t *testing.T) {
 	tests := []struct {
 		fileExists bool
+		fqdn       string
 		endpoint   string
 		port       string
 		token      string
 		ca         string
 	}{
 		{
 			fileExists: false,
-			endpoint:   "test.sv.proxy",
+			fqdn:       "supervisor.default.svc",
+			endpoint:   "192.163.1.100",
 			port:       "6443",
 			token:      "test-token",
 			ca:         "test-ca",
 		},
 		{
 			fileExists: true,
-			endpoint:   "test.sv.proxy",
+			fqdn:       "supervisor.default.svc",
+			endpoint:   "192.163.1.200",
 			port:       "6443",
 			token:      "test-token",
 			ca:         "test-ca",
@@ -240,7 +243,7 @@ func TestGetRestConfig(t *testing.T) {
 			if err != nil {
 				t.Fatalf("Should succeed when a valid SV endpoint config is provided: %s", err)
 			}
-			if cfg.Host != "https://"+net.JoinHostPort(test.endpoint, test.port) {
+			if cfg.Host != "https://"+net.JoinHostPort(test.fqdn, test.port) {
 				t.Fatalf("incorrect Host: %s", cfg.Host)
 			}
 			if cfg.BearerToken != test.token {