make -vars presedent over -var-file (#3902)

Signed-off-by: Artiom Diomin <artiom@kubermatic.com>

Author: kron4eg

test/e2e/terraform.go

@@ -25,12 +25,10 @@ import (
 	"k8c.io/kubeone/test/testexec"
 )
 
-var (
-	defaultTFEnvironment = []string{
-		"TF_IN_AUTOMATION=true",
-		"TF_CLI_ARGS=-no-color",
-	}
-)
+var defaultTFEnvironment = []string{
+	"TF_IN_AUTOMATION=true",
+	"TF_CLI_ARGS=-no-color",
+}
 
 type terraformBin struct {
 	path    string
@@ -79,14 +77,14 @@ func (tf *terraformBin) Destroy() error {
 func (tf *terraformBin) varFlags() []string {
 	var args []string
 
-	for _, arg := range tf.vars {
-		args = append(args, "-var", arg)
-	}
-
 	if tf.varFile != "" {
 		args = append(args, "-var-file", mustAbsolutePath(tf.varFile))
 	}
 
+	for _, arg := range tf.vars {
+		args = append(args, "-var", arg)
+	}
+
 	return args
 }
 

test/e2e/tests_definitions.go

@@ -915,7 +915,7 @@ var (
 				varFile: "testdata/vsphere.tfvars",
 				vars: []string{
 					"disable_auto_update=true",
-					"template_name=kkp-flatcar-stable",
+					"template_name=kkp-flatcar-3033.3",
 				},
 			},
 			protokol: protokolBin{
@@ -939,7 +939,7 @@ var (
 				varFile: "testdata/vsphere.tfvars",
 				vars: []string{
 					"disable_auto_update=true",
-					"template_name=kkp-flatcar-stable",
+					"template_name=kkp-flatcar-3033.3",
 				},
 			},
 			protokol: protokolBin{