airship/airshipctl
Code Issues Proposed changes

Merge "Stop clusterctl execution if error is encountered"

Browse Source
This commit is contained in:
Zuul 2020-12-16 16:52:12 +00:00 committed by Gerrit Code Review
commit 4e7053bfb5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/phase/executors/clusterctl.go
View File

@ -118,6 +118,7 @@ func (c *ClusterctlExecutor) move(opts ifc.RunOptions, evtCh chan events.Event)
err = c.Move(kubeConfigFile, fromContext, kubeConfigFile, toContext, ns) err = c.Move(kubeConfigFile, fromContext, kubeConfigFile, toContext, ns)
if err != nil { if err != nil {
c.handleErr(err, evtCh) c.handleErr(err, evtCh)
return
} }
} }
@ -160,6 +161,7 @@ func (c *ClusterctlExecutor) init(opts ifc.RunOptions, evtCh chan events.Event)
err = c.Init(kubeConfigFile, context) err = c.Init(kubeConfigFile, context)
if err != nil { if err != nil {
c.handleErr(err, evtCh) c.handleErr(err, evtCh)
return
} }
evtCh <- events.NewEvent().WithClusterctlEvent(events.ClusterctlEvent{ evtCh <- events.NewEvent().WithClusterctlEvent(events.ClusterctlEvent{
Operation: events.ClusterctlInitEnd, Operation: events.ClusterctlInitEnd,