Merge pull request #2447 from justinsb/deprecate_babysit_daemons

Remove babysit-daemons flag from 1.7

pkg/apis/kops/componentconfig.go

@@ -217,7 +217,9 @@ type KubeletConfigSpec struct {
 	// one must set --hairpin-mode=veth-flag, because bridge assumes the
 	// existence of a container bridge named cbr0.
 	HairpinMode string `json:"hairpinMode,omitempty" flag:"hairpin-mode"`
+
 	// The node has babysitter process monitoring docker and kubelet.
+	// Removed as of 1.7
 	BabysitDaemons *bool `json:"babysitDaemons,omitempty" flag:"babysit-daemons"`
 
 	// maxPods is the number of pods that can run on this Kubelet.

pkg/apis/kops/v1alpha1/componentconfig.go

@@ -216,7 +216,9 @@ type KubeletConfigSpec struct {
 	// one must set --hairpin-mode=veth-flag, because bridge assumes the
 	// existence of a container bridge named cbr0.
 	HairpinMode string `json:"hairpinMode,omitempty" flag:"hairpin-mode"`
+
 	// The node has babysitter process monitoring docker and kubelet.
+	// Removed as of 1.7
 	BabysitDaemons *bool `json:"babysitDaemons,omitempty" flag:"babysit-daemons"`
 
 	// maxPods is the number of pods that can run on this Kubelet.

pkg/apis/kops/v1alpha2/componentconfig.go

@@ -81,7 +81,9 @@ type KubeletConfigSpec struct {
 	// one must set --hairpin-mode=veth-flag, because bridge assumes the
 	// existence of a container bridge named cbr0.
 	HairpinMode string `json:"hairpinMode,omitempty" flag:"hairpin-mode"`
+
 	// The node has babysitter process monitoring docker and kubelet.
+	// Removed as of 1.7
 	BabysitDaemons *bool `json:"babysitDaemons,omitempty" flag:"babysit-daemons"`
 
 	// maxPods is the number of pods that can run on this Kubelet.

pkg/model/components/kubelet.go

@@ -58,9 +58,13 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
 	clusterSpec.Kubelet.LogLevel = fi.Int32(2)
 	clusterSpec.Kubelet.ClusterDNS = ip.String()
 	clusterSpec.Kubelet.ClusterDomain = clusterSpec.ClusterDNSDomain
-	clusterSpec.Kubelet.BabysitDaemons = fi.Bool(true)
 	clusterSpec.Kubelet.NonMasqueradeCIDR = clusterSpec.NonMasqueradeCIDR
 
+	if b.Context.IsKubernetesLT("1.7") {
+		// babysit-daemons removed in 1.7
+		clusterSpec.Kubelet.BabysitDaemons = fi.Bool(true)
+	}
+
 	clusterSpec.MasterKubelet.RegisterSchedulable = fi.Bool(false)
 	// Replace the CIDR with a CIDR allocated by KCM (the default, but included for clarity)
 	// We _do_ allow debugging handlers, so we can do logs