From 985634be7fb5d5f43750da25cc93a3e0c60a36e2 Mon Sep 17 00:00:00 2001 From: Phan Le Date: Thu, 1 Jun 2023 16:43:09 -0700 Subject: [PATCH] Remove deprecated allow-node-drain-with-last-healthy-replica setting longhorn-5620 Signed-off-by: Phan Le --- chart/questions.yaml | 7 ------- chart/templates/default-setting.yaml | 1 - chart/values.yaml | 1 - 3 files changed, 9 deletions(-) diff --git a/chart/questions.yaml b/chart/questions.yaml index 786e66e..d9ca0a4 100644 --- a/chart/questions.yaml +++ b/chart/questions.yaml @@ -439,13 +439,6 @@ If disabled, Longhorn will not delete the workload pod that is managed by a cont - "delete-deployment-pod" - "delete-both-statefulset-and-deployment-pod" default: "do-nothing" - - variable: defaultSettings.allowNodeDrainWithLastHealthyReplica - label: Allow Node Drain with the Last Healthy Replica - description: "By default, Longhorn will block `kubectl drain` action on a node if the node contains the last healthy replica of a volume. -If this setting is enabled, Longhorn will **not** block `kubectl drain` action on a node even if the node contains the last healthy replica of a volume." - group: "Longhorn Default Settings" - type: boolean - default: "false" - variable: defaultSettings.nodeDrainPolicy label: Node Drain Policy description: "Define the policy to use when a node with the last healthy replica of a volume is drained. diff --git a/chart/templates/default-setting.yaml b/chart/templates/default-setting.yaml index a4a2828..1abe72d 100644 --- a/chart/templates/default-setting.yaml +++ b/chart/templates/default-setting.yaml @@ -51,7 +51,6 @@ data: {{ if not (kindIs "invalid" .Values.defaultSettings.disableSchedulingOnCordonedNode) }}disable-scheduling-on-cordoned-node: {{ .Values.defaultSettings.disableSchedulingOnCordonedNode }}{{ end }} {{ if not (kindIs "invalid" .Values.defaultSettings.replicaZoneSoftAntiAffinity) }}replica-zone-soft-anti-affinity: {{ .Values.defaultSettings.replicaZoneSoftAntiAffinity }}{{ end }} {{ if not (kindIs "invalid" .Values.defaultSettings.nodeDownPodDeletionPolicy) }}node-down-pod-deletion-policy: {{ .Values.defaultSettings.nodeDownPodDeletionPolicy }}{{ end }} - {{ if not (kindIs "invalid" .Values.defaultSettings.allowNodeDrainWithLastHealthyReplica) }}allow-node-drain-with-last-healthy-replica: {{ .Values.defaultSettings.allowNodeDrainWithLastHealthyReplica }}{{ end }} {{ if not (kindIs "invalid" .Values.defaultSettings.nodeDrainPolicy) }}node-drain-policy: {{ .Values.defaultSettings.nodeDrainPolicy }}{{ end }} {{ if not (kindIs "invalid" .Values.defaultSettings.replicaReplenishmentWaitInterval) }}replica-replenishment-wait-interval: {{ .Values.defaultSettings.replicaReplenishmentWaitInterval }}{{ end }} {{ if not (kindIs "invalid" .Values.defaultSettings.concurrentReplicaRebuildPerNodeLimit) }}concurrent-replica-rebuild-per-node-limit: {{ .Values.defaultSettings.concurrentReplicaRebuildPerNodeLimit }}{{ end }} diff --git a/chart/values.yaml b/chart/values.yaml index 5cd3046..bd716aa 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -137,7 +137,6 @@ defaultSettings: disableSchedulingOnCordonedNode: ~ replicaZoneSoftAntiAffinity: ~ nodeDownPodDeletionPolicy: ~ - allowNodeDrainWithLastHealthyReplica: ~ nodeDrainPolicy : ~ replicaReplenishmentWaitInterval: ~ concurrentReplicaRebuildPerNodeLimit: ~