Merge pull request #1524 from zhanggbj/dep_tkc

🐛 Update config file path due to TKC retirement

Author: k8s-ci-robot

pkg/cloudprovider/vsphereparavirtual/config/config.go

@@ -31,7 +31,7 @@ import (
 
 const (
 	// VsphereParavirtualCloudProviderConfigPath is the path for vsphere paravirtual cloud provider config file
-	VsphereParavirtualCloudProviderConfigPath string = "/etc/kubernetes/guestclusters/tanzukubernetescluster/ownerref.json"
+	VsphereParavirtualCloudProviderConfigPath string = "/etc/kubernetes/guestclusters/cluster/ownerref.json"
 	// SupervisorClusterConfigPath is the path for supervisor access related files,
 	// like secret related file
 	SupervisorClusterConfigPath = "/etc/cloud/ccm-provider"

pkg/cloudprovider/vsphereparavirtual/config/config_test.go

@@ -38,8 +38,8 @@ func TestReadOwnerRef(t *testing.T) {
 	}{
 		{
 			true,
-			"v1alpha1",
-			"TanzuKubernetesCluster",
+			"v1beta2",
+			"Cluster",
 			"my-cluster",
 			"798ea504-0a4d-4e3b-a67c-77812c89071c",
 		},

pkg/cloudprovider/vsphereparavirtual/loadbalancer_test.go

@@ -47,8 +47,8 @@ var (
 	testK8sServiceName      = "test-lb-service"
 	testK8sServiceNameSpace = "test-service-ns"
 	testOwnerReference      = metav1.OwnerReference{
-		APIVersion: "v1alpha1",
-		Kind:       "TanzuKubernetesCluster",
+		APIVersion: "v1beta2",
+		Kind:       "Cluster",
 		Name:       testClustername,
 		UID:        "1bbf49a7-fbce-4502-bb4c-4c3544cacc9e",
 	}

pkg/cloudprovider/vsphereparavirtual/vmservice/vmservice_test.go

@@ -46,8 +46,8 @@ var (
 	testK8sServiceNameSpace                 = "test-service-ns"
 	testServiceAnnotationPropagationEnabled = false
 	testOwnerReference                      = metav1.OwnerReference{
-		APIVersion: "v1alpha1",
-		Kind:       "TanzuKubernetesCluster",
+		APIVersion: "v1beta2",
+		Kind:       "Cluster",
 		Name:       testClustername,
 		UID:        "1bbf49a7-fbce-4502-bb4c-4c3544cacc9e",
 	}