Skip to content
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

Allow setting CPU limit and Mem request / limit for kube API server #10275

Merged
merged 1 commit into from
Nov 23, 2020
Merged

Allow setting CPU limit and Mem request / limit for kube API server #10275

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
1 change: 1 addition & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,6 +1420,7 @@ k8s.io/cloud-provider v0.20.0-beta.2/go.mod h1:xu40/8K5o/wqZyuChUVqD5CoqVOVzKXE/
k8s.io/cloud-provider-openstack v1.18.0 h1:v/ebjNEdx0hBaygsRohSS643f41lj2CwvapCbn+aLOs=
k8s.io/cloud-provider-openstack v1.18.0/go.mod h1:03202t5Sp+4Vmk6pxJ/hVH0fEkm9gMc/pku/QpkJQMQ=
k8s.io/cluster-bootstrap v0.20.0-beta.2/go.mod h1:kYKZIdQhCt0sh13R7Bjm1JXDg9QVjez8TLlyhtDC8Ck=
k8s.io/code-generator v0.20.0-beta.2 h1:9b5RwuTexjs/UH3BUMCMI4lTECshBUc/DenKnKc3eCs=
k8s.io/code-generator v0.20.0-beta.2/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
k8s.io/component-base v0.20.0-beta.2 h1:jg3eglA+HSDgimMoHoFvAiwHAGYxEy2D5HKhLPR4AjM=
k8s.io/component-base v0.20.0-beta.2/go.mod h1:PS+w/i0JTsaQbtzk8EVPlj2WrY9E23MfWK/K4MNy7uc=
Expand Down
9 changes: 9 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 @@ -916,6 +916,9 @@ spec:
items:
type: string
type: array
cpuLimit:
description: CPULimit, cpu limit compute resource for api server e.g. "500m"
type: string
cpuRequest:
description: CPURequest, cpu request compute resource for api server. Defaults to "150m"
type: string
Expand Down Expand Up @@ -1017,6 +1020,12 @@ spec:
description: MaxRequestsInflight The maximum number of non-mutating requests in flight at a given time.
format: int32
type: integer
memoryLimit:
description: MemoryLimit, memory limit compute resource for api server e.g. "30Mi"
type: string
memoryRequest:
description: MemoryRequest, memory request compute resource for api server e.g. "30Mi"
type: string
minRequestTimeout:
description: MinRequestTimeout configures the minimum number of seconds a handler must keep a request open before timing it out. Currently only honored by the watch request handler
format: int32
Expand Down
43 changes: 37 additions & 6 deletions nodeup/pkg/model/kube_apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,41 @@ func (b *KubeAPIServerBuilder) buildPod() (*v1.Pod, error) {
probeAction.Scheme = v1.URISchemeHTTPS
}

requestCPU := resource.MustParse("150m")
if b.Cluster.Spec.KubeAPIServer.CPURequest != "" {
requestCPU = resource.MustParse(b.Cluster.Spec.KubeAPIServer.CPURequest)
resourceRequests := v1.ResourceList{}
resourceLimits := v1.ResourceList{}

cpuRequest := resource.MustParse("150m")
if kubeAPIServer.CPURequest != "" {
var err error
cpuRequest, err = resource.ParseQuantity(kubeAPIServer.CPURequest)
if err != nil {
return nil, fmt.Errorf("error parsing CPURequest=%q", kubeAPIServer.CPURequest)
}
}
resourceRequests["cpu"] = cpuRequest

if kubeAPIServer.CPULimit != "" {
cpuLimit, err := resource.ParseQuantity(kubeAPIServer.CPULimit)
if err != nil {
return nil, fmt.Errorf("error parsing CPULimit=%q", kubeAPIServer.CPULimit)
}
resourceLimits["cpu"] = cpuLimit
}

if kubeAPIServer.MemoryRequest != "" {
memoryRequest, err := resource.ParseQuantity(kubeAPIServer.MemoryRequest)
if err != nil {
return nil, fmt.Errorf("error parsing MemoryRequest=%q", kubeAPIServer.MemoryRequest)
}
resourceRequests["memory"] = memoryRequest
}

if kubeAPIServer.MemoryLimit != "" {
memoryLimit, err := resource.ParseQuantity(kubeAPIServer.MemoryLimit)
if err != nil {
return nil, fmt.Errorf("error parsing MemoryLimit=%q", kubeAPIServer.MemoryLimit)
}
resourceLimits["memory"] = memoryLimit
}

image := kubeAPIServer.Image
Expand All @@ -445,9 +477,8 @@ func (b *KubeAPIServerBuilder) buildPod() (*v1.Pod, error) {
},
},
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceCPU: requestCPU,
},
Requests: resourceRequests,
Limits: resourceLimits,
},
}

Expand Down
6 changes: 6 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 @@ -471,6 +471,12 @@ type KubeAPIServerConfig struct {

// CPURequest, cpu request compute resource for api server. Defaults to "150m"
CPURequest string `json:"cpuRequest,omitempty"`
// CPULimit, cpu limit compute resource for api server e.g. "500m"
CPULimit string `json:"cpuLimit,omitempty"`
// MemoryRequest, memory request compute resource for api server e.g. "30Mi"
MemoryRequest string `json:"memoryRequest,omitempty"`
// MemoryLimit, memory limit compute resource for api server e.g. "30Mi"
MemoryLimit string `json:"memoryLimit,omitempty"`

// Amount of time to retain Kubernetes events
EventTTL *metav1.Duration `json:"eventTTL,omitempty" flag:"event-ttl"`
Expand Down
6 changes: 6 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 @@ -471,6 +471,12 @@ type KubeAPIServerConfig struct {

// CPURequest, cpu request compute resource for api server. Defaults to "150m"
CPURequest string `json:"cpuRequest,omitempty"`
// CPULimit, cpu limit compute resource for api server e.g. "500m"
CPULimit string `json:"cpuLimit,omitempty"`
// MemoryRequest, memory request compute resource for api server e.g. "30Mi"
MemoryRequest string `json:"memoryRequest,omitempty"`
// MemoryLimit, memory limit compute resource for api server e.g. "30Mi"
MemoryLimit string `json:"memoryLimit,omitempty"`

// Amount of time to retain Kubernetes events
EventTTL *metav1.Duration `json:"eventTTL,omitempty" flag:"event-ttl"`
Expand Down
6 changes: 6 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.

4 changes: 4 additions & 0 deletions tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties.
authorizationMode: AlwaysAllow
bindAddress: 0.0.0.0
cloudProvider: aws
cpuLimit: 500m
cpuRequest: 200m
enableAdmissionPlugins:
- NamespaceLifecycle
- LimitRanger
Expand All @@ -208,6 +210,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties.
- Hostname
- ExternalIP
logLevel: 2
memoryLimit: 1000Mi
memoryRequest: 800Mi
requestheaderAllowedNames:
- aggregator
requestheaderExtraHeaderPrefixes:
Expand Down
4 changes: 4 additions & 0 deletions .../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ kubeAPIServer:
authorizationMode: AlwaysAllow
bindAddress: 0.0.0.0
cloudProvider: aws
cpuLimit: 500m
cpuRequest: 200m
enableAdmissionPlugins:
- NamespaceLifecycle
- LimitRanger
Expand All @@ -207,6 +209,8 @@ kubeAPIServer:
- Hostname
- ExternalIP
logLevel: 2
memoryLimit: 1000Mi
memoryRequest: 800Mi
requestheaderAllowedNames:
- aggregator
requestheaderExtraHeaderPrefixes:
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/update_cluster/complex/in-legacy-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ spec:
kubeAPIServer:
serviceNodePortRange: 28000-32767
auditWebhookBatchThrottleQps: 3.14
cpuRequest: 200m
cpuLimit: 500m
memoryRequest: 800Mi
memoryLimit: 1000Mi
kubelet:
anonymousAuth: false
kubernetesVersion: v1.14.0
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/update_cluster/complex/in-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ spec:
kubeAPIServer:
serviceNodePortRange: 28000-32767
auditWebhookBatchThrottleQps: 3.14
cpuRequest: 200m
cpuLimit: 500m
memoryRequest: 800Mi
memoryLimit: 1000Mi
kubelet:
anonymousAuth: false
kubernetesVersion: v1.14.0
Expand Down