Merge pull request #1083 from GoogleCloudPlatform/revert-1082-update_sidecar

Revert "Use full custer version for feature version comparison"

Author: amacaskill

test/e2e/run-e2e-local.sh

@@ -21,7 +21,7 @@ set -o errexit
 
 readonly PKGDIR=$(realpath "$( dirname -- "$0"; )/../..")
 readonly gke_cluster_region=${GKE_CLUSTER_REGION:-us-central1}
-readonly gke_cluster_version=$(kubectl version 2>/dev/null | grep 'Server Version:' | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+(-gke\.[0-9]+)?$')
+readonly gke_cluster_version=$(kubectl version | grep -Eo 'Server Version: v[0-9]+\.[0-9]+\.[0-9]+' | grep -Eo  '[0-9]+\.[0-9]+\.[0-9]+')
 readonly gke_release_channel=${GKE_RELEASE_CHANNEL:-rapid}
 readonly use_gke_autopilot=${E2E_TEST_USE_GKE_AUTOPILOT:-false}
 readonly cloudsdk_api_endpoint_overrides_container=${CLOUDSDK_API_ENDPOINT_OVERRIDES_CONTAINER:-https://container.googleapis.com/}

test/e2e/utils/handler.go

@@ -150,18 +150,6 @@ func Handle(testParams *TestParameters) error {
 				klog.Errorf("failed to cluster down: %v", err)
 			}
 		}()
-
-		// Fetch the cluster version.
-		cmd := exec.Command("bash", "-c",
-			fmt.Sprintf("gcloud container clusters describe %s --location %s | grep version | grep -Eo '[0-9]+\\.[0-9]+\\.[0-9]+(-gke\\.[0-9]+)?$'",
-				testParams.GkeClusterName,
-				testParams.GkeClusterRegion))
-		output, err = cmd.CombinedOutput()
-		if err != nil {
-			return fmt.Errorf("failed to get cluster version, output: %s, err: %w", string(output), err)
-		}
-		testParams.GkeClusterVersion = strings.TrimSpace(string(output))
-		klog.Infof("GKE cluster version: %s", testParams.GkeClusterVersion)
 	}
 	// TODO(jaimebz): Extract server version using kubeapi if not present.
 
@@ -227,6 +215,7 @@ func Handle(testParams *TestParameters) error {
 	if err != nil {
 		klog.Fatalf(`managed driver version for sidecar bucket access check support could not be determined: %v`, err)
 	}
+
 	if err = os.Setenv(TestWithSidecarBucketAccessCheckEnvVar, strconv.FormatBool(supportSidecarBucketAccessCheck && testParams.EnableSidecarBucketAccessCheck)); err != nil {
 		klog.Fatalf(`env variable "%s" could not be set: %v`, TestWithSidecarBucketAccessCheckEnvVar, err)
 	}