From 321671b87918fdb17250d8153eaad876c3f7592e Mon Sep 17 00:00:00 2001 From: James Lu Date: Fri, 25 Nov 2022 15:14:56 +0800 Subject: [PATCH] feat(backup/restore): update chart Longhorn-2227 Signed-off-by: James Lu --- chart/questions.yaml | 13 ++++++++++++- chart/templates/default-setting.yaml | 1 + chart/values.yaml | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/chart/questions.yaml b/chart/questions.yaml index 1b23e4b..30a5182 100644 --- a/chart/questions.yaml +++ b/chart/questions.yaml @@ -340,6 +340,17 @@ Disabling **Backupstore Poll Interval** also means to disable failed backup auto type: int min: 0 default: 1440 + - variable: defaultSettings.restoreVolumeRecurringJobs + label: Restore Volume Recurring Jobs + description: "Restore recurring jobs from the backup volume on the backup target and create recurring jobs if not exist during a backup restoration. +Longhorn also supports individual volume setting. The setting can be specified on Backup page when making a backup restoration, this overrules the global setting. +The available volume setting options are: +- **ignored**. This is the default option that instructs Longhorn to inherit from the global setting. +- **enabled**. This option instructs Longhorn to restore recurring jobs/groups from the backup target forcibly. +- **disabled**. This option instructs Longhorn no restoring recurring jobs/groups should be done." + group: "Longhorn Default Settings" + type: boolean + default: "false" - variable: defaultSettings.recurringSuccessfulJobsHistoryLimit label: Cronjob Successful Jobs History Limit description: "This setting specifies how many successful backup or snapshot job histories should be retained. History will not be retained if the value is 0.", @@ -561,7 +572,7 @@ WARNING: - variable: defaultSettings.deletingConfirmationFlag label: Deleting Confirmation Flag description: "This flag is designed to prevent Longhorn from being accidentally uninstalled which will lead to data lost. - Set this flag to **true** to allow Longhorn uninstallation. + Set this flag to **true** to allow Longhorn uninstallation. If this flag **false**, Longhorn uninstallation job will fail. " group: "Longhorn Default Settings" type: boolean diff --git a/chart/templates/default-setting.yaml b/chart/templates/default-setting.yaml index f9202e9..9534991 100644 --- a/chart/templates/default-setting.yaml +++ b/chart/templates/default-setting.yaml @@ -21,6 +21,7 @@ data: {{ if not (kindIs "invalid" .Values.defaultSettings.defaultLonghornStaticStorageClass) }}default-longhorn-static-storage-class: {{ .Values.defaultSettings.defaultLonghornStaticStorageClass }}{{ end }} {{ if not (kindIs "invalid" .Values.defaultSettings.backupstorePollInterval) }}backupstore-poll-interval: {{ .Values.defaultSettings.backupstorePollInterval }}{{ end }} {{ if not (kindIs "invalid" .Values.defaultSettings.failedBackupTTL) }}failed-backup-ttl: {{ .Values.defaultSettings.failedBackupTTL }}{{ end }} + {{ if not (kindIs "invalid" .Values.defaultSettings.restoreVolumeRecurringJobs) }}restore-volume-recurring-jobs: {{ .Values.defaultSettings.restoreVolumeRecurringJobs }}{{ end }} {{ if not (kindIs "invalid" .Values.defaultSettings.recurringSuccessfulJobsHistoryLimit) }}recurring-successful-jobs-history-limit: {{ .Values.defaultSettings.recurringSuccessfulJobsHistoryLimit }}{{ end }} {{ if not (kindIs "invalid" .Values.defaultSettings.recurringFailedJobsHistoryLimit) }}recurring-failed-jobs-history-limit: {{ .Values.defaultSettings.recurringFailedJobsHistoryLimit }}{{ end }} {{ if not (kindIs "invalid" .Values.defaultSettings.supportBundleFailedHistoryLimit) }}support-bundle-failed-history-limit: {{ .Values.defaultSettings.supportBundleFailedHistoryLimit }}{{ end }} diff --git a/chart/values.yaml b/chart/values.yaml index 24d5dd5..d1dd439 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -116,6 +116,7 @@ defaultSettings: defaultLonghornStaticStorageClass: ~ backupstorePollInterval: ~ failedBackupTTL: ~ + restoreVolumeRecurringJobs: ~ recurringSuccessfulJobsHistoryLimit: ~ recurringFailedJobsHistoryLimit: ~ supportBundleFailedHistoryLimit: ~