Skip to content

feat: add CPU and memory resource configuration for AWS Load Balancer Controller #17608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
Sep 25, 2025
Merged

feat: add CPU and memory resource configuration for AWS Load Balancer Controller #17608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions docs/addons.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ AWS Load Balancer Controller offers additional functionality for provisioning EL
spec:
awsLoadBalancerController:
enabled: true
cpuRequest: "100m"
cpuLimit: "200m"
memoryRequest: "200Mi"
memoryLimit: "500Mi"
```

Though the AWS Load Balancer Controller can integrate the AWS WAF and
Expand All @@ -37,6 +41,10 @@ spec:
enabled: true
enableWAF: true
enableWAFv2: true
cpuRequest: "100m"
cpuLimit: "200m"
memoryRequest: "200Mi"
memoryLimit: "500Mi"
```

Note that the controller will only succeed in associating one WAF with
Expand Down
36 changes: 36 additions & 0 deletions k8s/crds/kops.k8s.io_clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,24 @@ spec:
description: AWSLoadbalancerControllerConfig determines the AWS LB
controller configuration.
properties:
cpuLimit:
anyOf:
- type: integer
- type: string
description: |-
CPULimit, cpu limit compute resource for AWS Load Balancer Controller.
Default: 200m
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
cpuRequest:
anyOf:
- type: integer
- type: string
description: |-
CPURequest, cpu request compute resource for AWS Load Balancer Controller.
Default: 100m
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
enableShield:
description: |-
EnableShield specifies whether the controller can enable Shield Advanced.
Expand All @@ -284,6 +302,24 @@ spec:
Enabled enables the loadbalancer controller.
Default: false
type: boolean
memoryLimit:
anyOf:
- type: integer
- type: string
description: |-
MemoryLimit, memory limit compute resource for AWS Load Balancer Controller.
Default: 500Mi
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
memoryRequest:
anyOf:
- type: integer
- type: string
description: |-
MemoryRequest, memory request compute resource for AWS Load Balancer Controller.
Default: 200Mi
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
version:
description: Version is the container image tag used.
type: string
Expand Down
12 changes: 12 additions & 0 deletions pkg/apis/kops/componentconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,6 +1217,18 @@ type LoadBalancerControllerSpec struct {
// EnableShield specifies whether the controller can enable Shield Advanced.
// Default: false
EnableShield bool `json:"enableShield,omitempty"`
// CPURequest, cpu request compute resource for AWS Load Balancer Controller.
// Default: 100m
CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
// CPULimit, cpu limit compute resource for AWS Load Balancer Controller.
// Default: 200m
CPULimit *resource.Quantity `json:"cpuLimit,omitempty"`
// MemoryRequest, memory request compute resource for AWS Load Balancer Controller.
// Default: 200Mi
MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
// MemoryLimit, memory limit compute resource for AWS Load Balancer Controller.
// Default: 500Mi
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
}

// HasAdmissionController checks if a specific admission controller is enabled
Expand Down
12 changes: 12 additions & 0 deletions pkg/apis/kops/v1alpha2/componentconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1283,6 +1283,18 @@ type LoadBalancerControllerSpec struct {
// EnableShield specifies whether the controller can enable Shield Advanced.
// Default: false
EnableShield bool `json:"enableShield,omitempty"`
// CPURequest, cpu request compute resource for AWS Load Balancer Controller.
// Default: 100m
CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
// CPULimit, cpu limit compute resource for AWS Load Balancer Controller.
// Default: 200m
CPULimit *resource.Quantity `json:"cpuLimit,omitempty"`
// MemoryRequest, memory request compute resource for AWS Load Balancer Controller.
// Default: 200Mi
MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
// MemoryLimit, memory limit compute resource for AWS Load Balancer Controller.
// Default: 500Mi
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
}

// HasAdmissionController checks if a specific admission controller is enabled
Expand Down
8 changes: 8 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions pkg/apis/kops/v1alpha3/componentconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,4 +1209,16 @@ type LoadBalancerControllerSpec struct {
// EnableShield specifies whether the controller can enable Shield Advanced.
// Default: false
EnableShield bool `json:"enableShield,omitempty"`
// CPURequest, cpu request compute resource for AWS Load Balancer Controller.
// Default: 100m
CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
// CPULimit, cpu limit compute resource for AWS Load Balancer Controller.
// Default: 200m
CPULimit *resource.Quantity `json:"cpuLimit,omitempty"`
// MemoryRequest, memory request compute resource for AWS Load Balancer Controller.
// Default: 200Mi
MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
// MemoryLimit, memory limit compute resource for AWS Load Balancer Controller.
// Default: 500Mi
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
}
8 changes: 8 additions & 0 deletions pkg/apis/kops/v1alpha3/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions pkg/apis/kops/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions ...ion/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ spec:
authorization:
alwaysAllow: {}
awsLoadBalancerController:
cpuLimit: 300m
cpuRequest: 150m
enabled: true
memoryLimit: 600Mi
memoryRequest: 300Mi
certManager:
enabled: true
channel: stable
Expand Down
8 changes: 4 additions & 4 deletions ...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,11 +1329,11 @@ spec:
protocol: TCP
resources:
limits:
cpu: 200m
memory: 500Mi
cpu: 300m
memory: 600Mi
requests:
cpu: 100m
memory: 200Mi
cpu: 150m
memory: 300Mi
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
Expand Down
2 changes: 1 addition & 1 deletion ...ster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
manifestHash: 18226ed1d11cc43ad4dd4a4fd20fc90599b76802ea4331ef33b6c34c47eb9b98
manifestHash: c8d81e6b0f86f32dfbe38ecd5bba61088e8e0d580810baceb52023142d09fe39
name: aws-load-balancer-controller.addons.k8s.io
needsPKI: true
selector:
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/update_cluster/many-addons-ccm-irsa/in-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ metadata:
spec:
awsLoadBalancerController:
enabled: true
cpuRequest: "150m"
cpuLimit: "300m"
memoryRequest: "300Mi"
memoryLimit: "600Mi"
certManager:
enabled: true
clusterAutoscaler:
Expand Down
4 changes: 4 additions & 0 deletions ...egration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ spec:
authorization:
alwaysAllow: {}
awsLoadBalancerController:
cpuLimit: 300m
cpuRequest: 150m
enabled: true
memoryLimit: 600Mi
memoryRequest: 300Mi
certManager:
enabled: true
channel: stable
Expand Down
8 changes: 4 additions & 4 deletions ...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1339,11 +1339,11 @@ spec:
protocol: TCP
resources:
limits:
cpu: 200m
memory: 500Mi
cpu: 300m
memory: 600Mi
requests:
cpu: 100m
memory: 200Mi
cpu: 150m
memory: 300Mi
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
Expand Down
2 changes: 1 addition & 1 deletion ...e_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
manifestHash: 363855c5ab9b0d6ee65c97da156fc9921f1edc71010a7c307211434e1d214a1b
manifestHash: ffc4f2ec627ac46feb21105f317db1f077d850cd44e3ebdb713d4f47cfe57a93
name: aws-load-balancer-controller.addons.k8s.io
needsPKI: true
selector:
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/update_cluster/many-addons-ccm/in-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ metadata:
spec:
awsLoadBalancerController:
enabled: true
cpuRequest: "150m"
cpuLimit: "300m"
memoryRequest: "300Mi"
memoryLimit: "600Mi"
certManager:
enabled: true
clusterAutoscaler:
Expand Down
8 changes: 4 additions & 4 deletions ...loudup/resources/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,11 +1292,11 @@ spec:
protocol: TCP
resources:
limits:
cpu: 200m
memory: 500Mi
cpu: {{ or .CPULimit "200m" }}
memory: {{ or .MemoryLimit "500Mi" }}
requests:
cpu: 100m
memory: 200Mi
cpu: {{ or .CPURequest "100m" }}
memory: {{ or .MemoryRequest "200Mi" }}
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
Expand Down
Loading