Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/prometheus] update prometheus to 2.20.1 and cm reloader to 0.4.0 #23506

Merged
merged 2 commits into from
Aug 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions stable/prometheus/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: prometheus
version: 11.11.1
appVersion: 2.19.0
version: 11.12.0
appVersion: 2.20.1
description: Prometheus is a monitoring system and time series database.
home: https://prometheus.io/
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
Expand Down
6 changes: 3 additions & 3 deletions stable/prometheus/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Parameter | Description | Default
`configmapReload.prometheus.enabled` | If false, the configmap-reload container for Prometheus will not be deployed | `true`
`configmapReload.prometheus.name` | configmap-reload container name | `configmap-reload`
`configmapReload.prometheus.image.repository` | configmap-reload container image repository | `jimmidyson/configmap-reload`
`configmapReload.prometheus.image.tag` | configmap-reload container image tag | `v0.3.0`
`configmapReload.prometheus.image.tag` | configmap-reload container image tag | `v0.4.0`
`configmapReload.prometheus.image.pullPolicy` | configmap-reload container image pull policy | `IfNotPresent`
`configmapReload.prometheus.extraArgs` | Additional configmap-reload container arguments | `{}`
`configmapReload.prometheus.extraVolumeDirs` | Additional configmap-reload volume directories | `{}`
Expand All @@ -194,7 +194,7 @@ Parameter | Description | Default
`configmapReload.alertmanager.enabled` | If false, the configmap-reload container for AlertManager will not be deployed | `true`
`configmapReload.alertmanager.name` | configmap-reload container name | `configmap-reload`
`configmapReload.alertmanager.image.repository` | configmap-reload container image repository | `jimmidyson/configmap-reload`
`configmapReload.alertmanager.image.tag` | configmap-reload container image tag | `v0.3.0`
`configmapReload.alertmanager.image.tag` | configmap-reload container image tag | `v0.4.0`
`configmapReload.alertmanager.image.pullPolicy` | configmap-reload container image pull policy | `IfNotPresent`
`configmapReload.alertmanager.extraArgs` | Additional configmap-reload container arguments | `{}`
`configmapReload.alertmanager.extraVolumeDirs` | Additional configmap-reload volume directories | `{}`
Expand Down Expand Up @@ -282,7 +282,7 @@ Parameter | Description | Default
`server.enabled` | If false, Prometheus server will not be created | `true`
`server.name` | Prometheus server container name | `server`
`server.image.repository` | Prometheus server container image repository | `prom/prometheus`
`server.image.tag` | Prometheus server container image tag | `v2.19.0`
`server.image.tag` | Prometheus server container image tag | `v2.20.1`
`server.image.pullPolicy` | Prometheus server container image pull policy | `IfNotPresent`
`server.configPath` | Path to a prometheus server config file on the container FS | `/etc/config/prometheus.yml`
`server.global.scrape_interval` | How frequently to scrape targets by default | `1m`
Expand Down
6 changes: 3 additions & 3 deletions stable/prometheus/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ configmapReload:
##
image:
repository: jimmidyson/configmap-reload
tag: v0.3.0
tag: v0.4.0
pullPolicy: IfNotPresent

## Additional configmap-reload container arguments
Expand Down Expand Up @@ -370,7 +370,7 @@ configmapReload:
##
image:
repository: jimmidyson/configmap-reload
tag: v0.3.0
tag: v0.4.0
pullPolicy: IfNotPresent

## Additional configmap-reload container arguments
Expand Down Expand Up @@ -568,7 +568,7 @@ server:
##
image:
repository: prom/prometheus
tag: v2.19.2
tag: v2.20.1
pullPolicy: IfNotPresent

## prometheus server priorityClassName
Expand Down