From d6f3d3c6905ddca8400e957edce8904e6beda8fa Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Wed, 17 Feb 2021 23:25:35 -0600 Subject: [PATCH] kubetest2 - support terraform with `kops create cluster` Previously we were only recognizing it with `kops create --filename` --- tests/e2e/kubetest2-kops/deployer/up.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/e2e/kubetest2-kops/deployer/up.go b/tests/e2e/kubetest2-kops/deployer/up.go index 9144dbbb36..34bb73ecfc 100644 --- a/tests/e2e/kubetest2-kops/deployer/up.go +++ b/tests/e2e/kubetest2-kops/deployer/up.go @@ -118,6 +118,10 @@ func (d *deployer) createCluster(zones []string, adminAccess string) error { args = appendIfUnset(args, "--master-size", "s-8vcpu-16gb") } + if d.terraform != nil { + args = append(args, "--target", "terraform", "--out", d.terraform.Dir()) + } + klog.Info(strings.Join(args, " ")) cmd := exec.Command(args[0], args[1:]...) cmd.SetEnv(d.env()...) @@ -127,6 +131,13 @@ func (d *deployer) createCluster(zones []string, adminAccess string) error { if err != nil { return err } + + if d.terraform != nil { + if err := d.terraform.InitApply(); err != nil { + return err + } + } + return nil }