From 9948983b15f7d82af44a45917c270313668c3b2c Mon Sep 17 00:00:00 2001 From: Eric Weber Date: Wed, 16 Aug 2023 08:44:25 -0500 Subject: [PATCH] Add ReplicaDiskSoftAntiAffinity setting to upgrade responder Signed-off-by: Eric Weber --- deploy/upgrade_responder_server/README.md | 8 +++++--- deploy/upgrade_responder_server/chart-values.yaml | 7 +++++++ dev/upgrade-responder/install.sh | 9 ++++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/deploy/upgrade_responder_server/README.md b/deploy/upgrade_responder_server/README.md index 378bd26..7fed93a 100644 --- a/deploy/upgrade_responder_server/README.md +++ b/deploy/upgrade_responder_server/README.md @@ -1,5 +1,7 @@ -This directory contains the helm values for the Longhorn upgrade responder server. +# Upgrade Responder Helm Chart + +This directory contains the helm values for the Longhorn upgrade responder server. The values are in the file `./chart-values.yaml`. When you update the content of `./chart-values.yaml`, automation pipeline will update the Longhorn upgrade responder. - -The chart source chart is in `chart.yaml` \ No newline at end of file +Information about the source chart is in `chart.yaml`. +See [dev/upgrade-responder](../../dev/upgrade-responder/README.md) for manual deployment steps. diff --git a/deploy/upgrade_responder_server/chart-values.yaml b/deploy/upgrade_responder_server/chart-values.yaml index fdc2e9a..5985372 100644 --- a/deploy/upgrade_responder_server/chart-values.yaml +++ b/deploy/upgrade_responder_server/chart-values.yaml @@ -171,6 +171,10 @@ configMap: "dataType": "string", "maxLen": 200 }, + "longhornSettingReplicaDiskSoftAntiAffinity": { + "dataType": "string", + "maxLen": 200 + } "longhornSettingRestoreVolumeRecurringJobs": { "dataType": "string", "maxLen": 200 @@ -348,6 +352,9 @@ configMap: "longhornVolumeReplicaZoneSoftAntiAffinityTrueCount": { "dataType": "float" }, + "longhornVolumeReplicaDiskSoftAntiAffinityTrueCount": { + "dataType": "float" + }, "longhornVolumeRestoreVolumeRecurringJobFalseCount": { "dataType": "float" }, diff --git a/dev/upgrade-responder/install.sh b/dev/upgrade-responder/install.sh index 23eee87..0b5fa9e 100755 --- a/dev/upgrade-responder/install.sh +++ b/dev/upgrade-responder/install.sh @@ -14,7 +14,7 @@ DEPLOYMENT_TIMEOUT_SEC=300 DEPLOYMENT_WAIT_INTERVAL_SEC=5 temp_dir=$(mktemp -d) -trap 'rm -r "${temp_dir}"' EXIT +trap 'rm -rf "${temp_dir}"' EXIT # -f because packed Git files (.pack, .idx) are write protected. cp -a ./* ${temp_dir} cd ${temp_dir} @@ -188,6 +188,10 @@ configMap: "dataType": "string", "maxLen": 200 }, + "longhornSettingReplicaDiskSoftAntiAffinity": { + "dataType": "string", + "maxLen": 200 + }, "longhornSettingRestoreVolumeRecurringJobs": { "dataType": "string", "maxLen": 200 @@ -365,6 +369,9 @@ configMap: "longhornVolumeReplicaZoneSoftAntiAffinityTrueCount": { "dataType": "float" }, + "longhornVolumeReplicaDiskSoftAntiAffinityTrueCount": { + "dataType": "float" + }, "longhornVolumeRestoreVolumeRecurringJobFalseCount": { "dataType": "float" },