review fixes

kubernetes-sigs · Sep 23, 2022 · 334f6a8 · 334f6a8
1 parent 3923630
commit 334f6a8
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/test/e2e/clusterctl_upgrade.go b/test/e2e/clusterctl_upgrade.go
@@ -139,13 +139,11 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
 		Expect(input.ClusterctlConfigPath).To(BeAnExistingFile(), "Invalid argument. input.ClusterctlConfigPath must be an existing file when calling %s spec", specName)
 		Expect(input.BootstrapClusterProxy).ToNot(BeNil(), "Invalid argument. input.BootstrapClusterProxy can't be nil when calling %s spec", specName)
 
-		var clusterctlBinaryURLTemplate string
-		if input.InitWithBinary == "" {
+		clusterctlBinaryURLTemplate := input.InitWithBinary
+		if clusterctlBinaryURLTemplate == "" {
 			Expect(input.E2EConfig.Variables).To(HaveKey(initWithBinaryVariableName), "Invalid argument. %s variable must be defined when calling %s spec", initWithBinaryVariableName, specName)
 			Expect(input.E2EConfig.Variables[initWithBinaryVariableName]).ToNot(BeEmpty(), "Invalid argument. %s variable can't be empty when calling %s spec", initWithBinaryVariableName, specName)
 			clusterctlBinaryURLTemplate = input.E2EConfig.GetVariable(initWithBinaryVariableName)
-		} else {
-			clusterctlBinaryURLTemplate = input.InitWithBinary
 		}
 		clusterctlBinaryURLReplacer := strings.NewReplacer("{OS}", runtime.GOOS, "{ARCH}", runtime.GOARCH)
 		initClusterctlBinaryURL = clusterctlBinaryURLReplacer.Replace(clusterctlBinaryURLTemplate)
@@ -161,12 +159,11 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
 			initContract = input.InitWithProvidersContract
 		}
 
-		if input.InitWithKubernetesVersion == "" {
+		initKubernetesVersion = input.InitWithKubernetesVersion
+		if initKubernetesVersion == "" {
 			Expect(input.E2EConfig.Variables).To(HaveKey(initWithKubernetesVersion), "Invalid argument. %s variable must be defined when calling %s spec", initWithKubernetesVersion, specName)
 			Expect(input.E2EConfig.Variables[initWithKubernetesVersion]).ToNot(BeEmpty(), "Invalid argument. %s variable can't be empty when calling %s spec", initWithKubernetesVersion, specName)
 			initKubernetesVersion = input.E2EConfig.GetVariable(initWithKubernetesVersion)
-		} else {
-			initKubernetesVersion = input.InitWithKubernetesVersion
 		}
 
 		Expect(input.E2EConfig.Variables).To(HaveKey(KubernetesVersion))