From b84e9603774e80e7186a4c785f543db2a72556d0 Mon Sep 17 00:00:00 2001 From: Shuo Wu Date: Wed, 7 Jul 2021 17:26:04 +0800 Subject: [PATCH] chart: Remove deprecated setting 'Volume Attachment Recovery Policy' Signed-off-by: Shuo Wu --- chart/questions.yml | 10 ---------- chart/templates/default-setting.yaml | 1 - chart/values.yaml | 1 - 3 files changed, 12 deletions(-) diff --git a/chart/questions.yml b/chart/questions.yml index a925510..78b5a77 100644 --- a/chart/questions.yml +++ b/chart/questions.yml @@ -330,16 +330,6 @@ If disabled, Longhorn will not delete the workload pod that is managed by a cont group: "Longhorn Default Settings" type: boolean default: "true" - - variable: defaultSettings.volumeAttachmentRecoveryPolicy - label: Volume Attachment Recovery Policy - description: "Defines the Longhorn action when a Volume is stuck with a Deployment Pod on a failed node. `wait` leads to the deletion of the volume attachment as soon as the pods deletion time has passed. `never` is the default Kubernetes behavior of never deleting volume attachments on terminating pods. `immediate` leads to the deletion of the volume attachment as soon as all workload pods are pending. By default wait." - group: "Longhorn Default Settings" - type: enum - options: - - "wait" - - "never" - - "immediate" - default: "wait" - variable: defaultSettings.nodeDownPodDeletionPolicy label: Pod Deletion Policy When Node is Down description: "Defines the Longhorn action when a Volume is stuck with a StatefulSet/Deployment Pod on a node that is down. diff --git a/chart/templates/default-setting.yaml b/chart/templates/default-setting.yaml index e1f0c7a..da4c2c1 100644 --- a/chart/templates/default-setting.yaml +++ b/chart/templates/default-setting.yaml @@ -27,7 +27,6 @@ data: auto-delete-pod-when-volume-detached-unexpectedly: {{ .Values.defaultSettings.autoDeletePodWhenVolumeDetachedUnexpectedly }} disable-scheduling-on-cordoned-node: {{ .Values.defaultSettings.disableSchedulingOnCordonedNode }} replica-zone-soft-anti-affinity: {{ .Values.defaultSettings.replicaZoneSoftAntiAffinity }} - volume-attachment-recovery-policy: {{ .Values.defaultSettings.volumeAttachmentRecoveryPolicy }} node-down-pod-deletion-policy: {{ .Values.defaultSettings.nodeDownPodDeletionPolicy }} allow-node-drain-with-last-healthy-replica: {{ .Values.defaultSettings.allowNodeDrainWithLastHealthyReplica }} mkfs-ext4-parameters: {{ .Values.defaultSettings.mkfsExt4Parameters }} diff --git a/chart/values.yaml b/chart/values.yaml index 20380a4..74c944c 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -88,7 +88,6 @@ defaultSettings: autoDeletePodWhenVolumeDetachedUnexpectedly: ~ disableSchedulingOnCordonedNode: ~ replicaZoneSoftAntiAffinity: ~ - volumeAttachmentRecoveryPolicy: ~ nodeDownPodDeletionPolicy: ~ allowNodeDrainWithLastHealthyReplica: ~ mkfsExt4Parameters: ~