kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support setting cluster-autoscaler's skip-nodes-with-custom-controller-pods parameter

This commit is contained in:
shapirus 2023-10-25 12:27:49 +03:00
parent 419b93b9e9
commit dd665fbe1e
21 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/addons.md
View File

@ -73,6 +73,7 @@ spec:
balanceSimilarNodeGroups: false
awsUseStaticInstanceList: false
scaleDownUtilizationThreshold: 0.5
skipNodesWithCustomControllerPods: true
skipNodesWithLocalStorage: true
skipNodesWithSystemPods: true
newPodScaleUpDelay: 0s

5
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -780,6 +780,11 @@ spec:
description: 'ScaleDownUtilizationThreshold determines the utilization
threshold for node scale-down. Default: 0.5'
type: string
skipNodesWithCustomControllerPods:
description: 'SkipNodesWithCustomControllerPods makes the cluster
autoscaler skip scale-down of nodes with pods owned by custom
controllers. Default: true'
type: boolean
skipNodesWithLocalStorage:
description: 'SkipNodesWithLocalStorage makes the cluster autoscaler
skip scale-down of nodes with local storage. Default: true'

3
pkg/apis/kops/componentconfig.go
View File

@ -1028,6 +1028,9 @@ type ClusterAutoscalerConfig struct {
// ScaleDownUtilizationThreshold determines the utilization threshold for node scale-down.
// Default: 0.5
ScaleDownUtilizationThreshold *string `json:"scaleDownUtilizationThreshold,omitempty"`
// SkipNodesWithCustomControllerPods makes the cluster autoscaler skip scale-down of nodes with pods owned by custom controllers.
// Default: true
SkipNodesWithCustomControllerPods *bool `json:"skipNodesWithCustomControllerPods,omitempty"`
// SkipNodesWithSystemPods makes the cluster autoscaler skip scale-down of nodes with non-DaemonSet pods in the kube-system namespace.
// Default: true
SkipNodesWithSystemPods *bool `json:"skipNodesWithSystemPods,omitempty"`

3
pkg/apis/kops/v1alpha2/componentconfig.go
View File

@ -1091,6 +1091,9 @@ type ClusterAutoscalerConfig struct {
// ScaleDownUtilizationThreshold determines the utilization threshold for node scale-down.
// Default: 0.5
ScaleDownUtilizationThreshold *string `json:"scaleDownUtilizationThreshold,omitempty"`
// SkipNodesWithCustomControllerPods makes the cluster autoscaler skip scale-down of nodes with pods owned by custom controllers.
// Default: true
SkipNodesWithCustomControllerPods *bool `json:"skipNodesWithCustomControllerPods,omitempty"`
// SkipNodesWithSystemPods makes the cluster autoscaler skip scale-down of nodes with non-DaemonSet pods in the kube-system namespace.
// Default: true
SkipNodesWithSystemPods *bool `json:"skipNodesWithSystemPods,omitempty"`

2
pkg/apis/kops/v1alpha2/zz_generated.conversion.go generated
View File

@ -2308,6 +2308,7 @@ func autoConvert_v1alpha2_ClusterAutoscalerConfig_To_kops_ClusterAutoscalerConfi
out.AWSUseStaticInstanceList = in.AWSUseStaticInstanceList
out.IgnoreDaemonSetsUtilization = in.IgnoreDaemonSetsUtilization
out.ScaleDownUtilizationThreshold = in.ScaleDownUtilizationThreshold
out.SkipNodesWithCustomControllerPods = in.SkipNodesWithCustomControllerPods
out.SkipNodesWithSystemPods = in.SkipNodesWithSystemPods
out.SkipNodesWithLocalStorage = in.SkipNodesWithLocalStorage
out.NewPodScaleUpDelay = in.NewPodScaleUpDelay
@ -2337,6 +2338,7 @@ func autoConvert_kops_ClusterAutoscalerConfig_To_v1alpha2_ClusterAutoscalerConfi
out.AWSUseStaticInstanceList = in.AWSUseStaticInstanceList
out.IgnoreDaemonSetsUtilization = in.IgnoreDaemonSetsUtilization
out.ScaleDownUtilizationThreshold = in.ScaleDownUtilizationThreshold
out.SkipNodesWithCustomControllerPods = in.SkipNodesWithCustomControllerPods
out.SkipNodesWithSystemPods = in.SkipNodesWithSystemPods
out.SkipNodesWithLocalStorage = in.SkipNodesWithLocalStorage
out.NewPodScaleUpDelay = in.NewPodScaleUpDelay

5
pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go generated
View File

@ -938,6 +938,11 @@ func (in *ClusterAutoscalerConfig) DeepCopyInto(out *ClusterAutoscalerConfig) {
*out = new(string)
**out = **in
}
if in.SkipNodesWithCustomControllerPods != nil {
in, out := &in.SkipNodesWithCustomControllerPods, &out.SkipNodesWithCustomControllerPods
*out = new(bool)
**out = **in
}
if in.SkipNodesWithSystemPods != nil {
in, out := &in.SkipNodesWithSystemPods, &out.SkipNodesWithSystemPods
*out = new(bool)

3
pkg/apis/kops/v1alpha3/componentconfig.go
View File

@ -1020,6 +1020,9 @@ type ClusterAutoscalerConfig struct {
// ScaleDownUtilizationThreshold determines the utilization threshold for node scale-down.
// Default: 0.5
ScaleDownUtilizationThreshold *string `json:"scaleDownUtilizationThreshold,omitempty"`
// SkipNodesWithCustomControllerPods makes the cluster autoscaler skip scale-down of nodes with pods owned by custom controllers.
// Default: true
SkipNodesWithCustomControllerPods *bool `json:"skipNodesWithCustomControllerPods,omitempty"`
// SkipNodesWithSystemPods makes the cluster autoscaler skip scale-down of nodes with non-DaemonSet pods in the kube-system namespace.
// Default: true
SkipNodesWithSystemPods *bool `json:"skipNodesWithSystemPods,omitempty"`

2
pkg/apis/kops/v1alpha3/zz_generated.conversion.go generated
View File

@ -2554,6 +2554,7 @@ func autoConvert_v1alpha3_ClusterAutoscalerConfig_To_kops_ClusterAutoscalerConfi
out.AWSUseStaticInstanceList = in.AWSUseStaticInstanceList
out.IgnoreDaemonSetsUtilization = in.IgnoreDaemonSetsUtilization
out.ScaleDownUtilizationThreshold = in.ScaleDownUtilizationThreshold
out.SkipNodesWithCustomControllerPods = in.SkipNodesWithCustomControllerPods
out.SkipNodesWithSystemPods = in.SkipNodesWithSystemPods
out.SkipNodesWithLocalStorage = in.SkipNodesWithLocalStorage
out.NewPodScaleUpDelay = in.NewPodScaleUpDelay
@ -2583,6 +2584,7 @@ func autoConvert_kops_ClusterAutoscalerConfig_To_v1alpha3_ClusterAutoscalerConfi
out.AWSUseStaticInstanceList = in.AWSUseStaticInstanceList
out.IgnoreDaemonSetsUtilization = in.IgnoreDaemonSetsUtilization
out.ScaleDownUtilizationThreshold = in.ScaleDownUtilizationThreshold
out.SkipNodesWithCustomControllerPods = in.SkipNodesWithCustomControllerPods
out.SkipNodesWithSystemPods = in.SkipNodesWithSystemPods
out.SkipNodesWithLocalStorage = in.SkipNodesWithLocalStorage
out.NewPodScaleUpDelay = in.NewPodScaleUpDelay

5
pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go generated
View File

@ -900,6 +900,11 @@ func (in *ClusterAutoscalerConfig) DeepCopyInto(out *ClusterAutoscalerConfig) {
*out = new(string)
**out = **in
}
if in.SkipNodesWithCustomControllerPods != nil {
in, out := &in.SkipNodesWithCustomControllerPods, &out.SkipNodesWithCustomControllerPods
*out = new(bool)
**out = **in
}
if in.SkipNodesWithSystemPods != nil {
in, out := &in.SkipNodesWithSystemPods, &out.SkipNodesWithSystemPods
*out = new(bool)

5
pkg/apis/kops/zz_generated.deepcopy.go generated
View File

@ -997,6 +997,11 @@ func (in *ClusterAutoscalerConfig) DeepCopyInto(out *ClusterAutoscalerConfig) {
*out = new(string)
**out = **in
}
if in.SkipNodesWithCustomControllerPods != nil {
in, out := &in.SkipNodesWithCustomControllerPods, &out.SkipNodesWithCustomControllerPods
*out = new(bool)
**out = **in
}
if in.SkipNodesWithSystemPods != nil {
in, out := &in.SkipNodesWithSystemPods, &out.SkipNodesWithSystemPods
*out = new(bool)

3
pkg/model/components/clusterautoscaler.go
View File

@ -69,6 +69,9 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
if cas.ScaleDownUtilizationThreshold == nil {
cas.ScaleDownUtilizationThreshold = fi.PtrTo("0.5")
}
if cas.SkipNodesWithCustomControllerPods == nil {
cas.SkipNodesWithCustomControllerPods = fi.PtrTo(true)
}
if cas.SkipNodesWithLocalStorage == nil {
cas.SkipNodesWithLocalStorage = fi.PtrTo(true)
}

1
tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content
View File

@ -44,6 +44,7 @@ spec:
scaleDownUnneededTime: 10m0s
scaleDownUnreadyTime: 20m0s
scaleDownUtilizationThreshold: "0.5"
skipNodesWithCustomControllerPods: true
skipNodesWithLocalStorage: true
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local

1
tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content
View File

@ -37,6 +37,7 @@ spec:
scaleDownUnneededTime: 10m0s
scaleDownUnreadyTime: 20m0s
scaleDownUtilizationThreshold: "0.5"
skipNodesWithCustomControllerPods: true
skipNodesWithLocalStorage: true
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local

1
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content
View File

@ -40,6 +40,7 @@ spec:
scaleDownUnneededTime: 10m0s
scaleDownUnreadyTime: 20m0s
scaleDownUtilizationThreshold: "0.5"
skipNodesWithCustomControllerPods: true
skipNodesWithLocalStorage: true
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local

1
tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content
View File

@ -41,6 +41,7 @@ spec:
scaleDownUnneededTime: 10m0s
scaleDownUnreadyTime: 20m0s
scaleDownUtilizationThreshold: "0.5"
skipNodesWithCustomControllerPods: true
skipNodesWithLocalStorage: true
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local

1
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content
View File

@ -40,6 +40,7 @@ spec:
scaleDownUnneededTime: 10m0s
scaleDownUnreadyTime: 20m0s
scaleDownUtilizationThreshold: "0.5"
skipNodesWithCustomControllerPods: true
skipNodesWithLocalStorage: true
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local

1
tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content
View File

@ -40,6 +40,7 @@ spec:
scaleDownUnneededTime: 10m0s
scaleDownUnreadyTime: 20m0s
scaleDownUtilizationThreshold: "0.5"
skipNodesWithCustomControllerPods: true
skipNodesWithLocalStorage: true
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local

1
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content
View File

@ -40,6 +40,7 @@ spec:
scaleDownUnneededTime: 10m0s
scaleDownUnreadyTime: 20m0s
scaleDownUtilizationThreshold: "0.5"
skipNodesWithCustomControllerPods: true
skipNodesWithLocalStorage: true
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local

1
tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content
View File

@ -41,6 +41,7 @@ spec:
scaleDownUnneededTime: 10m0s
scaleDownUnreadyTime: 20m0s
scaleDownUtilizationThreshold: "0.5"
skipNodesWithCustomControllerPods: true
skipNodesWithLocalStorage: true
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local

1
tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content
View File

@ -41,6 +41,7 @@ spec:
scaleDownUnneededTime: 10m0s
scaleDownUnreadyTime: 20m0s
scaleDownUtilizationThreshold: "0.5"
skipNodesWithCustomControllerPods: true
skipNodesWithLocalStorage: true
skipNodesWithSystemPods: true
clusterDNSDomain: cluster.local

3
upup/models/cloudup/resources/addons/cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml.template
View File

@ -344,6 +344,9 @@ spec:
{{ end }}
- --ignore-daemonsets-utilization={{ .IgnoreDaemonSetsUtilization }}
- --scale-down-utilization-threshold={{ .ScaleDownUtilizationThreshold }}
{{ if IsKubernetesGTE "1.27.0" }}
- --skip-nodes-with-custom-controller-pods={{ .SkipNodesWithCustomControllerPods }}
{{ end }}
- --skip-nodes-with-local-storage={{ .SkipNodesWithLocalStorage }}
- --skip-nodes-with-system-pods={{ .SkipNodesWithSystemPods }}
- --scale-down-delay-after-add={{ .ScaleDownDelayAfterAdd }}