diff --git a/README.md b/README.md index 5164bfbc..972b9d39 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ for more in-depth information. | [common](charts/common) | Common chartbuilding components ... | ![Version: 0.x](https://img.shields.io/badge/version-0.x-brightgreen) | ![App version: 0.x](https://img.shields.io/badge/app%20version-0.x-brightgreen) | | [csi-secret-provider-class](charts/csi-secret-provider-class) | A Helm chart to create a SecretP... | ![Version: 0.x](https://img.shields.io/badge/version-0.x-brightgreen) | ![App version: 0.x](https://img.shields.io/badge/app%20version-0.x-brightgreen) | | [customer-center](charts/customer-center) | Chart for Customer-Center applic... | ![Version: 0.x](https://img.shields.io/badge/version-0.x-brightgreen) | ![App version: 3.3.x](https://img.shields.io/badge/app%20version-3.3.x-brightgreen) | -| [kubernetes-etcd-backup](charts/kubernetes-etcd-backup) | Chart for kubernetes-etcd-backup... | ![Version: 1.1.x](https://img.shields.io/badge/version-1.1.x-brightgreen) | ![App version: 1.0.x](https://img.shields.io/badge/app%20version-1.0.x-brightgreen) | +| [kubernetes-etcd-backup](charts/kubernetes-etcd-backup) | Chart for kubernetes-etcd-backup... | ![Version: 1.2.x](https://img.shields.io/badge/version-1.2.x-brightgreen) | ![App version: 1.0.x](https://img.shields.io/badge/app%20version-1.0.x-brightgreen) | | [mopsos](charts/mopsos) | Deploy Mopsos to a Kubernetes Cl... | ![Version: 0.x](https://img.shields.io/badge/version-0.x-brightgreen) | ![App version: 0.x](https://img.shields.io/badge/app%20version-0.x-brightgreen) | | [openshift-etcd-backup](charts/openshift-etcd-backup) | Chart for openshift-etcd-backup ... | ![Version: 1.8.x](https://img.shields.io/badge/version-1.8.x-brightgreen) | ![App version: 1.8.x](https://img.shields.io/badge/app%20version-1.8.x-brightgreen) | | [osschallenge](charts/osschallenge) | Chart for OSS-Challenge application | ![Version: 0.x](https://img.shields.io/badge/version-0.x-brightgreen) | ![App version: ed.x](https://img.shields.io/badge/app%20version-ed.x-brightgreen) | diff --git a/charts/kubernetes-etcd-backup/Chart.yaml b/charts/kubernetes-etcd-backup/Chart.yaml index 0b8171f4..2d5dbe45 100644 --- a/charts/kubernetes-etcd-backup/Chart.yaml +++ b/charts/kubernetes-etcd-backup/Chart.yaml @@ -3,7 +3,7 @@ apiVersion: v2 name: kubernetes-etcd-backup description: Chart for kubernetes-etcd-backup solution type: application -version: 1.1.0 +version: 1.2.0 appVersion: v1.0.6 keywords: - kubernetes-etcd-backup @@ -20,6 +20,4 @@ maintainers: annotations: artifacthub.io/changes: | - kind: changed - description: "Allow configuration of jobs affinity" - - kind: changed - description: "Allow use of an existing pvc" + description: "Allow configuration of extraVolume/Mounts" diff --git a/charts/kubernetes-etcd-backup/README.md b/charts/kubernetes-etcd-backup/README.md index b16b35df..f4b265e5 100644 --- a/charts/kubernetes-etcd-backup/README.md +++ b/charts/kubernetes-etcd-backup/README.md @@ -1,6 +1,6 @@ # kubernetes-etcd-backup -![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.6](https://img.shields.io/badge/AppVersion-v1.0.6-informational?style=flat-square) +![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.6](https://img.shields.io/badge/AppVersion-v1.0.6-informational?style=flat-square) Chart for kubernetes-etcd-backup solution @@ -28,6 +28,8 @@ This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk | etcdCertification.etcdPeerTlsName | string | `"changeme"` | etcd-peer-tls secret name | | etcdCertification.etcdServerCaName | string | `"changeme"` | etcd-server-ca secret name | | etcdConfiguration.endpoint | string | `"changeme"` | Etcd endpoint ip or hostname without protocol or port | +| extraVolumeMounts | list | `[]` | | +| extraVolumes | list | `[]` | | | fullnameOverride | string | `""` | | | image.pullPolicy | string | `"Always"` | Image pull policy configuration | | image.repository | string | `"ghcr.io/adfinis/kubernetes-etcd-backup"` | Repository image to use | diff --git a/charts/kubernetes-etcd-backup/templates/cronjob.yaml b/charts/kubernetes-etcd-backup/templates/cronjob.yaml index e105e8b8..197b75a8 100644 --- a/charts/kubernetes-etcd-backup/templates/cronjob.yaml +++ b/charts/kubernetes-etcd-backup/templates/cronjob.yaml @@ -36,6 +36,9 @@ spec: - name: volume-backup mountPath: /backup {{- end }} + {{- if .Values.extraVolumeMounts }} + {{- toYaml .Values.extraVolumeMounts | nindent 12 }} + {{- end }} restartPolicy: Never volumes: - name: etcd-peer-tls @@ -56,6 +59,9 @@ spec: persistentVolumeClaim: claimName: {{ .Values.persistence.existingClaim }} {{- end }} + {{- if .Values.extraVolumes }} + {{- toYaml .Values.extraVolumes | nindent 10 }} + {{- end }} {{ with .Values.affinity }} affinity: {{ . | toYaml | nindent 14 }} diff --git a/charts/kubernetes-etcd-backup/values.yaml b/charts/kubernetes-etcd-backup/values.yaml index f034382c..474b305d 100644 --- a/charts/kubernetes-etcd-backup/values.yaml +++ b/charts/kubernetes-etcd-backup/values.yaml @@ -49,7 +49,6 @@ persistence: # -- Use an exising PVC existingClaim: "" - image: # -- Repository image to use repository: ghcr.io/adfinis/kubernetes-etcd-backup @@ -73,8 +72,8 @@ resources: # cpu: 100m # memory: 128Mi - -affinity: {} +affinity: + {} # Will be added directly to the pods affinity configuration. # nodeAffinity: # requiredDuringSchedulingIgnoredDuringExecution: @@ -85,9 +84,8 @@ affinity: {} # values: # - ssd - monitoring: -# -- Deploy PrometheusRule to be alerted in case of backup fails as decribed [here](https://github.com/adfinis/kubernetes-etcd-backup/blob/main/etcd-backup-cronjob-monitor.PrometheusRule.yaml). + # -- Deploy PrometheusRule to be alerted in case of backup fails as decribed [here](https://github.com/adfinis/kubernetes-etcd-backup/blob/main/etcd-backup-cronjob-monitor.PrometheusRule.yaml). enabled: false rules: # -- Deploy PrometheusRule to check for cronjob fails. @@ -100,3 +98,13 @@ monitoring: # rules: # - record: my_record # expr: 100 * my_record + +extraVolumeMounts: [] +## Additional volumeMounts to the pod. +# - name: additional-volume-mount +# mountPath: /var/additional-volume-path + +extraVolumes: [] +## Additional volumes to the pod. +# - name: additional-volume +# emptyDir: {}