Skip to content

Correctly set the resources of mysqldExporter #642

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
frouioui merged 2 commits into from
Dec 2, 2024
Merged

Correctly set the resources of mysqldExporter #642

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e40859
Fix how we set the resources for mysqldExporter
frouioui Dec 2, 2024
0f90ca5
Consistent merging of resources
frouioui Dec 2, 2024
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
19 changes: 10 additions & 9 deletions pkg/operator/vttablet/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,15 @@ func UpdatePod(obj *corev1.Pod, spec *Spec) {
},
SecurityContext: securityContext,
VolumeMounts: mysqldMounts,
Resources: corev1.ResourceRequirements{
// TODO(enisoc): Add readiness and liveness probes that make sense for mysqld-exporter.
// This depends on the exact semantics of each of mysqld-exporter's HTTP handlers,
// so we need to do more investigation. For now it's better to leave them empty.
}

if spec.MysqldExporter != nil && (len(spec.MysqldExporter.Resources.Limits) > 0 || len(spec.MysqldExporter.Resources.Requests) > 0) {
update.ResourceRequirements(&mysqldExporterContainer.Resources, &spec.MysqldExporter.Resources)
} else {
mysqldExporterContainer.Resources = corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: *resource.NewMilliQuantity(mysqldExporterCPURequestMillis, resource.DecimalSI),
corev1.ResourceMemory: *resource.NewQuantity(mysqldExporterMemoryRequestBytes, resource.BinarySI),
Expand All @@ -234,14 +242,7 @@ func UpdatePod(obj *corev1.Pod, spec *Spec) {
corev1.ResourceCPU: *resource.NewMilliQuantity(mysqldExporterCPULimitMillis, resource.DecimalSI),
corev1.ResourceMemory: *resource.NewQuantity(mysqldExporterMemoryLimitBytes, resource.BinarySI),
},
},
// TODO(enisoc): Add readiness and liveness probes that make sense for mysqld-exporter.
// This depends on the exact semantics of each of mysqld-exporter's HTTP handlers,
// so we need to do more investigation. For now it's better to leave them empty.
}

if spec.MysqldExporter != nil {
update.ResourceRequirements(&mysqldExporterContainer.Resources, &spec.MysqldExporter.Resources)
}
}
}

Expand Down
Loading