From d64c86240755c56e5622a2e932adc4f2e5161c60 Mon Sep 17 00:00:00 2001 From: German Espinoza Date: Wed, 29 May 2024 11:17:47 -0500 Subject: [PATCH 1/5] Add imagePullPolicy to Prometheus and Alertmanager Signed-off-by: German Espinoza --- bitnami/kube-prometheus/Chart.yaml | 2 +- bitnami/kube-prometheus/README.md | 8 +++++--- .../templates/alertmanager/alertmanager.yaml | 1 + .../templates/prometheus/prometheus.yaml | 1 + bitnami/kube-prometheus/values.yaml | 14 +++++++++----- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/bitnami/kube-prometheus/Chart.yaml b/bitnami/kube-prometheus/Chart.yaml index c7c1697f555476..d29a621917b395 100644 --- a/bitnami/kube-prometheus/Chart.yaml +++ b/bitnami/kube-prometheus/Chart.yaml @@ -46,4 +46,4 @@ maintainers: name: kube-prometheus sources: - https://github.com/bitnami/charts/tree/main/bitnami/kube-prometheus -version: 9.2.1 +version: 9.2.2 diff --git a/bitnami/kube-prometheus/README.md b/bitnami/kube-prometheus/README.md index fcee906d6626e5..6fcc9bddce666e 100644 --- a/bitnami/kube-prometheus/README.md +++ b/bitnami/kube-prometheus/README.md @@ -292,6 +292,7 @@ As an alternative, use one of the preset configurations for pod affinity, pod an | `prometheus.image.registry` | Prometheus image registry | `REGISTRY_NAME` | | `prometheus.image.repository` | Prometheus image repository | `REPOSITORY_NAME/prometheus` | | `prometheus.image.digest` | Prometheus image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `prometheus.image.pullPolicy` | Prometheus image pull policy | `IfNotPresent` | | `prometheus.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | | `prometheus.serviceAccount.create` | Specify whether to create a ServiceAccount for Prometheus | `true` | | `prometheus.serviceAccount.name` | The name of the ServiceAccount to create | `""` | @@ -550,9 +551,10 @@ As an alternative, use one of the preset configurations for pod affinity, pod an | Name | Description | Value | | ---------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------ | | `alertmanager.enabled` | Deploy Alertmanager to the cluster | `true` | -| `alertmanager.image.registry` | Prometheus image registry | `REGISTRY_NAME` | -| `alertmanager.image.repository` | Prometheus image repository | `REPOSITORY_NAME/alertmanager` | -| `alertmanager.image.digest` | Prometheus image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `alertmanager.image.registry` | Alertmanager image registry | `REGISTRY_NAME` | +| `alertmanager.image.repository` | Alertmanager image repository | `REPOSITORY_NAME/alertmanager` | +| `alertmanager.image.digest` | Alertmanager image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `alertmanager.image.pullPolicy` | Alertmanager image pull policy | `IfNotPresent` | | `alertmanager.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | | `alertmanager.serviceAccount.create` | Specify whether to create a ServiceAccount for Alertmanager | `true` | | `alertmanager.serviceAccount.name` | The name of the ServiceAccount to create | `""` | diff --git a/bitnami/kube-prometheus/templates/alertmanager/alertmanager.yaml b/bitnami/kube-prometheus/templates/alertmanager/alertmanager.yaml index 7d83c0f91559d3..de5e156c947346 100644 --- a/bitnami/kube-prometheus/templates/alertmanager/alertmanager.yaml +++ b/bitnami/kube-prometheus/templates/alertmanager/alertmanager.yaml @@ -18,6 +18,7 @@ spec: serviceAccountName: {{ template "kube-prometheus.alertmanager.serviceAccountName" . }} {{- if .Values.alertmanager.image }} image: {{ template "kube-prometheus.alertmanager.image" . }} + imagePullPolicy: {{ .Values.alertmanager.image.pullPolicy }} {{- end }} listenLocal: {{ .Values.alertmanager.listenLocal }} {{- if index .Values.alertmanager "externalUrl" }} diff --git a/bitnami/kube-prometheus/templates/prometheus/prometheus.yaml b/bitnami/kube-prometheus/templates/prometheus/prometheus.yaml index 0f20ec903a08d1..df2eb7411c711d 100644 --- a/bitnami/kube-prometheus/templates/prometheus/prometheus.yaml +++ b/bitnami/kube-prometheus/templates/prometheus/prometheus.yaml @@ -51,6 +51,7 @@ spec: {{- end }} {{- if .Values.prometheus.image }} image: {{ template "kube-prometheus.prometheus.image" . }} + imagePullPolicy: {{ .Values.prometheus.image.pullPolicy }} {{- end }} {{- if .Values.prometheus.additionalArgs }} additionalArgs: {{- toYaml .Values.prometheus.additionalArgs | nindent 4 }} diff --git a/bitnami/kube-prometheus/values.yaml b/bitnami/kube-prometheus/values.yaml index 3cd1c47e22d10e..ea3fc6c49a3d22 100644 --- a/bitnami/kube-prometheus/values.yaml +++ b/bitnami/kube-prometheus/values.yaml @@ -628,6 +628,7 @@ prometheus: ## @param prometheus.image.repository [default: REPOSITORY_NAME/prometheus] Prometheus image repository ## @skip prometheus.image.tag Prometheus image tag (immutable tags are recommended) ## @param prometheus.image.digest Prometheus image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + ## @param prometheus.image.pullPolicy Prometheus image pull policy ## @param prometheus.image.pullSecrets Specify docker-registry secret names as an array ## image: @@ -635,6 +636,7 @@ prometheus: repository: bitnami/prometheus tag: 2.52.0-debian-12-r2 digest: "" + pullPolicy: IfNotPresent ## 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/ @@ -1794,11 +1796,12 @@ alertmanager: ## enabled: true ## Bitnami Alertmanager image version - ## ref: https://hub.docker.com/r/bitnami/prometheus-operator/tags/ - ## @param alertmanager.image.registry [default: REGISTRY_NAME] Prometheus image registry - ## @param alertmanager.image.repository [default: REPOSITORY_NAME/alertmanager] Prometheus image repository - ## @skip alertmanager.image.tag Prometheus image tag (immutable tags are recommended) - ## @param alertmanager.image.digest Prometheus image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + ## ref: https://hub.docker.com/r/bitnami/alertmanager/tags/ + ## @param alertmanager.image.registry [default: REGISTRY_NAME] Alertmanager image registry + ## @param alertmanager.image.repository [default: REPOSITORY_NAME/alertmanager] Alertmanager image repository + ## @skip alertmanager.image.tag Alertmanager image tag (immutable tags are recommended) + ## @param alertmanager.image.digest Alertmanager image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + ## @param alertmanager.image.pullPolicy Alertmanager image pull policy ## @param alertmanager.image.pullSecrets Specify docker-registry secret names as an array ## image: @@ -1806,6 +1809,7 @@ alertmanager: repository: bitnami/alertmanager tag: 0.27.0-debian-12-r10 digest: "" + pullPolicy: IfNotPresent ## 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/ From b601cc5cfafaf751f3bbde545455adc57805f865 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Wed, 29 May 2024 19:13:45 +0000 Subject: [PATCH 2/5] Update CHANGELOG.md Signed-off-by: Bitnami Containers --- bitnami/kube-prometheus/CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bitnami/kube-prometheus/CHANGELOG.md b/bitnami/kube-prometheus/CHANGELOG.md index 9cac05e1b728c3..0f4e085b434d0f 100644 --- a/bitnami/kube-prometheus/CHANGELOG.md +++ b/bitnami/kube-prometheus/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 9.2.1 (2024-05-23) +## 9.2.2 (2024-05-29) -* [bitnami/kube-prometheus] Use different liveness/readiness probes ([#26291](https://github.com/bitnami/charts/pull/26291)) +* [bitnami/kube-prometheus] Add imagePullPolicy to Prometheus and Alertmanager ([#26553](https://github.com/bitnami/charts/pull/26553)) + +## 9.2.1 (2024-05-23) + +* [bitnami/kube-prometheus] Use different liveness/readiness probes (#26291) ([b28ac6d](https://github.com/bitnami/charts/commit/b28ac6d18768394dd5a62431c76cf1963b284316)), closes [#26291](https://github.com/bitnami/charts/issues/26291) ## 9.2.0 (2024-05-21) From 82597b53bdb425747a824036a1e543fbfbfa42fb Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Thu, 30 May 2024 09:54:51 +0000 Subject: [PATCH 3/5] Update CHANGELOG.md Signed-off-by: Bitnami Containers --- bitnami/kube-prometheus/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/kube-prometheus/CHANGELOG.md b/bitnami/kube-prometheus/CHANGELOG.md index 0f4e085b434d0f..758b2e760966ea 100644 --- a/bitnami/kube-prometheus/CHANGELOG.md +++ b/bitnami/kube-prometheus/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 9.2.2 (2024-05-29) +## 9.2.2 (2024-05-30) * [bitnami/kube-prometheus] Add imagePullPolicy to Prometheus and Alertmanager ([#26553](https://github.com/bitnami/charts/pull/26553)) From 03092f38b9d110d1e5af4c6d85087445a5be5346 Mon Sep 17 00:00:00 2001 From: German Espinoza Date: Fri, 31 May 2024 09:50:50 -0500 Subject: [PATCH 4/5] Bump minor version Signed-off-by: German Espinoza --- bitnami/kube-prometheus/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/kube-prometheus/Chart.yaml b/bitnami/kube-prometheus/Chart.yaml index d29a621917b395..dd2ddaaa25d82b 100644 --- a/bitnami/kube-prometheus/Chart.yaml +++ b/bitnami/kube-prometheus/Chart.yaml @@ -46,4 +46,4 @@ maintainers: name: kube-prometheus sources: - https://github.com/bitnami/charts/tree/main/bitnami/kube-prometheus -version: 9.2.2 +version: 9.3.0 From 6dc5978ce630c6cb8df240ec1568ba005a9498b9 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Fri, 31 May 2024 14:56:34 +0000 Subject: [PATCH 5/5] Update CHANGELOG.md Signed-off-by: Bitnami Containers --- bitnami/kube-prometheus/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/kube-prometheus/CHANGELOG.md b/bitnami/kube-prometheus/CHANGELOG.md index 758b2e760966ea..5c510dc4d7d6f0 100644 --- a/bitnami/kube-prometheus/CHANGELOG.md +++ b/bitnami/kube-prometheus/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 9.2.2 (2024-05-30) +## 9.3.0 (2024-05-31) * [bitnami/kube-prometheus] Add imagePullPolicy to Prometheus and Alertmanager ([#26553](https://github.com/bitnami/charts/pull/26553))