defer ctxCancel

Signed-off-by: Yi Rae Kim <[email protected]>
stolostron · Nov 9, 2023 · af4c716 · af4c716
1 parent 621ea3a
commit af4c716
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/main.go b/main.go
@@ -318,8 +318,6 @@ func watchGatekeeperInstall(mainCtx context.Context, dynamicClient *dynamic.Dyna
 					continue
 				}
 
-				// Override ctx, ctxCancel
-				ctx, ctxCancel = context.WithCancel(mainCtx)
 				isInstalled = true
 
 				go func() {
@@ -337,9 +335,13 @@ func watchGatekeeperInstall(mainCtx context.Context, dynamicClient *dynamic.Dyna
 				isInstalled = false
 				ctxCancel()
 				setupLog.Info("Gatekeeper deleted")
+				// Override ctx, ctxCancel
+				ctx, ctxCancel = context.WithCancel(mainCtx)
+				defer ctxCancel()
 			}
 		case <-mainCtx.Done():
 			// When parents ctx close, then child should be closed
+			ctxCancel()
 			return
 		}
 	}