From 8a0fc95baf6d5dad919ce47cffb34ec9838b8e6d Mon Sep 17 00:00:00 2001 From: Blesswin Samuel Date: Tue, 18 Jul 2023 23:12:29 +0530 Subject: [PATCH] configure resource requests for config reloader container --- controllers/factory/alertmanager.go | 4 +++- controllers/factory/vmagent.go | 2 ++ controllers/factory/vmalert.go | 4 +++- controllers/factory/vmauth.go | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/controllers/factory/alertmanager.go b/controllers/factory/alertmanager.go index 1d483b9a..f7d9b31d 100644 --- a/controllers/factory/alertmanager.go +++ b/controllers/factory/alertmanager.go @@ -406,12 +406,14 @@ func makeStatefulSetSpec(cr *victoriametricsv1beta1.VMAlertmanager, c *config.Ba amVolumeMounts = append(amVolumeMounts, cr.Spec.VolumeMounts...) - resources := v1.ResourceRequirements{Limits: v1.ResourceList{}} + resources := v1.ResourceRequirements{Limits: v1.ResourceList{}, Requests: v1.ResourceList{}} if c.VMAlertManager.ConfigReloaderCPU != "0" && c.VMAgentDefault.UseDefaultResources { resources.Limits[v1.ResourceCPU] = resource.MustParse(c.VMAlertManager.ConfigReloaderCPU) + resources.Requests[v1.ResourceCPU] = resource.MustParse(c.VMAlertManager.ConfigReloaderCPU) } if c.VMAlertManager.ConfigReloaderMemory != "0" && c.VMAgentDefault.UseDefaultResources { resources.Limits[v1.ResourceMemory] = resource.MustParse(c.VMAlertManager.ConfigReloaderMemory) + resources.Requests[v1.ResourceMemory] = resource.MustParse(c.VMAlertManager.ConfigReloaderMemory) } terminationGracePeriod := int64(120) diff --git a/controllers/factory/vmagent.go b/controllers/factory/vmagent.go index 6ad5d9e3..042a5297 100644 --- a/controllers/factory/vmagent.go +++ b/controllers/factory/vmagent.go @@ -1241,9 +1241,11 @@ func buildConfigReloaderContainer(cr *victoriametricsv1beta1.VMAgent, c *config. } if c.VMAgentDefault.ConfigReloaderCPU != "0" && c.VMAgentDefault.UseDefaultResources { configReloaderResources.Limits[corev1.ResourceCPU] = resource.MustParse(c.VMAgentDefault.ConfigReloaderCPU) + configReloaderResources.Requests[corev1.ResourceCPU] = resource.MustParse(c.VMAgentDefault.ConfigReloaderCPU) } if c.VMAgentDefault.ConfigReloaderMemory != "0" && c.VMAgentDefault.UseDefaultResources { configReloaderResources.Limits[corev1.ResourceMemory] = resource.MustParse(c.VMAgentDefault.ConfigReloaderMemory) + configReloaderResources.Requests[corev1.ResourceMemory] = resource.MustParse(c.VMAgentDefault.ConfigReloaderMemory) } configReloadArgs := buildConfigReloaderArgs(cr, c) diff --git a/controllers/factory/vmalert.go b/controllers/factory/vmalert.go index d9f10057..ae5518cf 100644 --- a/controllers/factory/vmalert.go +++ b/controllers/factory/vmalert.go @@ -390,12 +390,14 @@ func vmAlertSpecGen(cr *victoriametricsv1beta1.VMAlert, c *config.BaseOperatorCo }) } - resources := corev1.ResourceRequirements{Limits: corev1.ResourceList{}} + resources := corev1.ResourceRequirements{Limits: corev1.ResourceList{}, Requests: corev1.ResourceList{}} if c.VMAlertDefault.ConfigReloaderCPU != "0" && c.VMAgentDefault.UseDefaultResources { resources.Limits[corev1.ResourceCPU] = resource.MustParse(c.VMAlertDefault.ConfigReloaderCPU) + resources.Requests[corev1.ResourceCPU] = resource.MustParse(c.VMAlertDefault.ConfigReloaderCPU) } if c.VMAlertDefault.ConfigReloaderMemory != "0" && c.VMAgentDefault.UseDefaultResources { resources.Limits[corev1.ResourceMemory] = resource.MustParse(c.VMAlertDefault.ConfigReloaderMemory) + resources.Requests[corev1.ResourceMemory] = resource.MustParse(c.VMAlertDefault.ConfigReloaderMemory) } var ports []corev1.ContainerPort diff --git a/controllers/factory/vmauth.go b/controllers/factory/vmauth.go index 51c4c2ee..bfadec02 100644 --- a/controllers/factory/vmauth.go +++ b/controllers/factory/vmauth.go @@ -465,9 +465,11 @@ func buildVMAuthConfigReloaderContainer(cr *victoriametricsv1beta1.VMAuth, c *co } if c.VMAuthDefault.ConfigReloaderCPU != "0" && c.VMAuthDefault.UseDefaultResources { configReloaderResources.Limits[corev1.ResourceCPU] = resource.MustParse(c.VMAuthDefault.ConfigReloaderCPU) + configReloaderResources.Requests[corev1.ResourceCPU] = resource.MustParse(c.VMAuthDefault.ConfigReloaderCPU) } if c.VMAgentDefault.ConfigReloaderMemory != "0" && c.VMAuthDefault.UseDefaultResources { configReloaderResources.Limits[corev1.ResourceMemory] = resource.MustParse(c.VMAuthDefault.ConfigReloaderMemory) + configReloaderResources.Requests[corev1.ResourceMemory] = resource.MustParse(c.VMAuthDefault.ConfigReloaderMemory) } configReloader := corev1.Container{