[bitnami/jaeger] Enable PodDisruptionBudgets (#26494)

* [bitnami/jaeger] Enable PodDisruptionBudgets Signed-off-by: Fran Mulero <[email protected]> * Version bump Signed-off-by: Fran Mulero <[email protected]> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <[email protected]> --------- Signed-off-by: Fran Mulero <[email protected]> Signed-off-by: Bitnami Containers <[email protected]> Co-authored-by: Bitnami Containers <[email protected]>
bitnami · Jun 3, 2024 · c8a1142 · c8a1142
1 parent 610f625
commit c8a1142
Show file tree

Hide file tree

Showing 7 changed files with 241 additions and 109 deletions.
diff --git a/bitnami/jaeger/CHANGELOG.md b/bitnami/jaeger/CHANGELOG.md
diff --git a/bitnami/jaeger/Chart.yaml b/bitnami/jaeger/Chart.yaml
@@ -34,5 +34,4 @@ maintainers:
 name: jaeger
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/jaeger
-version: 2.2.1
-
+version: 2.3.0
diff --git a/bitnami/jaeger/README.md b/bitnami/jaeger/README.md
@@ -282,6 +282,9 @@ The [Bitnami jaeger](https://github.com/bitnami/containers/tree/main/bitnami/jae
 | `query.updateStrategy.rollingUpdate`                      | Jaeger query deployment rolling update configuration parameters                                                                                                                                                               | `{}`             |
 | `query.extraVolumes`                                      | Optionally specify extra list of additional volumes for jaeger container                                                                                                                                                      | `[]`             |
 | `query.initContainers`                                    | Add additional init containers to the jaeger pods                                                                                                                                                                             | `[]`             |
+| `query.pdb.create`                                        | Enable/disable a Pod Disruption Budget creation                                                                                                                                                                               | `true`           |
+| `query.pdb.minAvailable`                                  | Minimum number/percentage of pods that should remain scheduled                                                                                                                                                                | `""`             |
+| `query.pdb.maxUnavailable`                                | Maximum number/percentage of pods that may be made unavailable. Defaults to `1` if both `query.pdb.minAvailable` and `query.pdb.maxUnavailable` are empty.                                                                    | `""`             |
 | `query.sidecars`                                          | Add additional sidecar containers to the jaeger pods                                                                                                                                                                          | `[]`             |
 
 ### Collector deployment parameters
@@ -392,6 +395,9 @@ The [Bitnami jaeger](https://github.com/bitnami/containers/tree/main/bitnami/jae
 | `collector.updateStrategy.rollingUpdate`                      | Jaeger collector deployment rolling update configuration parameters                                                                                                                                                                   | `{}`             |
 | `collector.extraVolumes`                                      | Optionally specify extra list of additional volumes for jaeger container                                                                                                                                                              | `[]`             |
 | `collector.initContainers`                                    | Add additional init containers to the jaeger pods                                                                                                                                                                                     | `[]`             |
+| `collector.pdb.create`                                        | Enable/disable a Pod Disruption Budget creation                                                                                                                                                                                       | `true`           |
+| `collector.pdb.minAvailable`                                  | Minimum number/percentage of pods that should remain scheduled                                                                                                                                                                        | `""`             |
+| `collector.pdb.maxUnavailable`                                | Maximum number/percentage of pods that may be made unavailable. Defaults to `1` if both `collector.pdb.minAvailable` and `collector.pdb.maxUnavailable` are empty.                                                                    | `""`             |
 | `collector.sidecars`                                          | Add additional sidecar containers to the jaeger pods                                                                                                                                                                                  | `[]`             |
 
 ### agent deployment parameters
@@ -499,6 +505,9 @@ The [Bitnami jaeger](https://github.com/bitnami/containers/tree/main/bitnami/jae
 | `agent.updateStrategy.rollingUpdate`                          | Jaeger agent deployment rolling update configuration parameters                                                                                                                                                                       | `{}`             |
 | `agent.extraVolumes`                                          | Optionally specify extra list of additional volumes for jaeger container                                                                                                                                                              | `[]`             |
 | `agent.initContainers`                                        | Add additional init containers to the jaeger pods                                                                                                                                                                                     | `[]`             |
+| `agent.pdb.create`                                            | Enable/disable a Pod Disruption Budget creation                                                                                                                                                                                       | `true`           |
+| `agent.pdb.minAvailable`                                      | Minimum number/percentage of pods that should remain scheduled                                                                                                                                                                        | `""`             |
+| `agent.pdb.maxUnavailable`                                    | Maximum number/percentage of pods that may be made unavailable. Defaults to `1` if both `agent.pdb.minAvailable` and `agent.pdb.maxUnavailable` are empty.                                                                            | `""`             |
 | `agent.sidecars`                                              | Add additional sidecar containers to the jaeger pods                                                                                                                                                                                  | `[]`             |
 | `migration.podLabels`                                         | Additional pod labels                                                                                                                                                                                                                 | `{}`             |
 | `migration.podAnnotations`                                    | Additional pod annotations                                                                                                                                                                                                            | `{}`             |

diff --git a/bitnami/jaeger/templates/agent/pdb.yaml b/bitnami/jaeger/templates/agent/pdb.yaml
@@ -0,0 +1,30 @@
+{{- /*
+Copyright Broadcom, Inc. All Rights Reserved.
+SPDX-License-Identifier: APACHE-2.0
+*/}}
+
+{{- if .Values.agent.pdb.create }}
+apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
+kind: PodDisruptionBudget
+metadata:
+  name:  {{ include "jaeger.agent.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+    app.kubernetes.io/part-of: jaeger
+    app.kubernetes.io/component: agent
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.agent.pdb.minAvailable }}
+  minAvailable: {{ .Values.agent.pdb.minAvailable }}
+  {{- end  }}
+  {{- if or .Values.agent.pdb.maxUnavailable ( not .Values.agent.pdb.minAvailable ) }}
+  maxUnavailable: {{ .Values.agent.pdb.maxUnavailable | default 1 }}
+  {{- end  }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.agent.podLabels .Values.commonLabels ) "context" . ) }}
+  selector:
+    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
+      app.kubernetes.io/part-of: jaeger
+      app.kubernetes.io/component: agent
+{{- end }}
diff --git a/bitnami/jaeger/templates/collector/pdb.yaml b/bitnami/jaeger/templates/collector/pdb.yaml
@@ -0,0 +1,30 @@
+{{- /*
+Copyright Broadcom, Inc. All Rights Reserved.
+SPDX-License-Identifier: APACHE-2.0
+*/}}
+
+{{- if .Values.collector.pdb.create }}
+apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
+kind: PodDisruptionBudget
+metadata:
+  name:  {{ include "jaeger.collector.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+    app.kubernetes.io/part-of: jaeger
+    app.kubernetes.io/component: collector
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.collector.pdb.minAvailable }}
+  minAvailable: {{ .Values.collector.pdb.minAvailable }}
+  {{- end  }}
+  {{- if or .Values.collector.pdb.maxUnavailable ( not .Values.collector.pdb.minAvailable ) }}
+  maxUnavailable: {{ .Values.collector.pdb.maxUnavailable | default 1 }}
+  {{- end  }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.collector.podLabels .Values.commonLabels ) "context" . ) }}
+  selector:
+    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
+      app.kubernetes.io/part-of: jaeger
+      app.kubernetes.io/component: collector
+{{- end }}
diff --git a/bitnami/jaeger/templates/query/pdb.yaml b/bitnami/jaeger/templates/query/pdb.yaml
@@ -0,0 +1,30 @@
+{{- /*
+Copyright Broadcom, Inc. All Rights Reserved.
+SPDX-License-Identifier: APACHE-2.0
+*/}}
+
+{{- if .Values.query.pdb.create }}
+apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
+kind: PodDisruptionBudget
+metadata:
+  name:  {{ include "jaeger.query.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+    app.kubernetes.io/part-of: jaeger
+    app.kubernetes.io/component: query
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.query.pdb.minAvailable }}
+  minAvailable: {{ .Values.query.pdb.minAvailable }}
+  {{- end  }}
+  {{- if or .Values.query.pdb.maxUnavailable ( not .Values.query.pdb.minAvailable ) }}
+  maxUnavailable: {{ .Values.query.pdb.maxUnavailable | default 1 }}
+  {{- end  }}
+  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.query.podLabels .Values.commonLabels ) "context" . ) }}
+  selector:
+    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
+      app.kubernetes.io/part-of: jaeger
+      app.kubernetes.io/component: query
+{{- end }}
diff --git a/bitnami/jaeger/values.yaml b/bitnami/jaeger/values.yaml
@@ -472,6 +472,16 @@ query:
   ## @param query.initContainers Add additional init containers to the jaeger pods
   ##
   initContainers: []
+  ## Pod Disruption Budget configuration
+  ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb
+  ## @param query.pdb.create Enable/disable a Pod Disruption Budget creation
+  ## @param query.pdb.minAvailable Minimum number/percentage of pods that should remain scheduled
+  ## @param query.pdb.maxUnavailable Maximum number/percentage of pods that may be made unavailable. Defaults to `1` if both `query.pdb.minAvailable` and `query.pdb.maxUnavailable` are empty.
+  ##
+  pdb:
+    create: true
+    minAvailable: ""
+    maxUnavailable: ""
   ## @param query.sidecars Add additional sidecar containers to the jaeger pods
   ##
   sidecars: []
@@ -895,6 +905,16 @@ collector:
   ## @param collector.initContainers Add additional init containers to the jaeger pods
   ##
   initContainers: []
+  ## Pod Disruption Budget configuration
+  ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb
+  ## @param collector.pdb.create Enable/disable a Pod Disruption Budget creation
+  ## @param collector.pdb.minAvailable Minimum number/percentage of pods that should remain scheduled
+  ## @param collector.pdb.maxUnavailable Maximum number/percentage of pods that may be made unavailable. Defaults to `1` if both `collector.pdb.minAvailable` and `collector.pdb.maxUnavailable` are empty.
+  ##
+  pdb:
+    create: true
+    minAvailable: ""
+    maxUnavailable: ""
   ## @param collector.sidecars Add additional sidecar containers to the jaeger pods
   ##
   sidecars: []
@@ -1300,6 +1320,16 @@ agent:
   ## @param agent.initContainers Add additional init containers to the jaeger pods
   ##
   initContainers: []
+  ## Pod Disruption Budget configuration
+  ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb
+  ## @param agent.pdb.create Enable/disable a Pod Disruption Budget creation
+  ## @param agent.pdb.minAvailable Minimum number/percentage of pods that should remain scheduled
+  ## @param agent.pdb.maxUnavailable Maximum number/percentage of pods that may be made unavailable. Defaults to `1` if both `agent.pdb.minAvailable` and `agent.pdb.maxUnavailable` are empty.
+  ##
+  pdb:
+    create: true
+    minAvailable: ""
+    maxUnavailable: ""
   ## @param agent.sidecars Add additional sidecar containers to the jaeger pods
   ##
   sidecars: []