From 951e7d124e6271cecb751709e3819479267df78e Mon Sep 17 00:00:00 2001 From: CodeRusher Date: Mon, 27 Nov 2023 10:43:31 +0800 Subject: [PATCH 1/3] fix: add Values.storageClass.enabled Signed-off-by: CodeRusher --- charts/curve-csi/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/curve-csi/values.yaml b/charts/curve-csi/values.yaml index 874d921..22ec330 100644 --- a/charts/curve-csi/values.yaml +++ b/charts/curve-csi/values.yaml @@ -68,3 +68,6 @@ controllerplugin: tolerations: [] affinity: {} + +storageClass: + enable: false \ No newline at end of file From 1c6c10808dac1417acb781573e818636bd9e2c5f Mon Sep 17 00:00:00 2001 From: CodeRusher Date: Mon, 27 Nov 2023 10:54:06 +0800 Subject: [PATCH 2/3] add helm config for curve cluster Signed-off-by: CodeRusher --- charts/curve-csi/templates/csi-daemonset.yaml | 2 +- charts/curve-csi/templates/csi-deployment.yaml | 4 ++-- charts/curve-csi/values.yaml | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/charts/curve-csi/templates/csi-daemonset.yaml b/charts/curve-csi/templates/csi-daemonset.yaml index 2828a5a..2508015 100644 --- a/charts/curve-csi/templates/csi-daemonset.yaml +++ b/charts/curve-csi/templates/csi-daemonset.yaml @@ -79,7 +79,7 @@ spec: - name: CSI_ENDPOINT value: unix:///csi/csi.sock - name: MDSADDR - value: 10.0.0.1:6700,10.0.0.2:6700,10.0.0.3:6700 + value: {{ .Values.curve.mdsAddr }} resources: {{ toYaml .Values.nodeplugin.plugin.resources | indent 10 }} volumeMounts: diff --git a/charts/curve-csi/templates/csi-deployment.yaml b/charts/curve-csi/templates/csi-deployment.yaml index 48acd7b..ec46b59 100644 --- a/charts/curve-csi/templates/csi-deployment.yaml +++ b/charts/curve-csi/templates/csi-deployment.yaml @@ -116,7 +116,7 @@ spec: - --endpoint=$(CSI_ENDPOINT) - --drivername=curve.csi.netease.com - --nodeid=$(NODE_ID) - - --snapshot-server={{ .Values.controllerplugin.snapshotServer }} + - --snapshot-server={{ .Values.curve.snapshotServer }} {{- if .Values.controllerplugin.debug.enabled }} - "--debug-port={{ .Values.controllerplugin.debug.port }}" {{- end }} @@ -142,7 +142,7 @@ spec: - name: CSI_ENDPOINT value: unix:///csi/csi-provisioner.sock - name: MDSADDR - value: 10.0.0.1:6700,10.0.0.2:6700,10.0.0.3:6700 + value: {{ .Values.curve.mdsAddr }} resources: {{ toYaml .Values.controllerplugin.plugin.resources | indent 10 }} volumeMounts: diff --git a/charts/curve-csi/values.yaml b/charts/curve-csi/values.yaml index 22ec330..48845d5 100644 --- a/charts/curve-csi/values.yaml +++ b/charts/curve-csi/values.yaml @@ -1,3 +1,7 @@ +curve: + mdsAddr: + snapshotServer: + # node plugin variables nodeplugin: debug: @@ -28,8 +32,6 @@ nodeplugin: controllerplugin: replicas: 2 - snapshotServer: http://127.0.0.1:5555 - debug: enabled: true port: 9696 From e144e91a17e2df7b5037a29248ad4461af359ed2 Mon Sep 17 00:00:00 2001 From: CodeRusher Date: Mon, 27 Nov 2023 10:56:11 +0800 Subject: [PATCH 3/3] upgrade helm image version(curvecsi/curve-csi:v3.0.1) Signed-off-by: CodeRusher --- charts/curve-csi/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/curve-csi/values.yaml b/charts/curve-csi/values.yaml index 48845d5..d1e74f7 100644 --- a/charts/curve-csi/values.yaml +++ b/charts/curve-csi/values.yaml @@ -13,7 +13,7 @@ nodeplugin: hostDir: /var/log/curve-csi-node plugin: - image: curvecsi/curve-csi:v3.0.0 + image: curvecsi/curve-csi:v3.0.1 # add resources limit resources: {} @@ -41,7 +41,7 @@ controllerplugin: hostDir: /var/log/curve-csi-controller plugin: - image: curvecsi/curve-csi:v3.0.0 + image: curvecsi/curve-csi:v3.0.1 # add resources limit resources: {}