Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-08-10 14:15:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/kube-prometheus] Deprecate ConfigMap Reload (#5149)

Browse Source 
* Deprecate ConfigMap Reload

Signed-off-by: joancafom <jcarmona@bitnami.com>

* [bitnami/kube-prometheus] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Jose Antonio Carmona
2021-01-24 11:49:12 +01:00
committed by GitHub
co-authored by Bitnami Containers
parent faaf2fd903
commit 29bcae94ce
8 changed files with 14 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/kube-prometheus/Chart.lock
+5 -5
View File
@@ -1,12 +1,12 @@
dependencies:
- name: common
repository: https://charts.bitnami.com/bitnami
version: 1.2.3
version: 1.3.7
- name: node-exporter
repository: https://charts.bitnami.com/bitnami
version: 2.1.2
version: 2.1.3
- name: kube-state-metrics
repository: https://charts.bitnami.com/bitnami
version: 1.1.3
digest: sha256:39a0ff2cfe5bbb0cc81f589a827c86f54bcb0911b63cacc075bd48b7cf8daefc
generated: "2021-01-08T05:15:46.950985674Z"
version: 1.1.6
digest: sha256:cda761559a7e9370f2e0047e9bc94b98654e6e88f520806df2867c1af1cd3818
generated: "2021-01-24T10:16:26.537440014Z"
bitnami/kube-prometheus/Chart.yaml
+2 -2
View File
@@ -1,7 +1,7 @@
annotations:
category: Analytics
apiVersion: v2
appVersion: 0.44.1
appVersion: 0.45.0
dependencies:
- name: common
repository: https://charts.bitnami.com/bitnami
@@ -34,4 +34,4 @@ sources:
- https://github.com/bitnami/bitnami-docker-prometheus
- https://github.com/bitnami/bitnami-docker-alertmanager
- https://github.com/prometheus-operator/kube-prometheus
version: 3.4.2
version: 3.5.0
bitnami/kube-prometheus/README.md
-5
View File
@@ -134,11 +134,6 @@ The following table lists the configurable parameters of the kube-prometheus cha
| `operator.configReloaderCpu` | Set the prometheus config reloader side-car CPU limit. If unset, uses the kube-prometheus project default | `nil` |
| `operator.configReloaderMemory` | Set the prometheus config reloader side-car memory limit. If unset, uses the kube-prometheus project default | `nil` |
| `operator.kubeletService.namespace` | Namespace to deploy the kubelet service | `kube-system` |
| `operator.configmapReload.image.registry` | ConfigMap Reload image registry | `docker.io` |
| `operator.configmapReload.image.repository` | ConfigMap Reload Image name | `bitnami/configmap-reload` |
| `operator.configmapReload.image.tag` | ConfigMap Reload Image tag | `{TAG_NAME}` |
| `operator.configmapReload.image.pullPolicy` | ConfigMap Reload image pull policy | `IfNotPresent` |
| `operator.configmapReload.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `operator.prometheusConfigReloader.image.registry` | Prometheus Config Reloader image registry | same as `operator.image.registry` |
| `operator.prometheusConfigReloader.image.repository` | Prometheus Config Reloader Image name | same as `operator.image.repository` |
| `operator.prometheusConfigReloader.image.tag` | Prometheus Config Reloader Image tag | same as `operator.image.tag` |
bitnami/kube-prometheus/templates/NOTES.txt
-3
View File
@@ -96,9 +96,6 @@ To access Alertmanager from outside the cluster execute the following commands:
{{- if and .Values.operator.prometheusConfigReloader.image.registry (and .Values.operator.prometheusConfigReloader.image.repository .Values.operator.prometheusConfigReloader.image.tag) }}
{{- include "common.warnings.rollingTag" .Values.operator.prometheusConfigReloader.image }}
{{- end }}
{{- if and .Values.operator.configmapReload.image.registry (and .Values.operator.configmapReload.image.repository .Values.operator.configmapReload.image.tag) }}
{{- include "common.warnings.rollingTag" .Values.operator.configmapReload.image }}
{{- end }}
{{- include "common.warnings.rollingTag" .Values.prometheus.image }}
{{- include "common.warnings.rollingTag" .Values.prometheus.thanos.image }}
{{- include "common.warnings.rollingTag" .Values.alertmanager.image }}
bitnami/kube-prometheus/templates/_helpers.tpl
+1 -12
View File
@@ -135,17 +135,6 @@ Return the proper Prometheus Operator Reloader image name
{{- end -}}
{{- end -}}
{{/*
Return the proper ConfigMap Reload image name
*/}}
{{- define "kube-prometheus.configmapReload.image" -}}
{{- if and .Values.operator.configmapReload.image.registry (and .Values.operator.configmapReload.image.repository .Values.operator.configmapReload.image.tag) }}
{{- include "common.images.image" (dict "imageRoot" .Values.operator.configmapReload.image "global" .Values.global) }}
{{- else -}}
{{- include "kube-prometheus.image" . -}}
{{- end -}}
{{- end -}}
{{/*
Return the proper Prometheus Image name
*/}}
@@ -171,7 +160,7 @@ Return the proper Alertmanager Image name
Return the proper Docker Image Registry Secret Names
*/}}
{{- define "kube-prometheus.imagePullSecrets" -}}
{{ include "common.images.pullSecrets" (dict "images" (list .Values.operator.image .Values.operator.prometheusConfigReloader.image .Values.operator.configmapReload.image .Values.prometheus.image .Values.prometheus.thanos.image .Values.alertmanager.image) "global" .Values.global) }}
{{ include "common.images.pullSecrets" (dict "images" (list .Values.operator.image .Values.operator.prometheusConfigReloader.image .Values.prometheus.image .Values.prometheus.thanos.image .Values.alertmanager.image) "global" .Values.global) }}
{{- end -}}
{{/*
bitnami/kube-prometheus/templates/prometheus-operator/configmap.yaml
-1
View File
@@ -6,6 +6,5 @@ metadata:
namespace: {{ .Release.Namespace }}
labels: {{- include "kube-prometheus.operator.labels" . | nindent 4 }}
data:
config-reloader-image: {{ template "kube-prometheus.configmapReload.image" . }}
prometheus-config-reloader: {{ template "kube-prometheus.prometheusConfigReloader.image" . }}
{{- end }}
bitnami/kube-prometheus/templates/prometheus-operator/deployment.yaml
-6
View File
@@ -48,11 +48,6 @@ spec:
image: {{ template "kube-prometheus.image" . }}
imagePullPolicy: {{ .Values.operator.image.pullPolicy }}
env:
- name: CONFIG_RELOADER_IMAGE
valueFrom:
configMapKeyRef:
name: {{ template "kube-prometheus.operator.fullname" . }}
key: config-reloader-image
- name: PROMETHEUS_CONFIG_RELOADER
valueFrom:
configMapKeyRef:
@@ -69,7 +64,6 @@ spec:
- --log-level={{ .Values.operator.logLevel }}
{{- end }}
- --localhost=127.0.0.1
- --config-reloader-image=$(CONFIG_RELOADER_IMAGE)
- --prometheus-config-reloader=$(PROMETHEUS_CONFIG_RELOADER)
{{- if .Values.operator.configReloaderCpu }}
- --config-reloader-cpu={{ .Values.operator.configReloaderCpu }}
bitnami/kube-prometheus/values.yaml
+6 -17
View File
@@ -42,7 +42,7 @@ operator:
image:
registry: docker.io
repository: bitnami/prometheus-operator
tag: 0.44.1-debian-10-r24
tag: 0.45.0-debian-10-r2
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -239,20 +239,9 @@ operator:
enabled: true
namespace: kube-system
## Configmap-reload image to use for reloading configmaps
## Prometheus Configmap-reload image to use for reloading configmaps
## defaults to Bitnami Prometheus Operator (ref: https://hub.docker.com/r/bitnami/prometheus-operator/tags/)
##
configmapReload:
image:
registry: docker.io
repository: bitnami/configmap-reload
tag: 0.4.0-debian-10-r156
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
##
# pullSecrets:
# - myRegistryKeySecretName
prometheusConfigReloader:
image: {}
# registry:
@@ -276,7 +265,7 @@ prometheus:
image:
registry: docker.io
repository: bitnami/prometheus
tag: 2.24.0-debian-10-r1
tag: 2.24.1-debian-10-r2
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
@@ -774,7 +763,7 @@ prometheus:
image:
registry: docker.io
repository: bitnami/thanos
tag: 0.17.2-scratch-r1
tag: 0.17.2-scratch-r2
## Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
##
@@ -867,7 +856,7 @@ alertmanager:
image:
registry: docker.io
repository: bitnami/alertmanager
tag: 0.21.0-debian-10-r188
tag: 0.21.0-debian-10-r201
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/