File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed
Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -119,15 +119,15 @@ type deleteAddonIAMTask struct {
119119func (t * deleteAddonIAMTask ) Describe () string { return t .info }
120120
121121func (t * deleteAddonIAMTask ) Do (errorCh chan error ) error {
122- defer close (errorCh )
123-
124122 errMsg := fmt .Sprintf ("deleting addon IAM %q" , * t .stack .StackName )
125123 if t .wait {
126124 if err := t .stackManager .DeleteStackBySpecSync (t .ctx , t .stack , errorCh ); err != nil {
127125 return fmt .Errorf ("%s: %w" , errMsg , err )
128126 }
129127 return nil
130128 }
129+
130+ defer close (errorCh )
131131 if _ , err := t .stackManager .DeleteStackBySpec (t .ctx , t .stack ); err != nil {
132132 return fmt .Errorf ("%s: %w" , errMsg , err )
133133 }
Original file line number Diff line number Diff line change @@ -42,6 +42,8 @@ func NewCreator(
4242 oidcManager * iamoidc.OpenIDConnectManager ,
4343 stackManager StackManager ) * Creator {
4444 return & Creator {
45+ clusterName : clusterName ,
46+ region : region ,
4547 clientSetGetter : clientSetGetter ,
4648 oidcManager : oidcManager ,
4749 stackManager : stackManager ,
Original file line number Diff line number Diff line change @@ -57,8 +57,6 @@ type createIAMRoleForServiceAccountTask struct {
5757
5858func (t * createIAMRoleForServiceAccountTask ) Describe () string { return t .info }
5959func (t * createIAMRoleForServiceAccountTask ) Do (errs chan error ) error {
60- defer close (errs )
61-
6260 name := makeIAMServiceAccountStackName (t .clusterName , t .sa .Namespace , t .sa .Name )
6361 logger .Info ("building iamserviceaccount stack %q" , name )
6462 stack := builder .NewIAMRoleResourceSetForServiceAccount (t .sa , t .oidc )
@@ -115,15 +113,15 @@ type deleteIAMRoleForServiceAccountTask struct {
115113func (t * deleteIAMRoleForServiceAccountTask ) Describe () string { return t .info }
116114
117115func (t * deleteIAMRoleForServiceAccountTask ) Do (errorCh chan error ) error {
118- defer close (errorCh )
119-
120116 errMsg := fmt .Sprintf ("deleting IAM role for serviceaccount %q" , * t .stack .StackName )
121117 if t .wait {
122118 if err := t .stackManager .DeleteStackBySpecSync (t .ctx , t .stack , errorCh ); err != nil {
123119 return fmt .Errorf ("%s: %w" , errMsg , err )
124120 }
125121 return nil
126122 }
123+
124+ defer close (errorCh )
127125 if _ , err := t .stackManager .DeleteStackBySpec (t .ctx , t .stack ); err != nil {
128126 return fmt .Errorf ("%s: %w" , errMsg , err )
129127 }
You can’t perform that action at this time.
0 commit comments