Skip to content
This repository was archived by the owner on Jan 9, 2023. It is now read-only.

Commit 4c70a54

Browse files
committed
Implement force for kubectl command
1 parent 68b1bf1 commit 4c70a54

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

pkg/tarmak/kubectl/kubectl.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ func (k *Kubectl) requestNewAdminCert(cluster *api.Cluster, authInfo *api.AuthIn
4949

5050
k.log.Infof("request new certificate from vault (%s)", path)
5151

52-
if err := k.tarmak.Cluster().Environment().Validate(); err != nil {
53-
k.log.Fatal("could not validate config: ", err)
52+
if !k.tarmak.Config().Force() {
53+
if err := k.tarmak.Cluster().Environment().Validate(); err != nil {
54+
k.log.Fatal("could not validate config: ", err)
55+
}
5456
}
5557

5658
vault := k.tarmak.Environment().Vault()

pkg/tarmak/tarmak.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,9 @@ func (t *Tarmak) Version() string {
281281
}
282282

283283
func (t *Tarmak) Validate() error {
284-
var err error
285-
var result error
284+
var result *multierror.Error
286285

287-
err = t.Cluster().Validate()
286+
err := t.Cluster().Validate()
288287
if err != nil {
289288
result = multierror.Append(result, err)
290289
}
@@ -294,7 +293,7 @@ func (t *Tarmak) Validate() error {
294293
result = multierror.Append(result, err)
295294
}
296295

297-
return result
296+
return result.ErrorOrNil()
298297
}
299298

300299
func (t *Tarmak) Cleanup() {

0 commit comments

Comments
 (0)