diff --git a/README.md b/README.md index cb5c300bc..5164bfbc5 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.0.x](https://img.shields.io/badge/version-1.0.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.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) | | [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 2ea801609..0b8171f47 100644 --- a/charts/kubernetes-etcd-backup/Chart.yaml +++ b/charts/kubernetes-etcd-backup/Chart.yaml @@ -1,9 +1,10 @@ +--- apiVersion: v2 name: kubernetes-etcd-backup description: Chart for kubernetes-etcd-backup solution type: application -version: 1.0.4 -appVersion: v1.0.4 +version: 1.1.0 +appVersion: v1.0.6 keywords: - kubernetes-etcd-backup - kubernetes @@ -16,3 +17,9 @@ maintainers: - name: adfinis email: support@adfinis.com url: https://adfinis.com +annotations: + artifacthub.io/changes: | + - kind: changed + description: "Allow configuration of jobs affinity" + - kind: changed + description: "Allow use of an existing pvc" diff --git a/charts/kubernetes-etcd-backup/README.md b/charts/kubernetes-etcd-backup/README.md index a51707ead..b16b35dff 100644 --- a/charts/kubernetes-etcd-backup/README.md +++ b/charts/kubernetes-etcd-backup/README.md @@ -1,6 +1,6 @@ # kubernetes-etcd-backup -![Version: 1.0.4](https://img.shields.io/badge/Version-1.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.4](https://img.shields.io/badge/AppVersion-v1.0.4-informational?style=flat-square) +![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) Chart for kubernetes-etcd-backup solution @@ -17,6 +17,7 @@ This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk | Key | Type | Default | Description | |-----|------|---------|-------------| +| affinity | object | `{}` | | | backup.dirname | string | `"+etcd-backup-%FT%T%:z"` | Directory name of single backup | | backup.expiretype | string | `"days"` | expiretype could be days (keep backups newer than backup.keepdays, count (keep a number of backups with backup.keepcount), never (do not expire backups, keep all of them) | | backup.keepcount | string | `"10"` | Count retention if expiretype set to count | @@ -36,6 +37,7 @@ This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk | monitoring.rules.cronjobMonitor | bool | `true` | Deploy PrometheusRule to check for cronjob fails. | | nameOverride | string | `""` | | | persistence.capacity | string | `"10Gi"` | Define the storage size | +| persistence.existingClaim | string | `""` | Use an exising PVC | | persistence.nfs.enabled | bool | `false` | Enable nfs backend storage | | persistence.nfs.path | string | `"nfs/example/path"` | NFS server path | | persistence.nfs.server | string | `"example.com"` | NFS server name or IP | diff --git a/charts/kubernetes-etcd-backup/templates/cronjob.yaml b/charts/kubernetes-etcd-backup/templates/cronjob.yaml index cf748a030..e105e8b8d 100644 --- a/charts/kubernetes-etcd-backup/templates/cronjob.yaml +++ b/charts/kubernetes-etcd-backup/templates/cronjob.yaml @@ -52,4 +52,11 @@ spec: {{- else if .Values.persistence.provisioning.enabled }} persistentVolumeClaim: claimName: {{ include "kubernetes-etcd-backup.fullname" . }} + {{- else if .Values.persistence.existingClaim }} + persistentVolumeClaim: + claimName: {{ .Values.persistence.existingClaim }} {{- end }} + {{ with .Values.affinity }} + affinity: + {{ . | toYaml | nindent 14 }} + {{ end }} diff --git a/charts/kubernetes-etcd-backup/values.yaml b/charts/kubernetes-etcd-backup/values.yaml index fc1b655a5..f034382c7 100644 --- a/charts/kubernetes-etcd-backup/values.yaml +++ b/charts/kubernetes-etcd-backup/values.yaml @@ -46,6 +46,9 @@ persistence: # -- Enable provisioned backend storage with default or configured storageClass enabled: false storageClass: "" + # -- Use an exising PVC + existingClaim: "" + image: # -- Repository image to use @@ -70,6 +73,19 @@ resources: # cpu: 100m # memory: 128Mi + +affinity: {} + # Will be added directly to the pods affinity configuration. + # nodeAffinity: + # requiredDuringSchedulingIgnoredDuringExecution: + # nodeSelectorTerms: + # - matchExpressions: + # - key: disktype + # operator: In + # 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). enabled: false