diff --git a/bitnami/kube-prometheus/CHANGELOG.md b/bitnami/kube-prometheus/CHANGELOG.md
index 8ff47b2a0813a3..207518ca35f104 100644
--- a/bitnami/kube-prometheus/CHANGELOG.md
+++ b/bitnami/kube-prometheus/CHANGELOG.md
@@ -1,8 +1,12 @@
# Changelog
-## 9.3.3 (2024-06-05)
+## 9.4.0 (2024-06-06)
-* [bitnami/kube-prometheus] Bump chart version ([#26857](https://github.com/bitnami/charts/pull/26857))
+* [bitnami/kube-prometheus] Enable PodDisruptionBudgets (part 2) ([#26700](https://github.com/bitnami/charts/pull/26700))
+
+## 9.3.3 (2024-06-05)
+
+* [bitnami/kube-prometheus] Bump chart version (#26857) ([12075c6](https://github.com/bitnami/charts/commit/12075c61aa7fd641337d67943dabb235e5c6e789)), closes [#26857](https://github.com/bitnami/charts/issues/26857)
## 9.3.2 (2024-06-05)
diff --git a/bitnami/kube-prometheus/Chart.yaml b/bitnami/kube-prometheus/Chart.yaml
index b594f578357d93..725b975f6815f4 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.3.3
+version: 9.4.0
\ No newline at end of file
diff --git a/bitnami/kube-prometheus/README.md b/bitnami/kube-prometheus/README.md
index 6fcc9bddce666e..31d7c8610eed1f 100644
--- a/bitnami/kube-prometheus/README.md
+++ b/bitnami/kube-prometheus/README.md
@@ -280,8 +280,8 @@ As an alternative, use one of the preset configurations for pod affinity, pod an
| `operator.prometheusConfigReloader.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe | `6` |
| `operator.prometheusConfigReloader.readinessProbe.successThreshold` | Minimum consecutive successes for the probe | `1` |
| `operator.namespaces` | Optional comma-separated list of namespaces to watch (default=all). | `""` |
-| `operator.pdb.create` | Enable/disable a Pod Disruption Budget creation | `false` |
-| `operator.pdb.minAvailable` | Minimum number/percentage of pods that should remain scheduled | `1` |
+| `operator.pdb.create` | Enable/disable a Pod Disruption Budget creation | `true` |
+| `operator.pdb.minAvailable` | Minimum number/percentage of pods that should remain scheduled | `""` |
| `operator.pdb.maxUnavailable` | Maximum number/percentage of pods that may be made unavailable | `""` |
### Prometheus Parameters
@@ -313,8 +313,8 @@ As an alternative, use one of the preset configurations for pod affinity, pod an
| `prometheus.containerSecurityContext.allowPrivilegeEscalation` | Set container's Security Context allowPrivilegeEscalation | `false` |
| `prometheus.containerSecurityContext.capabilities.drop` | List of capabilities to be dropped | `["ALL"]` |
| `prometheus.containerSecurityContext.seccompProfile.type` | Set container's Security Context seccomp profile | `RuntimeDefault` |
-| `prometheus.pdb.create` | Create a pod disruption budget for Prometheus | `false` |
-| `prometheus.pdb.minAvailable` | Minimum number / percentage of pods that should remain scheduled | `1` |
+| `prometheus.pdb.create` | Create a pod disruption budget for Prometheus | `true` |
+| `prometheus.pdb.minAvailable` | Minimum number / percentage of pods that should remain scheduled | `""` |
| `prometheus.pdb.maxUnavailable` | Maximum number / percentage of pods that may be made unavailable | `""` |
| `prometheus.networkPolicy.enabled` | Specifies whether a NetworkPolicy should be created | `true` |
| `prometheus.networkPolicy.allowExternal` | Don't require server label for connections | `true` |
@@ -575,8 +575,8 @@ As an alternative, use one of the preset configurations for pod affinity, pod an
| `alertmanager.containerSecurityContext.allowPrivilegeEscalation` | Set container's Security Context allowPrivilegeEscalation | `false` |
| `alertmanager.containerSecurityContext.capabilities.drop` | List of capabilities to be dropped | `["ALL"]` |
| `alertmanager.containerSecurityContext.seccompProfile.type` | Set container's Security Context seccomp profile | `RuntimeDefault` |
-| `alertmanager.pdb.create` | Create a pod disruption budget for Alertmanager | `false` |
-| `alertmanager.pdb.minAvailable` | Minimum number / percentage of pods that should remain scheduled | `1` |
+| `alertmanager.pdb.create` | Create a pod disruption budget for Alertmanager | `true` |
+| `alertmanager.pdb.minAvailable` | Minimum number / percentage of pods that should remain scheduled | `""` |
| `alertmanager.pdb.maxUnavailable` | Maximum number / percentage of pods that may be made unavailable | `""` |
| `alertmanager.service.type` | Kubernetes service type | `ClusterIP` |
| `alertmanager.service.ports.http` | Alertmanager service port | `9093` |
@@ -813,8 +813,8 @@ As an alternative, use one of the preset configurations for pod affinity, pod an
| `blackboxExporter.networkPolicy.extraEgress` | Add extra ingress rules to the NetworkPolicy | `[]` |
| `blackboxExporter.networkPolicy.ingressNSMatchLabels` | Labels to match to allow traffic from other namespaces | `{}` |
| `blackboxExporter.networkPolicy.ingressNSPodMatchLabels` | Pod labels to match to allow traffic from other namespaces | `{}` |
-| `blackboxExporter.pdb.create` | Enable/disable a Pod Disruption Budget creation | `false` |
-| `blackboxExporter.pdb.minAvailable` | Minimum number/percentage of pods that should remain scheduled | `1` |
+| `blackboxExporter.pdb.create` | Enable/disable a Pod Disruption Budget creation | `true` |
+| `blackboxExporter.pdb.minAvailable` | Minimum number/percentage of pods that should remain scheduled | `""` |
| `blackboxExporter.pdb.maxUnavailable` | Maximum number/percentage of pods that may be made unavailable | `""` |
| `kubeApiServer.enabled` | Create a ServiceMonitor to scrape kube-apiserver service | `true` |
| `kubeApiServer.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used. | `""` |
diff --git a/bitnami/kube-prometheus/templates/alertmanager/pdb.yaml b/bitnami/kube-prometheus/templates/alertmanager/pdb.yaml
index c234791ceb62ea..f99f41c488561e 100644
--- a/bitnami/kube-prometheus/templates/alertmanager/pdb.yaml
+++ b/bitnami/kube-prometheus/templates/alertmanager/pdb.yaml
@@ -19,7 +19,7 @@ spec:
{{- if .Values.alertmanager.pdb.minAvailable }}
minAvailable: {{ .Values.alertmanager.pdb.minAvailable }}
{{- end }}
- {{- if .Values.alertmanager.pdb.maxUnavailable }}
- maxUnavailable: {{ .Values.alertmanager.pdb.maxUnavailable }}
+ {{- if or .Values.alertmanager.pdb.maxUnavailable ( not .Values.alertmanager.pdb.minAvailable ) }}
+ maxUnavailable: {{ .Values.alertmanager.pdb.maxUnavailable | default 1 }}
{{- end }}
{{- end }}
diff --git a/bitnami/kube-prometheus/templates/blackbox-exporter/pdb.yaml b/bitnami/kube-prometheus/templates/blackbox-exporter/pdb.yaml
index 82d3592f12b420..a4bcde40e7b2cc 100644
--- a/bitnami/kube-prometheus/templates/blackbox-exporter/pdb.yaml
+++ b/bitnami/kube-prometheus/templates/blackbox-exporter/pdb.yaml
@@ -19,7 +19,7 @@ spec:
{{- if .Values.blackboxExporter.pdb.minAvailable }}
minAvailable: {{ .Values.blackboxExporter.pdb.minAvailable }}
{{- end }}
- {{- if .Values.blackboxExporter.pdb.maxUnavailable }}
- maxUnavailable: {{ .Values.blackboxExporter.pdb.maxUnavailable }}
+ {{- if or .Values.blackboxExporter.pdb.maxUnavailable ( not .Values.blackboxExporter.pdb.minAvailable ) }}
+ maxUnavailable: {{ .Values.blackboxExporter.pdb.maxUnavailable | default 1 }}
{{- end }}
{{- end }}
diff --git a/bitnami/kube-prometheus/templates/prometheus-operator/pdb.yaml b/bitnami/kube-prometheus/templates/prometheus-operator/pdb.yaml
index 7dc0fe58facddc..a8df505d4c631c 100644
--- a/bitnami/kube-prometheus/templates/prometheus-operator/pdb.yaml
+++ b/bitnami/kube-prometheus/templates/prometheus-operator/pdb.yaml
@@ -19,7 +19,7 @@ spec:
{{- if .Values.operator.pdb.minAvailable }}
minAvailable: {{ .Values.operator.pdb.minAvailable }}
{{- end }}
- {{- if .Values.operator.pdb.maxUnavailable }}
- maxUnavailable: {{ .Values.operator.pdb.maxUnavailable }}
+ {{- if or .Values.operator.pdb.maxUnavailable ( not .Values.operator.pdb.minAvailable ) }}
+ maxUnavailable: {{ .Values.operator.pdb.maxUnavailable | default 1 }}
{{- end }}
{{- end }}
diff --git a/bitnami/kube-prometheus/templates/prometheus/pdb.yaml b/bitnami/kube-prometheus/templates/prometheus/pdb.yaml
index 6476ebcea7e89b..f2d60df1167976 100644
--- a/bitnami/kube-prometheus/templates/prometheus/pdb.yaml
+++ b/bitnami/kube-prometheus/templates/prometheus/pdb.yaml
@@ -19,7 +19,7 @@ spec:
{{- if .Values.prometheus.pdb.minAvailable }}
minAvailable: {{ .Values.prometheus.pdb.minAvailable }}
{{- end }}
- {{- if .Values.prometheus.pdb.maxUnavailable }}
- maxUnavailable: {{ .Values.prometheus.pdb.maxUnavailable }}
+ {{- if or .Values.prometheus.pdb.maxUnavailable ( not .Values.prometheus.pdb.minAvailable ) }}
+ maxUnavailable: {{ .Values.prometheus.pdb.maxUnavailable | default 1 }}
{{- end }}
{{- end }}
diff --git a/bitnami/kube-prometheus/values.yaml b/bitnami/kube-prometheus/values.yaml
index c815a1dc653389..dcd95809c72d54 100644
--- a/bitnami/kube-prometheus/values.yaml
+++ b/bitnami/kube-prometheus/values.yaml
@@ -609,8 +609,8 @@ operator:
## @param operator.pdb.maxUnavailable Maximum number/percentage of pods that may be made unavailable
##
pdb:
- create: false
- minAvailable: 1
+ create: true
+ minAvailable: ""
maxUnavailable: ""
## @section Prometheus Parameters
@@ -711,8 +711,8 @@ prometheus:
## @param prometheus.pdb.maxUnavailable Maximum number / percentage of pods that may be made unavailable
##
pdb:
- create: false
- minAvailable: 1
+ create: true
+ minAvailable: ""
maxUnavailable: ""
## Network Policies
## Ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
@@ -1882,8 +1882,8 @@ alertmanager:
## @param alertmanager.pdb.maxUnavailable Maximum number / percentage of pods that may be made unavailable
##
pdb:
- create: false
- minAvailable: 1
+ create: true
+ minAvailable: ""
maxUnavailable: ""
## Alertmanager Service
##
@@ -2928,8 +2928,8 @@ blackboxExporter:
## @param blackboxExporter.pdb.maxUnavailable Maximum number/percentage of pods that may be made unavailable
##
pdb:
- create: false
- minAvailable: 1
+ create: true
+ minAvailable: ""
maxUnavailable: ""
## Component scraping the kube-apiserver
##