plumb root context through restart polling logic

Author: copejon

pkg/controllers/kube-apiserver.go

@@ -440,7 +440,7 @@ func (s *KubeAPIServer) Run(ctx context.Context, ready chan<- struct{}, stopped
 		panic(perr)
 	case <-rbacDeadlockDetected:
 		klog.Error("RBAC bootstrap hook deadlock detected - restarting microshift-etcd.scope to recover")
-		if err := restartMicroshiftEtcdScope(); err != nil {
+		if err := restartMicroshiftEtcdScope(ctx); err != nil {
 			klog.Errorf("Failed to restart microshift-etcd.scope: %v", err)
 		}
 		return fmt.Errorf("RBAC bootstrap hook deadlock detected after %d seconds", rbacHookDeadlockTimeout)
@@ -583,11 +583,11 @@ func isEtcdHealthy(ctx context.Context) (bool, error) {
 
 // restartMicroshiftEtcdScope restarts the microshift-etcd.scope to recover from deadlock.
 // This forces a clean restart of etcd which can help break the circular dependency.
-func restartMicroshiftEtcdScope() error {
+func restartMicroshiftEtcdScope(ctx context.Context) error {
 	klog.Info("Stopping microshift-etcd.scope for recovery")
 
 	// Set a timeout in case systemd or DBus stalls and the fail-fast recovery path hangs and Run never returns
-	cmdCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	cmdCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
 	defer cancel()
 
 	stopCmd := exec.CommandContext(cmdCtx, "systemctl", "stop", "microshift-etcd.scope")