mirrors/prometheus-operator
mirrors/prometheus-operator
1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-20 19:29:10 +00:00
Code Activity

Add Prometheus Config Reloader CPU and Memory flags

Browse source
This commit is contained in:
Jessie A. Morris 2019-03-07 15:28:30 -07:00
parent 56e6ea626a
commit d455cb9595
4 changed files with 12 additions and 5 deletions

4
cmd/operator/main.go
View file

@ -121,7 +121,9 @@ func init() {
// Prometheus Operator image, tagged with the same semver version. Default to
// the Prometheus Operator version if no Prometheus config reloader image is
// specified.
flagset.StringVar(&cfg.PrometheusConfigReloader, "prometheus-config-reloader", fmt.Sprintf("quay.io/coreos/prometheus-config-reloader:v%v", version.Version), "Prometheus config reloader image")
flagset.StringVar(&cfg.PrometheusConfigReloaderImage, "prometheus-config-reloader", fmt.Sprintf("quay.io/coreos/prometheus-config-reloader:v%v", version.Version), "Prometheus config reloader image")
flagset.StringVar(&cfg.PrometheusConfigReloaderCPU, "prometheus-config-reloader-cpu", "50m", "Prometheus config reloader image")
flagset.StringVar(&cfg.PrometheusConfigReloaderMemory, "prometheus-config-reloader-memory", "50Mi", "Prometheus config reloader image")
flagset.StringVar(&cfg.ConfigReloaderImage, "config-reloader-image", "quay.io/coreos/configmap-reload:v0.0.1", "Reload Image")
flagset.StringVar(&cfg.ConfigReloaderCPU, "config-reloader-cpu", "100m", "Config Reloader CPU")
flagset.StringVar(&cfg.ConfigReloaderMemory, "config-reloader-memory", "25Mi", "Config Reloader Memory")

4
pkg/prometheus/operator.go
View file

@ -139,7 +139,9 @@ type Config struct {
ConfigReloaderImage string
ConfigReloaderCPU string
ConfigReloaderMemory string
PrometheusConfigReloader string
PrometheusConfigReloaderImage string
PrometheusConfigReloaderCPU string
PrometheusConfigReloaderMemory string
AlertmanagerDefaultBaseImage string
PrometheusDefaultBaseImage string
ThanosDefaultBaseImage string

6
pkg/prometheus/statefulset.go
View file

@ -861,7 +861,7 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config, ruleConfigMapName
Resources: p.Spec.Resources,
}, {
Name: "prometheus-config-reloader",
Image: c.PrometheusConfigReloader,
Image: c.PrometheusConfigReloaderImage,
Env: []v1.EnvVar{
{
Name: "POD_NAME",
@ -875,8 +875,8 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config, ruleConfigMapName
VolumeMounts: configReloadVolumeMounts,
Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("50m"),
v1.ResourceMemory: resource.MustParse("50Mi"),
v1.ResourceCPU: resource.MustParse(c.PrometheusConfigReloaderCPU),
v1.ResourceMemory: resource.MustParse(c.PrometheusConfigReloaderMemory),
},
},
},

3
pkg/prometheus/statefulset_test.go
View file

@ -34,6 +34,9 @@ var (
ConfigReloaderImage: "quay.io/coreos/configmap-reload:latest",
ConfigReloaderCPU: "100m",
ConfigReloaderMemory: "25Mi",
PrometheusConfigReloaderImage: "quay.io/coreos/prometheus-config-reloader:latest",
PrometheusConfigReloaderCPU: "50m",
PrometheusConfigReloaderMemory: "50Mi",
PrometheusDefaultBaseImage: "quay.io/prometheus/prometheus",
ThanosDefaultBaseImage: "improbable/thanos",
}