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

Merge pull request #72671 from yanghaichao12/dev0108

Browse Source 
validate KubeletCgroups and KubeReservedCgroup
This commit is contained in:
Kubernetes Prow Robot 2020-09-08 07:33:43 -07:00 committed by GitHub
commit 92042fe6ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,6 +215,10 @@ HTTP server: The kubelet can also listen for HTTP and respond to a simple API
klog.Fatal(err) klog.Fatal(err)
} }
if (kubeletConfig.KubeletCgroups != "" && kubeletConfig.KubeReservedCgroup != "") && (0 != strings.Index(kubeletConfig.KubeletCgroups, kubeletConfig.KubeReservedCgroup)) {
klog.Warning("unsupported configuration:KubeletCgroups is not within KubeReservedCgroup")
}
// use dynamic kubelet config, if enabled // use dynamic kubelet config, if enabled
var kubeletConfigController *dynamickubeletconfig.Controller var kubeletConfigController *dynamickubeletconfig.Controller
if dynamicConfigDir := kubeletFlags.DynamicConfigDir.Value(); len(dynamicConfigDir) > 0 { if dynamicConfigDir := kubeletFlags.DynamicConfigDir.Value(); len(dynamicConfigDir) > 0 {