Skip to content

Commit

Permalink
Consistent merging of resources
Browse files Browse the repository at this point in the history
Signed-off-by: Florent Poinsard <[email protected]>
  • Loading branch information
frouioui committed Dec 2, 2024
1 parent 8e40859 commit 0f90ca5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/operator/vttablet/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ func UpdatePod(obj *corev1.Pod, spec *Spec) {
}

if spec.MysqldExporter != nil && (len(spec.MysqldExporter.Resources.Limits) > 0 || len(spec.MysqldExporter.Resources.Requests) > 0) {
mysqldExporterContainer.Resources = spec.MysqldExporter.Resources
update.ResourceRequirements(&mysqldExporterContainer.Resources, &spec.MysqldExporter.Resources)
} else {
mysqldExporterContainer.Resources = corev1.ResourceRequirements{
Requests: corev1.ResourceList{
Expand Down

0 comments on commit 0f90ca5

Please sign in to comment.