Merge pull request #10649 from rifelpet/kubetest-upgrade

Use the same package marker for kubectl as for e2e binary
kubernetes · Jan 24, 2021 · 08d0183 · 08d0183
2 parents 57e2c8e + 6114c4f
commit 08d0183
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tests/e2e/pkg/tester/kubectl.go b/tests/e2e/pkg/tester/kubectl.go
@@ -41,7 +41,7 @@ func (t *Tester) AcquireKubectl() (string, error) {
 		cmd := exec.Command(
 			"gsutil",
 			"cat",
-			fmt.Sprintf("gs://%s/%s/latest.txt", t.TestPackageBucket, t.TestPackageDir),
+			fmt.Sprintf("gs://%s/%s/%v", t.TestPackageBucket, t.TestPackageDir, t.TestPackageMarker),
 		)
 		lines, err := exec.OutputLines(cmd)
 		if err != nil {
@@ -52,7 +52,7 @@ func (t *Tester) AcquireKubectl() (string, error) {
 		}
 		t.TestPackageVersion = lines[0]
 
-		klog.Infof("Kubectl package version was not specified. Defaulting to latest: %s", t.TestPackageVersion)
+		klog.Infof("Kubectl package version was not specified. Defaulting to version from %s: %s", t.TestPackageMarker, t.TestPackageVersion)
 	}
 
 	clientTar := fmt.Sprintf("kubernetes-client-%s-%s.tar.gz", runtime.GOOS, runtime.GOARCH)