github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #110506 from yangjunmyfm192085/removedockershim-des

Browse Source 
Remove the description of the docker shim from the kubelet
This commit is contained in:
Kubernetes Prow Robot 2022-06-16 08:54:48 -07:00 committed by GitHub
commit 4e17f88b7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kubelet/app/server.go
View File

@ -252,8 +252,6 @@ HTTP server: The kubelet can also listen for HTTP and respond to a simple API
if err := checkPermissions(); err != nil { if err := checkPermissions(); err != nil {
klog.ErrorS(err, "kubelet running with insufficient permissions") 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 // make the kubelet's config safe for logging
config := kubeletServer.KubeletConfiguration.DeepCopy() 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 // log the kubelet's config for inspection
klog.V(5).InfoS("KubeletConfiguration", "configuration", config) klog.V(5).InfoS("KubeletConfiguration", "configuration", config)
// set up signal context for kubelet shutdown
ctx := genericapiserver.SetupSignalContext()
// run the kubelet // run the kubelet
return Run(ctx, kubeletServer, kubeletDeps, utilfeature.DefaultFeatureGate) return Run(ctx, kubeletServer, kubeletDeps, utilfeature.DefaultFeatureGate)
}, },