Merge pull request #12267 from hakman/kernel-memcg-notification

Add support --kernel-memcg-notification Kubelet flag

k8s/crds/kops.k8s.io_clusters.yaml

@@ -2560,6 +2560,10 @@ spec:
                       pulls If no pulling progress is made before this deadline, the
                       image pulling will be cancelled. (default 1m0s)
                     type: string
+                  kernelMemcgNotification:
+                    description: Integrate with the kernel memcg notification to determine
+                      if memory eviction thresholds are crossed rather than polling.
+                    type: boolean
                   kubeReserved:
                     additionalProperties:
                       type: string
@@ -2975,6 +2979,10 @@ spec:
                       pulls If no pulling progress is made before this deadline, the
                       image pulling will be cancelled. (default 1m0s)
                     type: string
+                  kernelMemcgNotification:
+                    description: Integrate with the kernel memcg notification to determine
+                      if memory eviction thresholds are crossed rather than polling.
+                    type: boolean
                   kubeReserved:
                     additionalProperties:
                       type: string

k8s/crds/kops.k8s.io_instancegroups.yaml

@@ -452,6 +452,10 @@ spec:
                       pulls If no pulling progress is made before this deadline, the
                       image pulling will be cancelled. (default 1m0s)
                     type: string
+                  kernelMemcgNotification:
+                    description: Integrate with the kernel memcg notification to determine
+                      if memory eviction thresholds are crossed rather than polling.
+                    type: boolean
                   kubeReserved:
                     additionalProperties:
                       type: string

pkg/apis/kops/componentconfig.go

@@ -159,6 +159,8 @@ type KubeletConfigSpec struct {
 	Taints []string `json:"taints,omitempty" flag:"register-with-taints"`
 	// FeatureGates is set of key=value pairs that describe feature gates for alpha/experimental features.
 	FeatureGates map[string]string `json:"featureGates,omitempty" flag:"feature-gates"`
+	// Integrate with the kernel memcg notification to determine if memory eviction thresholds are crossed rather than polling.
+	KernelMemcgNotification *bool `json:"kernelMemcgNotification,omitempty" flag:"kernel-memcg-notification"`
 	// Resource reservation for kubernetes system daemons like the kubelet, container runtime, node problem detector, etc.
 	KubeReserved map[string]string `json:"kubeReserved,omitempty" flag:"kube-reserved"`
 	// Control group for kube daemons.

pkg/apis/kops/v1alpha2/componentconfig.go

@@ -159,6 +159,8 @@ type KubeletConfigSpec struct {
 	Taints []string `json:"taints,omitempty" flag:"register-with-taints"`
 	// FeatureGates is set of key=value pairs that describe feature gates for alpha/experimental features.
 	FeatureGates map[string]string `json:"featureGates,omitempty" flag:"feature-gates"`
+	// Integrate with the kernel memcg notification to determine if memory eviction thresholds are crossed rather than polling.
+	KernelMemcgNotification *bool `json:"kernelMemcgNotification,omitempty" flag:"kernel-memcg-notification"`
 	// Resource reservation for kubernetes system daemons like the kubelet, container runtime, node problem detector, etc.
 	KubeReserved map[string]string `json:"kubeReserved,omitempty" flag:"kube-reserved"`
 	// Control group for kube daemons.

pkg/apis/kops/v1alpha2/zz_generated.conversion.go

@@ -5247,6 +5247,7 @@ func autoConvert_v1alpha2_KubeletConfigSpec_To_kops_KubeletConfigSpec(in *Kubele
 	out.VolumePluginDirectory = in.VolumePluginDirectory
 	out.Taints = in.Taints
 	out.FeatureGates = in.FeatureGates
+	out.KernelMemcgNotification = in.KernelMemcgNotification
 	out.KubeReserved = in.KubeReserved
 	out.KubeReservedCgroup = in.KubeReservedCgroup
 	out.SystemReserved = in.SystemReserved
@@ -5343,6 +5344,7 @@ func autoConvert_kops_KubeletConfigSpec_To_v1alpha2_KubeletConfigSpec(in *kops.K
 	out.VolumePluginDirectory = in.VolumePluginDirectory
 	out.Taints = in.Taints
 	out.FeatureGates = in.FeatureGates
+	out.KernelMemcgNotification = in.KernelMemcgNotification
 	out.KubeReserved = in.KubeReserved
 	out.KubeReservedCgroup = in.KubeReservedCgroup
 	out.SystemReserved = in.SystemReserved

pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go

@@ -3389,6 +3389,11 @@ func (in *KubeletConfigSpec) DeepCopyInto(out *KubeletConfigSpec) {
 			(*out)[key] = val
 		}
 	}
+	if in.KernelMemcgNotification != nil {
+		in, out := &in.KernelMemcgNotification, &out.KernelMemcgNotification
+		*out = new(bool)
+		**out = **in
+	}
 	if in.KubeReserved != nil {
 		in, out := &in.KubeReserved, &out.KubeReserved
 		*out = make(map[string]string, len(*in))

pkg/apis/kops/zz_generated.deepcopy.go

@@ -3555,6 +3555,11 @@ func (in *KubeletConfigSpec) DeepCopyInto(out *KubeletConfigSpec) {
 			(*out)[key] = val
 		}
 	}
+	if in.KernelMemcgNotification != nil {
+		in, out := &in.KernelMemcgNotification, &out.KernelMemcgNotification
+		*out = new(bool)
+		**out = **in
+	}
 	if in.KubeReserved != nil {
 		in, out := &in.KubeReserved, &out.KubeReserved
 		*out = make(map[string]string, len(*in))