Implement force for kubectl command

jetstack · Jul 9, 2018 · 4c70a54 · 4c70a54
1 parent 68b1bf1
commit 4c70a54
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/pkg/tarmak/kubectl/kubectl.go b/pkg/tarmak/kubectl/kubectl.go
@@ -49,8 +49,10 @@ func (k *Kubectl) requestNewAdminCert(cluster *api.Cluster, authInfo *api.AuthIn
 
 	k.log.Infof("request new certificate from vault (%s)", path)
 
-	if err := k.tarmak.Cluster().Environment().Validate(); err != nil {
-		k.log.Fatal("could not validate config: ", err)
+	if !k.tarmak.Config().Force() {
+		if err := k.tarmak.Cluster().Environment().Validate(); err != nil {
+			k.log.Fatal("could not validate config: ", err)
+		}
 	}
 
 	vault := k.tarmak.Environment().Vault()

diff --git a/pkg/tarmak/tarmak.go b/pkg/tarmak/tarmak.go
@@ -281,10 +281,9 @@ func (t *Tarmak) Version() string {
 }
 
 func (t *Tarmak) Validate() error {
-	var err error
-	var result error
+	var result *multierror.Error
 
-	err = t.Cluster().Validate()
+	err := t.Cluster().Validate()
 	if err != nil {
 		result = multierror.Append(result, err)
 	}
@@ -294,7 +293,7 @@ func (t *Tarmak) Validate() error {
 		result = multierror.Append(result, err)
 	}
 
-	return result
+	return result.ErrorOrNil()
 }
 
 func (t *Tarmak) Cleanup() {