From 8bfea65f69451072c2aa0b012b3566822d4c6bc3 Mon Sep 17 00:00:00 2001 From: JunYang Date: Fri, 10 Jun 2022 22:57:46 +0800 Subject: [PATCH 1/2] Remove the description of the docker shim from the kubelet --- cmd/kubelet/app/server.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 8ac37d97292..95cf9ac584c 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -252,8 +252,6 @@ HTTP server: The kubelet can also listen for HTTP and respond to a simple API if err := checkPermissions(); err != nil { klog.ErrorS(err, "kubelet running with insufficient permissions") } - // set up signal context here in order to be reused by kubelet and docker shim - ctx := genericapiserver.SetupSignalContext() // make the kubelet's config safe for logging config := kubeletServer.KubeletConfiguration.DeepCopy() @@ -263,6 +261,9 @@ HTTP server: The kubelet can also listen for HTTP and respond to a simple API // log the kubelet's config for inspection klog.V(5).InfoS("KubeletConfiguration", "configuration", config) + // set up signal context here in order to be reused by kubelet + ctx := genericapiserver.SetupSignalContext() + // run the kubelet return Run(ctx, kubeletServer, kubeletDeps, utilfeature.DefaultFeatureGate) }, From 8567f2bd53c17ecf2af1ec206115db448949e5f9 Mon Sep 17 00:00:00 2001 From: JUN YANG Date: Thu, 16 Jun 2022 08:29:14 +0800 Subject: [PATCH 2/2] Update cmd/kubelet/app/server.go Co-authored-by: Danielle --- cmd/kubelet/app/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 95cf9ac584c..8713f6e822a 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -261,7 +261,7 @@ HTTP server: The kubelet can also listen for HTTP and respond to a simple API // log the kubelet's config for inspection klog.V(5).InfoS("KubeletConfiguration", "configuration", config) - // set up signal context here in order to be reused by kubelet + // set up signal context for kubelet shutdown ctx := genericapiserver.SetupSignalContext() // run the kubelet