UPSTREAM: <carry>: kube-apiserver: ignore SIGTERM/INT after the first one

Author: bertinatto

cmd/kube-apiserver/app/server.go

@@ -71,8 +71,7 @@ func NewAPIServerCommand() *cobra.Command {
 	_, featureGate := featuregate.DefaultComponentGlobalsRegistry.ComponentGlobalsOrRegister(
 		featuregate.DefaultKubeComponent, utilversion.DefaultBuildEffectiveVersion(), utilfeature.DefaultMutableFeatureGate)
 	s := options.NewServerRunOptions()
-	ctx := genericapiserver.SetupSignalContext()
-
+	ctx := genericapiserver.SetupSignalContextNotExiting()
 	cmd := &cobra.Command{
 		Use: "kube-apiserver",
 		Long: `The Kubernetes API server validates and configures data
@@ -158,7 +157,7 @@ cluster's shared state through which all other components interact.`,
 		},
 	}
 
-	cmd.SetContext(genericapiserver.SetupSignalContextNotExiting())
+	cmd.SetContext(ctx)
 
 	fs := cmd.Flags()
 	namedFlagSets := s.Flags()