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

*: switch to upstream jimmidyson/configmap-reload image

Browse source
This commit is contained in:
paulfantom 2020-01-13 13:14:29 +01:00
parent 9d899f0bf6
commit 3c1456eac3
No known key found for this signature in database
GPG key ID: 12AE0185401674E7
4 changed files with 9 additions and 9 deletions
cmd/operator
main.go
jsonnet/prometheus-operator
prometheus-operator.libsonnet
pkg
alertmanager
statefulset_test.go
prometheus
statefulset_test.go

2
cmd/operator/main.go
View file

@ -132,7 +132,7 @@ 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.ConfigReloaderImage, "config-reloader-image", "quay.io/coreos/configmap-reload:v0.0.1", "Reload Image")
flagset.StringVar(&cfg.ConfigReloaderImage, "config-reloader-image", "jimmidyson/configmap-reload:v0.3.0", "Reload Image")
flagset.StringVar(&cfg.ConfigReloaderCPU, "config-reloader-cpu", "100m", "Config Reloader CPU. Value \"0\" disables it and causes no limit to be configured.")
flagset.StringVar(&cfg.ConfigReloaderMemory, "config-reloader-memory", "25Mi", "Config Reloader Memory. Value \"0\" disables it and causes no limit to be configured.")
flagset.StringVar(&cfg.AlertmanagerDefaultBaseImage, "alertmanager-default-base-image", "quay.io/prometheus/alertmanager", "Alertmanager default base image")

4
jsonnet/prometheus-operator/prometheus-operator.libsonnet
View file

@ -17,12 +17,12 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
versions+:: {
prometheusOperator: 'v0.34.0',
prometheusConfigReloader: self.prometheusOperator,
configmapReloader: 'v0.0.1',
configmapReloader: 'v0.3.0',
},
imageRepos+:: {
prometheusOperator: 'quay.io/coreos/prometheus-operator',
configmapReloader: 'quay.io/coreos/configmap-reload',
configmapReloader: 'jimmidyson/configmap-reload',
prometheusConfigReloader: 'quay.io/coreos/prometheus-config-reloader',
},
},

6
pkg/alertmanager/statefulset_test.go
View file

@ -29,7 +29,7 @@ import (
var (
defaultTestConfig = Config{
ConfigReloaderImage: "quay.io/coreos/configmap-reload:latest",
ConfigReloaderImage: "jimmidyson/configmap-reload:latest",
ConfigReloaderCPU: "100m",
ConfigReloaderMemory: "25Mi",
AlertmanagerDefaultBaseImage: "quay.io/prometheus/alertmanager",
@ -478,7 +478,7 @@ func sliceContains(slice []string, match string) bool {
func TestSidecarsNoCPULimits(t *testing.T) {
testConfig := Config{
ConfigReloaderImage: "quay.io/coreos/configmap-reload:latest",
ConfigReloaderImage: "jimmidyson/configmap-reload:latest",
ConfigReloaderCPU: "0",
ConfigReloaderMemory: "25Mi",
AlertmanagerDefaultBaseImage: "quay.io/prometheus/alertmanager",
@ -504,7 +504,7 @@ func TestSidecarsNoCPULimits(t *testing.T) {
func TestSidecarsNoMemoryLimits(t *testing.T) {
testConfig := Config{
ConfigReloaderImage: "quay.io/coreos/configmap-reload:latest",
ConfigReloaderImage: "jimmidyson/configmap-reload:latest",
ConfigReloaderCPU: "100m",
ConfigReloaderMemory: "0",
AlertmanagerDefaultBaseImage: "quay.io/prometheus/alertmanager",

6
pkg/prometheus/statefulset_test.go
View file

@ -32,7 +32,7 @@ import (
var (
defaultTestConfig = &Config{
ConfigReloaderImage: "quay.io/coreos/configmap-reload:latest",
ConfigReloaderImage: "jimmidyson/configmap-reload:latest",
ConfigReloaderCPU: "100m",
ConfigReloaderMemory: "25Mi",
PrometheusConfigReloaderImage: "quay.io/coreos/prometheus-config-reloader:latest",
@ -794,7 +794,7 @@ func TestRetention(t *testing.T) {
func TestSidecarsNoCPULimits(t *testing.T) {
testConfig := &Config{
ConfigReloaderImage: "quay.io/coreos/configmap-reload:latest",
ConfigReloaderImage: "jimmidyson/configmap-reload:latest",
ConfigReloaderCPU: "0",
ConfigReloaderMemory: "50Mi",
PrometheusConfigReloaderImage: "quay.io/coreos/prometheus-config-reloader:latest",
@ -820,7 +820,7 @@ func TestSidecarsNoCPULimits(t *testing.T) {
func TestSidecarsNoMemoryLimits(t *testing.T) {
testConfig := &Config{
ConfigReloaderImage: "quay.io/coreos/configmap-reload:latest",
ConfigReloaderImage: "jimmidyson/configmap-reload:latest",
ConfigReloaderCPU: "100m",
ConfigReloaderMemory: "0",
PrometheusConfigReloaderImage: "quay.io/coreos/prometheus-config-reloader:latest",