Back compat for schedules.

A touch less graceful than I'd like but it does work. Signed-off-by: W. Kavanaugh Latiolais <[email protected]>
vmware-tanzu · Oct 26, 2020 · 26d1a8a · 26d1a8a
1 parent 4d2343d
commit 26d1a8a
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 5 deletions.
diff --git a/charts/velero/ci/test-values-back-compat.yaml b/charts/velero/ci/test-values-back-compat.yaml
@@ -19,6 +19,13 @@ serviceAccount:
   server:
     name: velero
 
+schedules:
+  mybackup:
+    schedule: "0 0 * * *"
+    template:
+      ttl: "240h"
+      includedNamespaces:
+        - foo
 # Whether or not to clean up CustomResourceDefintions when deleting a release.
 # Cleaning up CRDs will delete the BackupStorageLocation and VolumeSnapshotLocation instances, which would have to be reconfigured.
 # Backup data in object storage will _not_ be deleted, however Backup instances in the Kubernetes API will.

diff --git a/charts/velero/ci/test-values.yaml b/charts/velero/ci/test-values.yaml
@@ -18,6 +18,13 @@ serviceAccount:
   server:
     name: velero
 
+schedules:
+  - name: mybackup
+    schedule: "0 0 * * *"
+    template:
+      ttl: "240h"
+      includedNamespaces:
+        - foo
 # Whether or not to clean up CustomResourceDefintions when deleting a release.
 # Cleaning up CRDs will delete the BackupStorageLocation and VolumeSnapshotLocation instances, which would have to be reconfigured.
 # Backup data in object storage will _not_ be deleted, however Backup instances in the Kubernetes API will.

diff --git a/charts/velero/templates/schedule.yaml b/charts/velero/templates/schedule.yaml
@@ -1,15 +1,19 @@
+{{- if kindIs "slice" .Values.schedules -}}
 {{- range .Values.schedules }}
 apiVersion: velero.io/v1
 kind: Schedule
 metadata:
   name: {{ include "velero.fullname" $ }}-{{ .name }}
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-delete-policy": "before-hook-creation"
   labels:
     app.kubernetes.io/name: {{ include "velero.name" $ }}
     app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     helm.sh/chart: {{ include "velero.chart" $ }}
-    {{- if $.Values.scheduleLabels }}
-      {{- toYaml $.Values.scheduleLabels | nindent 4 }}
+    {{- if .labels }}
+      {{- toYaml .labels | nindent 4 }}
     {{- end }}
 spec:
   schedule: {{ .schedule | quote }}
@@ -18,4 +22,30 @@ spec:
     {{- toYaml . | nindent 4 }}
 {{- end }}
 ---
+{{- end -}}
+{{- else -}}
+{{- range $scheduleName, $schedule := .Values.schedules }}
+apiVersion: velero.io/v1
+kind: Schedule
+metadata:
+  name: {{ include "velero.fullname" $ }}-{{ $scheduleName }}
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-delete-policy": "before-hook-creation"
+  labels:
+    app.kubernetes.io/name: {{ include "velero.name" $ }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
+    app.kubernetes.io/managed-by: {{ $.Release.Service }}
+    helm.sh/chart: {{ include "velero.chart" $ }}
+    {{- if $schedule.labels }}
+      {{- toYaml $schedule.labels | nindent 4 }}
+    {{- end }}
+spec:
+  schedule: {{ $schedule.schedule | quote }}
+{{- with $schedule.template }}
+  template:
+    {{- toYaml . | nindent 4 }}
+{{- end }}
+---
 {{- end }}
+{{- end -}}
diff --git a/charts/velero/tests/__snapshot__/back-compat-snapshot_test.yaml.snap b/charts/velero/tests/__snapshot__/back-compat-snapshot_test.yaml.snap
@@ -164,3 +164,22 @@ manifest should match snapshot:
         bucket: velero
         region: us-west-1
       provider: aws
+  5: |
+    apiVersion: velero.io/v1
+    kind: Schedule
+    metadata:
+      annotations:
+        helm.sh/hook: post-install,post-upgrade
+        helm.sh/hook-delete-policy: before-hook-creation
+      labels:
+        app.kubernetes.io/instance: RELEASE-NAME
+        app.kubernetes.io/managed-by: Tiller
+        app.kubernetes.io/name: velero
+        helm.sh/chart: velero-2.14.0
+      name: RELEASE-NAME-velero-mybackup
+    spec:
+      schedule: 0 0 * * *
+      template:
+        includedNamespaces:
+        - foo
+        ttl: 240h
diff --git a/charts/velero/tests/__snapshot__/snapshot__test.yaml.snap b/charts/velero/tests/__snapshot__/snapshot__test.yaml.snap
@@ -164,3 +164,22 @@ manifest should match snapshot:
         bucket: velero
         region: us-west-1
       provider: aws
+  5: |
+    apiVersion: velero.io/v1
+    kind: Schedule
+    metadata:
+      annotations:
+        helm.sh/hook: post-install,post-upgrade
+        helm.sh/hook-delete-policy: before-hook-creation
+      labels:
+        app.kubernetes.io/instance: RELEASE-NAME
+        app.kubernetes.io/managed-by: Tiller
+        app.kubernetes.io/name: velero
+        helm.sh/chart: velero-2.14.0
+      name: RELEASE-NAME-velero-mybackup
+    spec:
+      schedule: 0 0 * * *
+      template:
+        includedNamespaces:
+        - foo
+        ttl: 240h
diff --git a/charts/velero/tests/back-compat-snapshot_test.yaml b/charts/velero/tests/back-compat-snapshot_test.yaml
@@ -3,6 +3,7 @@ templates:
   - backupstoragelocation.yaml
   - restic-daemonset.yaml
   - volumesnapshotlocation.yaml
+  - schedule.yaml
 tests:
   - it: manifest should match snapshot
     values:

diff --git a/charts/velero/tests/snapshot__test.yaml b/charts/velero/tests/snapshot__test.yaml
@@ -3,6 +3,7 @@ templates:
   - backupstoragelocation.yaml
   - restic-daemonset.yaml
   - volumesnapshotlocation.yaml
+  - schedule.yaml
 tests:
   - it: manifest should match snapshot
     values:

diff --git a/charts/velero/values.yaml b/charts/velero/values.yaml
@@ -262,13 +262,13 @@ restic:
 # Backup schedules to create.
 # Eg:
 # schedules:
-#     name: mybackup
+#   - name: mybackup
 #     schedule: "0 0 * * *"
 #     template:
 #       ttl: "240h"
 #       includedNamespaces:
 #        - foo
-schedules: []
+# schedules: []
 
 scheduleLabels: {}
 
@@ -287,7 +287,7 @@ configMaps: {}
 ## End of additional Velero resource settings.
 ##
 
-# Depricated configuration key
+# Deprecated
 configuration:
   backupStorageLocation: {}
   volumeSnapshotLocation: {}