From 545e6a77458a8e93afa06416467539f02011db19 Mon Sep 17 00:00:00 2001 From: Faiz Shukri Date: Tue, 9 Apr 2019 16:35:05 +0800 Subject: [PATCH] [stable/ark] Fix prefix param, add restic podannotation and resource (#11430) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [stable/ark] Add prefix support Signed-off-by: Faiz Shukri * [stable/ark] Add annotation to restic pod Signed-off-by: Faiz Shukri * [stable/ark] Bump version to 3.0.1 Signed-off-by: Faiz Shukri * [stable/ark] Bump version to 3.0.2 Signed-off-by: Faiz Shukri * [stable/ark] Fix prefix location in values.yaml Signed-off-by: Faiz Shukri * [stable/ark] Add resource to restic daemon Signed-off-by: Faiz Shukri * Bump minor version for new features Signed-off-by: Reinhard Nägele --- stable/ark/Chart.yaml | 2 +- stable/ark/templates/restic-daemonset.yaml | 8 ++++++++ stable/ark/values.yaml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/stable/ark/Chart.yaml b/stable/ark/Chart.yaml index 72c0f76ea4..557222a7d1 100644 --- a/stable/ark/Chart.yaml +++ b/stable/ark/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 0.10.1 description: A Helm chart for ark name: ark -version: 4.1.1 +version: 4.2.0 home: https://github.com/heptio/ark icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png sources: diff --git a/stable/ark/templates/restic-daemonset.yaml b/stable/ark/templates/restic-daemonset.yaml index a7604f5d5b..0fad357f4e 100644 --- a/stable/ark/templates/restic-daemonset.yaml +++ b/stable/ark/templates/restic-daemonset.yaml @@ -17,6 +17,10 @@ spec: metadata: labels: name: restic + {{- with .Values.podAnnotations }} + annotations: +{{ toYaml . | indent 8 }} + {{- end }} spec: {{- if .Values.serviceAccount.server.create }} serviceAccountName: {{ template "ark.serverServiceAccount" . }} @@ -81,4 +85,8 @@ spec: - name: AWS_SHARED_CREDENTIALS_FILE value: /credentials/cloud {{- end }} + {{- with .Values.resources }} + resources: +{{ toYaml . | indent 12 }} + {{- end }} {{- end }} diff --git a/stable/ark/values.yaml b/stable/ark/values.yaml index d1b64f4902..f926d7820f 100644 --- a/stable/ark/values.yaml +++ b/stable/ark/values.yaml @@ -47,9 +47,9 @@ configuration: backupStorageLocation: name: bucket: + # prefix: config: {} # region: - # prefix: # s3ForcePathStyle: # s3Url: # kmsKeyId: