From 37f16a3dc426fa15d5d4eb1dba80387c274a90ff Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Wed, 25 May 2022 11:25:22 +0200 Subject: [PATCH 1/2] feat(barman): add optional annotations to PVCs --- charts/barman/Chart.yaml | 2 +- charts/barman/README.md | 4 +++- charts/barman/templates/pvc.yaml | 12 ++++++++++-- charts/barman/values.yaml | 4 ++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/charts/barman/Chart.yaml b/charts/barman/Chart.yaml index 6d1c39334..4835c72f0 100644 --- a/charts/barman/Chart.yaml +++ b/charts/barman/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: barman type: application description: Chart for Barman PostgreSQL Backup and Recovery Manager -version: 0.7.2 +version: 0.8.0 appVersion: "v2.19" keywords: - barman diff --git a/charts/barman/README.md b/charts/barman/README.md index df0e2428f..c42dc13ff 100644 --- a/charts/barman/README.md +++ b/charts/barman/README.md @@ -1,6 +1,6 @@ # barman -![Version: 0.7.2](https://img.shields.io/badge/Version-0.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.19](https://img.shields.io/badge/AppVersion-v2.19-informational?style=flat-square) +![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.19](https://img.shields.io/badge/AppVersion-v2.19-informational?style=flat-square) Chart for Barman PostgreSQL Backup and Recovery Manager @@ -55,10 +55,12 @@ This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk | image.repository | string | `"ubcctlt/barman"` | Container image to deploy | | image.tag | string | `""` | Overrides the image tag whose default is the chart version. | | persistence.data.accessMode | string | `"ReadWriteOnce"` | Access mode for persistent storage | +| persistence.data.annotations | object | `{}` | Add annotations to backup data PVC | | persistence.data.enabled | bool | `true` | Enable persistent storage for backup data | | persistence.data.size | string | `"20Gi"` | Size of storage volume | | persistence.data.storageClass | string | `""` | Storage class | | persistence.recover.accessMode | string | `"ReadWriteOnce"` | Access mode for persistent storage | +| persistence.recover.annotations | object | `{}` | Add annotations to recovery PVC | | persistence.recover.enabled | bool | `false` | Enable persistent storage for recovery | | persistence.recover.size | string | `"4Gi"` | Size of storage volume | | persistence.recover.storageClass | string | `""` | Storage class | diff --git a/charts/barman/templates/pvc.yaml b/charts/barman/templates/pvc.yaml index e4f40aac5..05e5c59bf 100644 --- a/charts/barman/templates/pvc.yaml +++ b/charts/barman/templates/pvc.yaml @@ -2,9 +2,13 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: + name: {{ include "barman.fullname" . }}-data labels: {{- include "barman.labels" . | nindent 4 }} - name: {{ include "barman.fullname" . }}-data + {{- with .Values.persistence.data.annotations }} + annotations: + {{ . | nindent 4 }} + {{- end }} spec: accessModes: - {{ .Values.persistence.data.accessMode | quote }} @@ -20,9 +24,13 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: + name: {{ include "barman.fullname" . }}-recover labels: {{- include "barman.labels" . | nindent 4 }} - name: {{ include "barman.fullname" . }}-recover + {{- with .Values.persistence.recover.annotations }} + annotations: + {{ . | nindent 4 }} + {{- end }} spec: accessModes: - {{ .Values.persistence.recover.accessMode | quote }} diff --git a/charts/barman/values.yaml b/charts/barman/values.yaml index 2ffc10fdc..89c07c993 100644 --- a/charts/barman/values.yaml +++ b/charts/barman/values.yaml @@ -62,6 +62,8 @@ persistence: size: 20Gi # -- Storage class storageClass: "" + # -- Add annotations to backup data PVC + annotations: {} recover: # -- Enable persistent storage for recovery enabled: false @@ -71,6 +73,8 @@ persistence: size: 4Gi # -- Storage class storageClass: "" + # -- Add annotations to recovery PVC + annotations: {} rbac: # -- Whether to create RBAC or not From 117312b5b08ad4092c5746010db2d059e19a1cd0 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Wed, 25 May 2022 11:38:53 +0200 Subject: [PATCH 2/2] fix: update maintainer to reflect org name --- charts/barman/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/barman/Chart.yaml b/charts/barman/Chart.yaml index 4835c72f0..9d4be41b8 100644 --- a/charts/barman/Chart.yaml +++ b/charts/barman/Chart.yaml @@ -14,6 +14,6 @@ sources: - https://github.com/ubc/barman-docker - https://github.com/adfinis-sygroup/helm-charts/tree/main/charts/barman maintainers: - - name: adfinis + - name: adfinis-sygroup email: support@adfinis.com url: https://adfinis.com