diff --git a/bitnami/etcd/Chart.yaml b/bitnami/etcd/Chart.yaml index ac34961cfe..87e135db87 100644 --- a/bitnami/etcd/Chart.yaml +++ b/bitnami/etcd/Chart.yaml @@ -32,4 +32,4 @@ maintainers: name: etcd sources: - https://github.com/bitnami/charts/tree/main/bitnami/etcd -version: 9.6.2 +version: 9.7.0 diff --git a/bitnami/etcd/README.md b/bitnami/etcd/README.md index 105324a30b..aa257ba6a6 100644 --- a/bitnami/etcd/README.md +++ b/bitnami/etcd/README.md @@ -295,6 +295,7 @@ The command removes all the Kubernetes components associated with the chart and | `disasterRecovery.cronjob.resources.requests` | Cronjob container resource requests | `{}` | | `disasterRecovery.cronjob.nodeSelector` | Node labels for cronjob pods assignment | `{}` | | `disasterRecovery.cronjob.tolerations` | Tolerations for cronjob pods assignment | `[]` | +| `disasterRecovery.cronjob.podLabels` | List of labels that will be added to pods created by cronjob | `[]` | | `disasterRecovery.pvc.existingClaim` | A manually managed Persistent Volume and Claim | `""` | | `disasterRecovery.pvc.size` | PVC Storage Request | `2Gi` | | `disasterRecovery.pvc.storageClassName` | Storage Class for snapshots volume | `nfs` | diff --git a/bitnami/etcd/templates/cronjob.yaml b/bitnami/etcd/templates/cronjob.yaml index 288d464ca9..77ce0445d2 100644 --- a/bitnami/etcd/templates/cronjob.yaml +++ b/bitnami/etcd/templates/cronjob.yaml @@ -4,6 +4,7 @@ SPDX-License-Identifier: APACHE-2.0 */}} {{- if .Values.disasterRecovery.enabled -}} +{{- $mergedLabels := mergeOverwrite (dict) .Values.commonLabels .Values.disasterRecovery.cronjob.podLabels -}} apiVersion: {{ include "common.capabilities.cronjob.apiVersion" . }} kind: CronJob metadata: @@ -21,7 +22,7 @@ spec: spec: template: metadata: - labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 12 }} + labels: {{- include "common.labels.standard" ( dict "customLabels" $mergedLabels "context" $ ) | nindent 12 }} app.kubernetes.io/component: snapshotter {{- if .Values.disasterRecovery.cronjob.podAnnotations }} annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.disasterRecovery.cronjob.podAnnotations "context" $) | nindent 12 }} diff --git a/bitnami/etcd/values.yaml b/bitnami/etcd/values.yaml index 17d4bdb440..6816d129d3 100644 --- a/bitnami/etcd/values.yaml +++ b/bitnami/etcd/values.yaml @@ -881,6 +881,9 @@ disasterRecovery: ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## tolerations: [] + ## @param disasterRecovery.cronjob.podLabels List of labels that will be added to pods created by cronjob + ## + podLabels: [] pvc: ## @param disasterRecovery.pvc.existingClaim A manually managed Persistent Volume and Claim