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

fix: config reloader memory and cpu as params

Browse source
This commit is contained in:
Israel Sotomayor 2019-02-13 17:04:45 -08:00
parent 48248f5dfb
commit 89a6411d4b
6 changed files with 12 additions and 4 deletions

2
cmd/operator/main.go
View file

@ -123,6 +123,8 @@ func init() {
// 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.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", "15Mi", "Config Reloader Memory")
flagset.StringVar(&cfg.AlertmanagerDefaultBaseImage, "alertmanager-default-base-image", "quay.io/prometheus/alertmanager", "Alertmanager default base image")
flagset.StringVar(&cfg.PrometheusDefaultBaseImage, "prometheus-default-base-image", "quay.io/prometheus/prometheus", "Prometheus default base image")
flagset.StringVar(&cfg.ThanosDefaultBaseImage, "thanos-default-base-image", "improbable/thanos", "Thanos default base image")

2
pkg/alertmanager/operator.go
View file

@ -73,6 +73,8 @@ type Config struct {
Host string
LocalHost string
ConfigReloaderImage string
ConfigReloaderCPU string
ConfigReloaderMemory string
AlertmanagerDefaultBaseImage string
Namespaces []string
Labels prometheusoperator.Labels

4
pkg/alertmanager/statefulset.go
View file

@ -462,8 +462,8 @@ func makeStatefulSetSpec(a *monitoringv1.Alertmanager, config Config) (*appsv1.S
},
Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("50m"),
v1.ResourceMemory: resource.MustParse("10Mi"),
v1.ResourceCPU: resource.MustParse(config.ConfigReloaderCPU),
v1.ResourceMemory: resource.MustParse(config.ConfigReloaderMemory),
},
},
},

2
pkg/prometheus/operator.go
View file

@ -136,6 +136,8 @@ type Config struct {
TLSInsecure bool
TLSConfig rest.TLSClientConfig
ConfigReloaderImage string
ConfigReloaderCPU string
ConfigReloaderMemory string
PrometheusConfigReloader string
AlertmanagerDefaultBaseImage string
PrometheusDefaultBaseImage string

4
pkg/prometheus/statefulset.go
View file

@ -621,8 +621,8 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config, ruleConfigMapName
VolumeMounts: []v1.VolumeMount{},
Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{
v1.ResourceCPU: resource.MustParse("25m"),
v1.ResourceMemory: resource.MustParse("10Mi"),
v1.ResourceCPU: resource.MustParse(c.ConfigReloaderCPU),
v1.ResourceMemory: resource.MustParse(c.ConfigReloaderMemory),
},
},
}

2
pkg/prometheus/statefulset_test.go
View file

@ -32,6 +32,8 @@ import (
var (
defaultTestConfig = &Config{
ConfigReloaderImage: "quay.io/coreos/configmap-reload:latest",
ConfigReloaderCPU: "100m",
ConfigReloaderMemory: "15Mi",
PrometheusDefaultBaseImage: "quay.io/prometheus/prometheus",
ThanosDefaultBaseImage: "improbable/thanos",
}