From f94d4cc9de6dc0d7e5029614faee5966deb0ffe8 Mon Sep 17 00:00:00 2001 From: Chin-Ya Huang Date: Mon, 16 May 2022 22:59:25 +0800 Subject: [PATCH] storage-network: update chart Longhorn-2285 Signed-off-by: Chin-Ya Huang --- chart/questions.yaml | 11 +++++++++++ chart/templates/crds.yaml | 6 ++++++ chart/templates/default-setting.yaml | 1 + chart/values.yaml | 1 + 4 files changed, 19 insertions(+) diff --git a/chart/questions.yaml b/chart/questions.yaml index a370eb0..a38fe78 100644 --- a/chart/questions.yaml +++ b/chart/questions.yaml @@ -514,6 +514,17 @@ WARNING: group: "Longhorn Default Settings" type: boolean default: false +- variable: defaultSettings.storageNetwork + label: Storage Network + description: "Longhorn uses the storage network for in-cluster data traffic. Leave this blank to use the Kubernetes cluster network. + To segregate the storage network, input the pre-existing NetworkAttachmentDefinition in \"/\" format. + 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. + - When applying the setting, Longhorn will restart all manager, instance-manager, and backing-image-manager pods." + group: "Longhorn Default Settings" + type: string + default: - variable: persistence.defaultClass default: "true" description: "Set as default StorageClass for Longhorn" diff --git a/chart/templates/crds.yaml b/chart/templates/crds.yaml index fa6cd51..b17cfa5 100644 --- a/chart/templates/crds.yaml +++ b/chart/templates/crds.yaml @@ -317,6 +317,8 @@ spec: type: string ownerID: type: string + storageIP: + type: string type: object type: object served: true @@ -1510,6 +1512,8 @@ spec: type: string started: type: boolean + storageIP: + type: string type: object type: object served: true @@ -2345,6 +2349,8 @@ spec: type: boolean started: type: boolean + storageIP: + type: string type: object type: object served: true diff --git a/chart/templates/default-setting.yaml b/chart/templates/default-setting.yaml index cc40111..91bab9e 100644 --- a/chart/templates/default-setting.yaml +++ b/chart/templates/default-setting.yaml @@ -44,3 +44,4 @@ data: guaranteed-replica-manager-cpu: {{ .Values.defaultSettings.guaranteedReplicaManagerCPU }} kubernetes-cluster-autoscaler-enabled: {{ .Values.defaultSettings.kubernetesClusterAutoscalerEnabled }} orphan-auto-deletion: {{ .Values.defaultSettings.orphanAutoDeletion }} + storage-network: {{ .Values.defaultSettings.storageNetwork }} diff --git a/chart/values.yaml b/chart/values.yaml index f0c09e8..df03d37 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -116,6 +116,7 @@ defaultSettings: guaranteedReplicaManagerCPU: ~ kubernetesClusterAutoscalerEnabled: ~ orphanAutoDeletion: ~ + storageNetwork: ~ privateRegistry: createSecret: ~ registryUrl: ~