Skip to content

Commit

Permalink
[bitnami/kube-prometheus] Add imagePullPolicy to Prometheus and Alert…
Browse files Browse the repository at this point in the history 
…manager (#26553)

* Add imagePullPolicy to Prometheus and Alertmanager

Signed-off-by: German Espinoza <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Bitnami Containers <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Bitnami Containers <[email protected]>

* Bump minor version

Signed-off-by: German Espinoza <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Bitnami Containers <[email protected]>

---------

Signed-off-by: German Espinoza <[email protected]>
Signed-off-by: Bitnami Containers <[email protected]>
Co-authored-by: Bitnami Containers <[email protected]>
  • Loading branch information
@gespinozat @bitnami-bot
gespinozat and bitnami-bot authored Jun 1, 2024
1 parent 0185820 commit ed64806
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 11 deletions.
8 changes: 6 additions & 2 deletions bitnami/kube-prometheus/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Changelog

## 9.2.1 (2024-05-23)
## 9.3.0 (2024-05-31)

* [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))

## <small>9.2.1 (2024-05-23)</small>

* [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)

Expand Down
2 changes: 1 addition & 1 deletion bitnami/kube-prometheus/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0
8 changes: 5 additions & 3 deletions bitnami/kube-prometheus/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 | `""` |
Expand Down Expand Up @@ -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 | `""` |
Expand Down
1 change: 1 addition & 0 deletions bitnami/kube-prometheus/templates/alertmanager/alertmanager.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }}
Expand Down
1 change: 1 addition & 0 deletions bitnami/kube-prometheus/templates/prometheus/prometheus.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
14 changes: 9 additions & 5 deletions bitnami/kube-prometheus/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,13 +628,15 @@ 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:
registry: docker.io
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/
Expand Down Expand Up @@ -1794,18 +1796,20 @@ 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:
registry: docker.io
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/
Expand Down

0 comments on commit ed64806

Please sign in to comment.