Skip to content

Commit

Permalink
controllers: adds default resources to the init config-reloader conta…
Browse files Browse the repository at this point in the history 
…iners

it must fix an issue for envs with strict policy for resource requests
#767
  • Loading branch information
@f41gh7
f41gh7 committed Oct 4, 2023
1 parent 7c1bd04 commit 0a1708e
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 28 deletions.
30 changes: 17 additions & 13 deletions controllers/factory/vmagent.go
View file
Expand Up @@ -498,7 +498,7 @@ func makeSpecForVMAgent(cr *victoriametricsv1beta1.VMAgent, c *config.BaseOperat
}
}
}
ic := buildInitConfigContainer(c.VMAgentDefault.ConfigReloadImage, c, vmAgentConfDir, vmagentGzippedFilename, vmAgentConOfOutDir, configEnvsubstFilename, configReloader.Args)
ic := buildInitConfigContainer(c.VMAgentDefault.ConfigReloadImage, buildConfigReloaderResourceReqsForVMAgent(c), c, vmAgentConfDir, vmagentGzippedFilename, vmAgentConOfOutDir, configEnvsubstFilename, configReloader.Args)
if len(cr.Spec.InitContainers) > 0 {
ic, err = k8stools.MergePatchContainers(ic, cr.Spec.InitContainers)
if err != nil {
Expand Down Expand Up @@ -1243,17 +1243,6 @@ func buildConfigReloaderContainer(cr *victoriametricsv1beta1.VMAgent, c *config.
MountPath: vmAgentConfDir,
})
}
configReloaderResources := corev1.ResourceRequirements{
Limits: corev1.ResourceList{}, Requests: corev1.ResourceList{},
}
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)
cntr := corev1.Container{
Expand All @@ -1271,7 +1260,7 @@ func buildConfigReloaderContainer(cr *victoriametricsv1beta1.VMAgent, c *config.
Command: []string{"/bin/prometheus-config-reloader"},
Args: configReloadArgs,
VolumeMounts: configReloadVolumeMounts,
Resources: configReloaderResources,
Resources: buildConfigReloaderResourceReqsForVMAgent(c),
}
if c.UseCustomConfigReloader {
cntr.Image = fmt.Sprintf("%s", formatContainerImage(c.ContainerRegistry, c.CustomConfigReloaderImage))
Expand All @@ -1280,6 +1269,21 @@ func buildConfigReloaderContainer(cr *victoriametricsv1beta1.VMAgent, c *config.
return cntr
}

func buildConfigReloaderResourceReqsForVMAgent(c *config.BaseOperatorConf) corev1.ResourceRequirements {
configReloaderResources := corev1.ResourceRequirements{
Limits: corev1.ResourceList{}, Requests: corev1.ResourceList{},
}
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)
}
return configReloaderResources
}

func buildConfigReloaderArgs(cr *victoriametricsv1beta1.VMAgent, c *config.BaseOperatorConf) []string {
// by default use watched-dir
// it should simplify parsing for latest and empty version tags.
Expand Down
35 changes: 20 additions & 15 deletions controllers/factory/vmauth.go
View file
Expand Up @@ -255,7 +255,7 @@ func makeSpecForVMAuth(cr *victoriametricsv1beta1.VMAuth, c *config.BaseOperator
return nil, err
}

ic := buildInitConfigContainer(c.VMAuthDefault.ConfigReloadImage, c, vmAuthConfigMountGz, vmAuthConfigNameGz, vmAuthConfigFolder, vmAuthConfigName, configReloader.Args)
ic := buildInitConfigContainer(c.VMAuthDefault.ConfigReloadImage, buildConfigReloaderResourceReqsForVMAuth(c), c, vmAuthConfigMountGz, vmAuthConfigNameGz, vmAuthConfigFolder, vmAuthConfigName, configReloader.Args)
if len(cr.Spec.InitContainers) > 0 {
ic, err = k8stools.MergePatchContainers(ic, cr.Spec.InitContainers)
if err != nil {
Expand Down Expand Up @@ -460,18 +460,6 @@ func buildVMAuthConfigReloaderContainer(cr *victoriametricsv1beta1.VMAuth, c *co
MountPath: vmAuthConfigMountGz,
})
}
configReloaderResources := corev1.ResourceRequirements{
Limits: corev1.ResourceList{}, Requests: corev1.ResourceList{},
}
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{
Name: "config-reloader",
Image: formatContainerImage(c.ContainerRegistry, c.VMAuthDefault.ConfigReloadImage),
Expand All @@ -487,7 +475,7 @@ func buildVMAuthConfigReloaderContainer(cr *victoriametricsv1beta1.VMAuth, c *co
Command: []string{"/bin/prometheus-config-reloader"},
Args: configReloaderArgs,
VolumeMounts: reloaderMounts,
Resources: configReloaderResources,
Resources: buildConfigReloaderResourceReqsForVMAuth(c),
}

if c.UseCustomConfigReloader {
Expand All @@ -497,7 +485,7 @@ func buildVMAuthConfigReloaderContainer(cr *victoriametricsv1beta1.VMAuth, c *co
return configReloader
}

func buildInitConfigContainer(baseImage string, c *config.BaseOperatorConf, configDirName, configFileName, outConfigDir, outFileName string, configReloaderArgs []string) []corev1.Container {
func buildInitConfigContainer(baseImage string, resources corev1.ResourceRequirements, c *config.BaseOperatorConf, configDirName, configFileName, outConfigDir, outFileName string, configReloaderArgs []string) []corev1.Container {
var initReloader corev1.Container
if c.UseCustomConfigReloader {
// add custom config reloader as initContainer since v0.35.0
Expand Down Expand Up @@ -526,6 +514,7 @@ func buildInitConfigContainer(baseImage string, c *config.BaseOperatorConf, conf
MountPath: outConfigDir,
},
},
Resources: resources,
}
return []corev1.Container{initReloader}
}
Expand All @@ -549,6 +538,22 @@ func buildInitConfigContainer(baseImage string, c *config.BaseOperatorConf, conf
MountPath: outConfigDir,
},
},
Resources: resources,
}
return []corev1.Container{initReloader}
}

func buildConfigReloaderResourceReqsForVMAuth(c *config.BaseOperatorConf) corev1.ResourceRequirements {
configReloaderResources := corev1.ResourceRequirements{
Limits: corev1.ResourceList{}, Requests: corev1.ResourceList{},
}
if c.VMAgentDefault.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)
}
return configReloaderResources
}

0 comments on commit 0a1708e

Please sign in to comment.