Merge pull request #15824 from hakman/experimental-allocatable-ignore…

…-eviction Add support for --experimental-allocatable-ignore-eviction kubelet flag
kubernetes · Aug 26, 2023 · 77baad6 · 77baad6
2 parents 1b31a46 + c291190
commit 77baad6
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 0 deletions.
diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -3741,6 +3741,10 @@ spec:
                     description: Comma-delimited list of grace periods for each soft
                       eviction signal.  For example, 'memory.available=30s'.
                     type: string
+                  experimentalAllocatableIgnoreEviction:
+                    description: ExperimentalAllocatableIgnoreEviction enables ignoring
+                      Hard Eviction Thresholds while calculating Node Allocatable
+                    type: boolean
                   experimentalAllowedUnsafeSysctls:
                     description: ExperimentalAllowedUnsafeSysctls are passed to the
                       kubelet config to whitelist allowable sysctls Was promoted to
@@ -4174,6 +4178,10 @@ spec:
                     description: Comma-delimited list of grace periods for each soft
                       eviction signal.  For example, 'memory.available=30s'.
                     type: string
+                  experimentalAllocatableIgnoreEviction:
+                    description: ExperimentalAllocatableIgnoreEviction enables ignoring
+                      Hard Eviction Thresholds while calculating Node Allocatable
+                    type: boolean
                   experimentalAllowedUnsafeSysctls:
                     description: ExperimentalAllowedUnsafeSysctls are passed to the
                       kubelet config to whitelist allowable sysctls Was promoted to

diff --git a/k8s/crds/kops.k8s.io_instancegroups.yaml b/k8s/crds/kops.k8s.io_instancegroups.yaml
@@ -534,6 +534,10 @@ spec:
                     description: Comma-delimited list of grace periods for each soft
                       eviction signal.  For example, 'memory.available=30s'.
                     type: string
+                  experimentalAllocatableIgnoreEviction:
+                    description: ExperimentalAllocatableIgnoreEviction enables ignoring
+                      Hard Eviction Thresholds while calculating Node Allocatable
+                    type: boolean
                   experimentalAllowedUnsafeSysctls:
                     description: ExperimentalAllowedUnsafeSysctls are passed to the
                       kubelet config to whitelist allowable sysctls Was promoted to

diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go
@@ -225,6 +225,8 @@ type KubeletConfigSpec struct {
 	EnableCadvisorJsonEndpoints *bool `json:"enableCadvisorJsonEndpoints,omitempty" flag:"enable-cadvisor-json-endpoints"`
 	// PodPidsLimit is the maximum number of pids in any pod.
 	PodPidsLimit *int64 `json:"podPidsLimit,omitempty" flag:"pod-max-pids"`
+	// ExperimentalAllocatableIgnoreEviction enables ignoring Hard Eviction Thresholds while calculating Node Allocatable
+	ExperimentalAllocatableIgnoreEviction *bool `json:"experimentalAllocatableIgnoreEviction,omitempty" flag:"experimental-allocatable-ignore-eviction"`
 
 	// ShutdownGracePeriod specifies the total duration that the node should delay the shutdown by.
 	// Default: 30s

diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go
@@ -225,6 +225,8 @@ type KubeletConfigSpec struct {
 	EnableCadvisorJsonEndpoints *bool `json:"enableCadvisorJsonEndpoints,omitempty" flag:"enable-cadvisor-json-endpoints"`
 	// PodPidsLimit is the maximum number of pids in any pod.
 	PodPidsLimit *int64 `json:"podPidsLimit,omitempty" flag:"pod-max-pids"`
+	// ExperimentalAllocatableIgnoreEviction enables ignoring Hard Eviction Thresholds while calculating Node Allocatable
+	ExperimentalAllocatableIgnoreEviction *bool `json:"experimentalAllocatableIgnoreEviction,omitempty" flag:"experimental-allocatable-ignore-eviction"`
 
 	// ShutdownGracePeriod specifies the total duration that the node should delay the shutdown by.
 	// Default: 30s

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/v1alpha3/componentconfig.go b/pkg/apis/kops/v1alpha3/componentconfig.go
@@ -223,6 +223,8 @@ type KubeletConfigSpec struct {
 	EnableCadvisorJsonEndpoints *bool `json:"enableCadvisorJsonEndpoints,omitempty" flag:"enable-cadvisor-json-endpoints"`
 	// PodPidsLimit is the maximum number of pids in any pod.
 	PodPidsLimit *int64 `json:"podPidsLimit,omitempty" flag:"pod-max-pids"`
+	// ExperimentalAllocatableIgnoreEviction enables ignoring Hard Eviction Thresholds while calculating Node Allocatable
+	ExperimentalAllocatableIgnoreEviction *bool `json:"experimentalAllocatableIgnoreEviction,omitempty" flag:"experimental-allocatable-ignore-eviction"`
 
 	// ShutdownGracePeriod specifies the total duration that the node should delay the shutdown by.
 	// Default: 30s

diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go