From cdc6447b88fd0da1bb923c58d732d252ea4c627b Mon Sep 17 00:00:00 2001 From: Derek Su Date: Thu, 15 Jun 2023 09:22:56 +0800 Subject: [PATCH] Rename BackendStoreDrivers Longhorn 6126 Signed-off-by: Derek Su --- chart/questions.yaml | 16 ++++++++-------- chart/templates/crds.yaml | 12 ++++++------ chart/templates/default-setting.yaml | 2 +- chart/values.yaml | 2 +- deploy/longhorn.yaml | 12 ++++++------ ...recovery-backend-for-rwx-volume-nfs-server.md | 2 +- examples/spdk/storageclass.yaml | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/chart/questions.yaml b/chart/questions.yaml index 1f913eb..e375f44 100644 --- a/chart/questions.yaml +++ b/chart/questions.yaml @@ -685,20 +685,20 @@ Set the value to **0** to disable backup restore." type: int min: 1 default: 5 -- variable: defaultSettings.spdk - label: SPDK Data Engine - description: "This allows users to activate SPDK data engine. Currently, it is in the preview phase and should not be utilized in a production environment. +- variable: defaultSettings.v2DataEngine + label: V2 Data Engine + description: "This allows users to activate v2 data engine based on SPDK. Currently, it is in the preview phase and should not be utilized in a production environment. WARNING: - The cluster must have pre-existing Multus installed, and NetworkAttachmentDefinition IPs are reachable between nodes. - - DO NOT CHANGE THIS SETTING WITH ATTACHED VOLUMES. Longhorn will try to block this setting update when there are attached volumes. + - DO NOT CHANGE THIS SETTING WITH ATTACHED VOLUMES. Longhorn will block this setting update when there are attached volumes. - When applying the setting, Longhorn will restart all instance-manager pods." - group: "Longhorn SPDK Data Engine (Preview Feature) Settings" + group: "Longhorn V2 Data Engine (Preview Feature) Settings" type: boolean default: false -- variable: persistence.offlineReplicaRebuilding +- variable: defaultSettings.offlineReplicaRebuilding label: Offline Replica Rebuilding - description: ""This setting allows users to enable the offline replica rebuilding for volumes using SPDK data engine." - group: "Longhorn SPDK Data Engine (Preview Feature) Settings" + description: ""This setting allows users to enable the offline replica rebuilding for volumes using v2 data engine." + group: "Longhorn V2 Data Engine (Preview Feature) Settings" required: true type: enum options: diff --git a/chart/templates/crds.yaml b/chart/templates/crds.yaml index 91273c5..ac56efe 100644 --- a/chart/templates/crds.yaml +++ b/chart/templates/crds.yaml @@ -1316,8 +1316,8 @@ spec: type: boolean backendStoreDriver: enum: - - longhorn - - spdk + - v1 + - v2 type: string backupVolume: type: string @@ -2418,8 +2418,8 @@ spec: type: boolean backendStoreDriver: enum: - - longhorn - - spdk + - v1 + - v2 type: string backingImage: type: string @@ -3314,8 +3314,8 @@ spec: type: string backendStoreDriver: enum: - - longhorn - - spdk + - v1 + - v2 type: string backingImage: type: string diff --git a/chart/templates/default-setting.yaml b/chart/templates/default-setting.yaml index c55aad6..f6adb0f 100644 --- a/chart/templates/default-setting.yaml +++ b/chart/templates/default-setting.yaml @@ -79,5 +79,5 @@ data: {{ if not (kindIs "invalid" .Values.defaultSettings.backupCompressionMethod) }}backup-compression-method: {{ .Values.defaultSettings.backupCompressionMethod }}{{ end }} {{ if not (kindIs "invalid" .Values.defaultSettings.backupConcurrentLimit) }}backup-concurrent-limit: {{ .Values.defaultSettings.backupConcurrentLimit }}{{ end }} {{ if not (kindIs "invalid" .Values.defaultSettings.restoreConcurrentLimit) }}restore-concurrent-limit: {{ .Values.defaultSettings.restoreConcurrentLimit }}{{ end }} - {{ if not (kindIs "invalid" .Values.defaultSettings.spdk) }}spdk: {{ .Values.defaultSettings.spdk }}{{ end }} + {{ if not (kindIs "invalid" .Values.defaultSettings.v2DataEngine) }}v2-data-engine: {{ .Values.defaultSettings.v2DataEngine }}{{ end }} {{ if not (kindIs "invalid" .Values.defaultSettings.offlineReplicaRebuilding) }}offline-replica-rebuilding: {{ .Values.defaultSettings.offlineReplicaRebuilding }}{{ end }} diff --git a/chart/values.yaml b/chart/values.yaml index 0929fa6..642b00c 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -165,7 +165,7 @@ defaultSettings: backupCompressionMethod: ~ backupConcurrentLimit: ~ restoreConcurrentLimit: ~ - spdk: ~ + v2DataEngine: ~ offlineReplicaRebuilding: ~ privateRegistry: createSecret: ~ diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml index 2a5ece6..ec89979 100644 --- a/deploy/longhorn.yaml +++ b/deploy/longhorn.yaml @@ -1419,8 +1419,8 @@ spec: type: boolean backendStoreDriver: enum: - - longhorn - - spdk + - v1 + - v2 type: string backupVolume: type: string @@ -2538,8 +2538,8 @@ spec: type: boolean backendStoreDriver: enum: - - longhorn - - spdk + - v1 + - v2 type: string backingImage: type: string @@ -3462,8 +3462,8 @@ spec: type: string backendStoreDriver: enum: - - longhorn - - spdk + - v1 + - v2 type: string backingImage: type: string diff --git a/enhancements/20220727-dedicated-recovery-backend-for-rwx-volume-nfs-server.md b/enhancements/20220727-dedicated-recovery-backend-for-rwx-volume-nfs-server.md index 6b2e0aa..1177014 100644 --- a/enhancements/20220727-dedicated-recovery-backend-for-rwx-volume-nfs-server.md +++ b/enhancements/20220727-dedicated-recovery-backend-for-rwx-volume-nfs-server.md @@ -68,7 +68,7 @@ While the node where the share-manager pod is running is down, the share-manager │ │ HTTP API ┌─────────────┴──────────────┐ │ │ │ - │ │ endpint 1 │ endpoint N + │ │ endpoint 1 │ endpoint N ┌──────────────────────┐ │ ┌─────────▼────────┐ ┌────────▼─────────┐ │ share-manager pod │ │ │ recovery-backend │ │ recovery-backend │ │ │ │ │ pod │ │ pod │ diff --git a/examples/spdk/storageclass.yaml b/examples/spdk/storageclass.yaml index 2e199a4..b39db19 100644 --- a/examples/spdk/storageclass.yaml +++ b/examples/spdk/storageclass.yaml @@ -11,7 +11,7 @@ parameters: numberOfReplicas: "2" staleReplicaTimeout: "2880" fsType: "ext4" - backendStoreDriver: "spdk" + backendStoreDriver: "v2" # mkfsParams: "-I 256 -b 4096 -O ^metadata_csum,^64bit" # nodeSelector: "storage,fast" # recurringJobSelector: '[{"name":"snap-group", "isGroup":true},