removed unused variable n functions

Author: rajguptavm

tests/e2e/e2e_common.go

@@ -464,16 +464,9 @@ var (
 
 // multiSvc env variables
 var (
-	vcSessionWaitTime                   = 5 * time.Minute
 	envStoragePolicyNameForSharedDsSvc1 = "STORAGE_POLICY_FOR_SHARED_DATASTORES_SVC1"
 	envStoragePolicyNameForSharedDsSvc2 = "STORAGE_POLICY_FOR_SHARED_DATASTORES_SVC2"
-	envSupervisorClusterNamespace1      = "SVC_NAMESPACE1"
-	envNfsDatastoreName                 = "NFS_DATASTORE_NAME"
-	envNfsDatastoreIP                   = "NFS_DATASTORE_IP"
 	pwdRotationTimeout                  = 10 * time.Minute
-	roleCnsDatastore                    = "CNS-SUPERVISOR-DATASTORE"
-	roleCnsSearchAndSpbm                = "CNS-SUPERVISOR-SEARCH-AND-SPBM"
-	roleCnsHostConfigStorageAndCnsVm    = "CNS-SUPERVISOR-HOST-CONFIG-STORAGE-AND-CNS-VM"
 )
 
 // For rwx

tests/e2e/util.go

@@ -100,9 +100,7 @@ import (
 var (
 	defaultCluster         *object.ClusterComputeResource
 	svcClient              clientset.Interface
-	svcClient1             clientset.Interface
 	svcNamespace           string
-	svcNamespace1          string
 	vsanHealthClient       *VsanClient
 	clusterComputeResource []*object.ClusterComputeResource
 	defaultDatastore       *object.Datastore
@@ -1113,31 +1111,6 @@ func getSvcClientAndNamespace() (clientset.Interface, string) {
 	return svcClient, svcNamespace
 }
 
-// create kubernetes client for multi-supervisors clusters and returns it along with namespaces
-func getMultiSvcClientAndNamespace() ([]clientset.Interface, []string, []error) {
-	var err error
-	if svcClient == nil {
-		if k8senv := GetAndExpectStringEnvVar("KUBECONFIG"); k8senv != "" {
-			svcClient, err = createKubernetesClientFromConfig(k8senv)
-			if err != nil {
-				return []clientset.Interface{}, []string{}, []error{err, nil}
-			}
-		}
-		svcNamespace = GetAndExpectStringEnvVar(envSupervisorClusterNamespace)
-	}
-	if svcClient1 == nil {
-		if k8senv := GetAndExpectStringEnvVar("KUBECONFIG1"); k8senv != "" {
-			svcClient1, err = createKubernetesClientFromConfig(k8senv)
-			if err != nil {
-				return []clientset.Interface{}, []string{}, []error{nil, err}
-			}
-		}
-		svcNamespace1 = GetAndExpectStringEnvVar(envSupervisorClusterNamespace1)
-	}
-	// returns list of clientset, namespace and error if any for both svc
-	return []clientset.Interface{svcClient, svcClient1}, []string{svcNamespace, svcNamespace1}, []error{}
-}
-
 // updateCSIDeploymentTemplateFullSyncInterval helps to update the
 // FULL_SYNC_INTERVAL_MINUTES in deployment template. For this to take effect,
 // we need to terminate the running csi controller pod.