Skip to content

Commit 21bec91

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#76659 from S-Chan/stephen_chan--lazy_initialize_signal_handling
Lazily initialize signal handling for hyperkube apiserver and kubelet
2 parents bf79c7c + 7cbe2d6 commit 21bec91

File tree

13 files changed

+18
-23
lines changed

13 files changed

+18
-23
lines changed

‎cmd/genkubedocs/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ go_library(
3131
"//cmd/kube-scheduler/app:go_default_library",
3232
"//cmd/kubeadm/app/cmd:go_default_library",
3333
"//cmd/kubelet/app:go_default_library",
34-
"//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
3534
"//vendor/github.com/spf13/cobra:go_default_library",
3635
"//vendor/github.com/spf13/cobra/doc:go_default_library",
3736
"//vendor/github.com/spf13/pflag:go_default_library",

‎cmd/genkubedocs/gen_kube_docs.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222

2323
"github.com/spf13/cobra/doc"
2424
"github.com/spf13/pflag"
25-
"k8s.io/apiserver/pkg/server"
2625
ccmapp "k8s.io/kubernetes/cmd/cloud-controller-manager/app"
2726
"k8s.io/kubernetes/cmd/genutils"
2827
apiservapp "k8s.io/kubernetes/cmd/kube-apiserver/app"
@@ -54,7 +53,7 @@ func main() {
5453
switch module {
5554
case "kube-apiserver":
5655
// generate docs for kube-apiserver
57-
apiserver := apiservapp.NewAPIServerCommand(server.SetupSignalHandler())
56+
apiserver := apiservapp.NewAPIServerCommand()
5857
doc.GenMarkdownTree(apiserver, outDir)
5958
case "kube-controller-manager":
6059
// generate docs for kube-controller-manager
@@ -74,7 +73,7 @@ func main() {
7473
doc.GenMarkdownTree(scheduler, outDir)
7574
case "kubelet":
7675
// generate docs for kubelet
77-
kubelet := kubeletapp.NewKubeletCommand(server.SetupSignalHandler())
76+
kubelet := kubeletapp.NewKubeletCommand()
7877
doc.GenMarkdownTree(kubelet, outDir)
7978
case "kubeadm":
8079
// resets global flags created by kubelet or other commands e.g.

‎cmd/genman/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ go_library(
2525
"//cmd/kubeadm/app/cmd:go_default_library",
2626
"//cmd/kubelet/app:go_default_library",
2727
"//pkg/kubectl/cmd:go_default_library",
28-
"//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
2928
"//vendor/github.com/cpuguy83/go-md2man/md2man:go_default_library",
3029
"//vendor/github.com/spf13/cobra:go_default_library",
3130
"//vendor/github.com/spf13/pflag:go_default_library",

‎cmd/genman/gen_kube_man.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
mangen "github.com/cpuguy83/go-md2man/md2man"
2727
"github.com/spf13/cobra"
2828
"github.com/spf13/pflag"
29-
"k8s.io/apiserver/pkg/server"
3029
ccmapp "k8s.io/kubernetes/cmd/cloud-controller-manager/app"
3130
"k8s.io/kubernetes/cmd/genutils"
3231
apiservapp "k8s.io/kubernetes/cmd/kube-apiserver/app"
@@ -63,7 +62,7 @@ func main() {
6362
switch module {
6463
case "kube-apiserver":
6564
// generate manpage for kube-apiserver
66-
apiserver := apiservapp.NewAPIServerCommand(server.SetupSignalHandler())
65+
apiserver := apiservapp.NewAPIServerCommand()
6766
genMarkdown(apiserver, "", outDir)
6867
for _, c := range apiserver.Commands() {
6968
genMarkdown(c, "kube-apiserver", outDir)
@@ -98,7 +97,7 @@ func main() {
9897
}
9998
case "kubelet":
10099
// generate manpage for kubelet
101-
kubelet := kubeletapp.NewKubeletCommand(server.SetupSignalHandler())
100+
kubelet := kubeletapp.NewKubeletCommand()
102101
genMarkdown(kubelet, "", outDir)
103102
for _, c := range kubelet.Commands() {
104103
genMarkdown(c, "kubelet", outDir)

‎cmd/hyperkube/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ go_library(
2727
"//pkg/client/metrics/prometheus:go_default_library",
2828
"//pkg/kubectl/cmd:go_default_library",
2929
"//pkg/version/prometheus:go_default_library",
30-
"//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
3130
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
3231
"//staging/src/k8s.io/component-base/logs:go_default_library",
3332
"//vendor/github.com/spf13/cobra:go_default_library",

‎cmd/hyperkube/main.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232
"github.com/spf13/cobra"
3333
"github.com/spf13/pflag"
3434

35-
"k8s.io/apiserver/pkg/server"
3635
cliflag "k8s.io/component-base/cli/flag"
3736
"k8s.io/component-base/logs"
3837
cloudcontrollermanager "k8s.io/kubernetes/cmd/cloud-controller-manager/app"
@@ -49,7 +48,7 @@ import (
4948
func main() {
5049
rand.Seed(time.Now().UnixNano())
5150

52-
hyperkubeCommand, allCommandFns := NewHyperKubeCommand(server.SetupSignalHandler())
51+
hyperkubeCommand, allCommandFns := NewHyperKubeCommand()
5352

5453
// TODO: once we switch everything over to Cobra commands, we can go back to calling
5554
// cliflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
@@ -84,15 +83,15 @@ func commandFor(basename string, defaultCommand *cobra.Command, commands []func(
8483
}
8584

8685
// NewHyperKubeCommand is the entry point for hyperkube
87-
func NewHyperKubeCommand(stopCh <-chan struct{}) (*cobra.Command, []func() *cobra.Command) {
86+
func NewHyperKubeCommand() (*cobra.Command, []func() *cobra.Command) {
8887
// these have to be functions since the command is polymorphic. Cobra wants you to be top level
8988
// command to get executed
90-
apiserver := func() *cobra.Command { return kubeapiserver.NewAPIServerCommand(stopCh) }
89+
apiserver := func() *cobra.Command { return kubeapiserver.NewAPIServerCommand() }
9190
controller := func() *cobra.Command { return kubecontrollermanager.NewControllerManagerCommand() }
9291
proxy := func() *cobra.Command { return kubeproxy.NewProxyCommand() }
9392
scheduler := func() *cobra.Command { return kubescheduler.NewSchedulerCommand() }
9493
kubectlCmd := func() *cobra.Command { return kubectl.NewDefaultKubectlCommand() }
95-
kubelet := func() *cobra.Command { return kubelet.NewKubeletCommand(stopCh) }
94+
kubelet := func() *cobra.Command { return kubelet.NewKubeletCommand() }
9695
cloudController := func() *cobra.Command { return cloudcontrollermanager.NewCloudControllerManagerCommand() }
9796

9897
commandFns := []func() *cobra.Command{

‎cmd/kube-apiserver/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ go_library(
2222
"//cmd/kube-apiserver/app:go_default_library",
2323
"//pkg/util/prometheusclientgo:go_default_library",
2424
"//pkg/version/prometheus:go_default_library",
25-
"//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
2625
"//staging/src/k8s.io/component-base/logs:go_default_library",
2726
],
2827
)

‎cmd/kube-apiserver/apiserver.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"os"
2525
"time"
2626

27-
"k8s.io/apiserver/pkg/server"
2827
"k8s.io/component-base/logs"
2928
"k8s.io/kubernetes/cmd/kube-apiserver/app"
3029
_ "k8s.io/kubernetes/pkg/util/prometheusclientgo" // load all the prometheus client-go plugins
@@ -34,7 +33,7 @@ import (
3433
func main() {
3534
rand.Seed(time.Now().UnixNano())
3635

37-
command := app.NewAPIServerCommand(server.SetupSignalHandler())
36+
command := app.NewAPIServerCommand()
3837

3938
// TODO: once we switch everything over to Cobra commands, we can go back to calling
4039
// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the

‎cmd/kube-apiserver/app/server.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ const etcdRetryLimit = 60
8888
const etcdRetryInterval = 1 * time.Second
8989

9090
// NewAPIServerCommand creates a *cobra.Command object with default parameters
91-
func NewAPIServerCommand(stopCh <-chan struct{}) *cobra.Command {
91+
func NewAPIServerCommand() *cobra.Command {
9292
s := options.NewServerRunOptions()
9393
cmd := &cobra.Command{
9494
Use: "kube-apiserver",
@@ -111,7 +111,7 @@ cluster's shared state through which all other components interact.`,
111111
return utilerrors.NewAggregate(errs)
112112
}
113113

114-
return Run(completedOptions, stopCh)
114+
return Run(completedOptions, genericapiserver.SetupSignalHandler())
115115
},
116116
}
117117

‎cmd/kubelet/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ go_library(
2121
"//cmd/kubelet/app:go_default_library",
2222
"//pkg/client/metrics/prometheus:go_default_library",
2323
"//pkg/version/prometheus:go_default_library",
24-
"//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
2524
"//staging/src/k8s.io/component-base/logs:go_default_library",
2625
],
2726
)

0 commit comments

Comments
 (0)