github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the deprecated --babysit-daemons kubelet flag

Browse Source
This commit is contained in:
Michael Taufen
2017-04-07 17:37:32 -07:00
parent b353700bfc
commit 2ee2ec5e21
9 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/componentconfig/types.go
View File

@@ -406,8 +406,6 @@ type KubeletConfiguration struct {
// Generally, one must set --hairpin-mode=veth-flag to achieve hairpin NAT,
// because promiscous-bridge assumes the existence of a container bridge named cbr0.
HairpinMode string
// The node has babysitter process monitoring docker and kubelet.
BabysitDaemons bool
// maxPods is the number of pods that can run on this Kubelet.
MaxPods int32
// dockerExecHandlerName is the handler to use when executing a command

2
pkg/apis/componentconfig/v1alpha1/types.go
View File

@@ -471,8 +471,6 @@ type KubeletConfiguration struct {
// Generally, one must set --hairpin-mode=veth-flag to achieve hairpin NAT,
// because promiscous-bridge assumes the existence of a container bridge named cbr0.
HairpinMode string `json:"hairpinMode"`
// The node has babysitter process monitoring docker and kubelet.
BabysitDaemons bool `json:"babysitDaemons"`
// maxPods is the number of pods that can run on this Kubelet.
MaxPods int32 `json:"maxPods"`
// dockerExecHandlerName is the handler to use when executing a command

2
pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go
View File

@@ -459,7 +459,6 @@ func autoConvert_v1alpha1_KubeletConfiguration_To_componentconfig_KubeletConfigu
}
out.ExitOnLockContention = in.ExitOnLockContention
out.HairpinMode = in.HairpinMode
out.BabysitDaemons = in.BabysitDaemons
out.MaxPods = in.MaxPods
out.DockerExecHandlerName = in.DockerExecHandlerName
out.PodCIDR = in.PodCIDR
@@ -656,7 +655,6 @@ func autoConvert_componentconfig_KubeletConfiguration_To_v1alpha1_KubeletConfigu
}
out.ExitOnLockContention = in.ExitOnLockContention
out.HairpinMode = in.HairpinMode
out.BabysitDaemons = in.BabysitDaemons
out.MaxPods = in.MaxPods
out.DockerExecHandlerName = in.DockerExecHandlerName
out.PodCIDR = in.PodCIDR