move verify kubectl outside of init, since kubectl binaries can be bu…

…ilt after Build()
pseudomuto · Feb 26, 2021 · 26ae4ec · 26ae4ec
1 parent e47ce91
commit 26ae4ec
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/kubetest2-gce/deployer/down.go b/kubetest2-gce/deployer/down.go
@@ -32,15 +32,21 @@ func (d *deployer) Down() error {
 		return fmt.Errorf("down failed to init: %s", err)
 	}
 
+	path, err := d.verifyKubectl()
+	if err != nil {
+		return err
+	}
+	d.kubectlPath = path
+
 	env := d.buildEnv()
 	script := filepath.Join(d.RepoRoot, "cluster", "kube-down.sh")
 	klog.V(2).Infof("About to run script at: %s", script)
 
 	cmd := exec.Command(script)
 	cmd.SetEnv(env...)
 	exec.InheritOutput(cmd)
-	err := cmd.Run()
-	if err != nil {
+
+	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("error encountered during %s: %s", script, err)
 	}
 

diff --git a/kubetest2-gce/deployer/up.go b/kubetest2-gce/deployer/up.go
@@ -63,6 +63,12 @@ func (d *deployer) Up() error {
 		return fmt.Errorf("up failed to init: %s", err)
 	}
 
+	path, err := d.verifyKubectl()
+	if err != nil {
+		return err
+	}
+	d.kubectlPath = path
+
 	if d.EnableComputeAPI {
 		klog.V(2).Info("enabling compute API for project")
 		if err := enableComputeAPI(d.GCPProject); err != nil {
@@ -83,13 +89,12 @@ func (d *deployer) Up() error {
 	cmd := exec.Command(script)
 	cmd.SetEnv(env...)
 	exec.InheritOutput(cmd)
-	err := cmd.Run()
-	if err != nil {
+
+	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("error encountered during %s: %s", script, err)
 	}
 
-	isUp, err := d.IsUp()
-	if err != nil {
+	if isUp, err := d.IsUp(); err != nil {
 		klog.Warningf("failed to check if cluster is up: %s", err)
 	} else if isUp {
 		klog.V(1).Infof("cluster reported as up")