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

Change prometheus config reloader to use existing flags

Browse source
This commit is contained in:
Jessie A. Morris 2019-03-18 13:07:47 -06:00
parent 56f1d6f09d
commit 67b3312686
4 changed files with 2 additions and 8 deletions

2
cmd/operator/main.go
View file

@ -122,8 +122,6 @@ func init() {
// the Prometheus Operator version if no Prometheus config reloader image is
// specified.
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 CPU")
flagset.StringVar(&cfg.PrometheusConfigReloaderMemory, "prometheus-config-reloader-memory", "50Mi", "Prometheus config reloader Memory")
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")

2
pkg/prometheus/operator.go
View file

@ -140,8 +140,6 @@ type Config struct {
ConfigReloaderCPU string
ConfigReloaderMemory string
PrometheusConfigReloaderImage string
PrometheusConfigReloaderCPU string
PrometheusConfigReloaderMemory string
AlertmanagerDefaultBaseImage string
PrometheusDefaultBaseImage string
ThanosDefaultBaseImage string

4
pkg/prometheus/statefulset.go
View file

@ -875,8 +875,8 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config, ruleConfigMapName
VolumeMounts: configReloadVolumeMounts,
Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{
v1.ResourceCPU: resource.MustParse(c.PrometheusConfigReloaderCPU),
v1.ResourceMemory: resource.MustParse(c.PrometheusConfigReloaderMemory),
v1.ResourceCPU: resource.MustParse(c.ConfigReloaderCPU),
v1.ResourceMemory: resource.MustParse(c.ConfigReloaderMemory),
},
},
},

2
pkg/prometheus/statefulset_test.go
View file

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