Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix helm nil pointer err and add add helm config for curve cluster #17

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/curve-csi/templates/csi-daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions charts/curve-csi/templates/csi-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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:
Expand Down
13 changes: 9 additions & 4 deletions charts/curve-csi/values.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
curve:
mdsAddr:
snapshotServer:

# node plugin variables
nodeplugin:
debug:
Expand All @@ -9,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: {}

Expand All @@ -28,8 +32,6 @@ nodeplugin:
controllerplugin:
replicas: 2

snapshotServer: http://127.0.0.1:5555

debug:
enabled: true
port: 9696
Expand All @@ -39,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: {}

Expand Down Expand Up @@ -68,3 +70,6 @@ controllerplugin:
tolerations: []

affinity: {}

storageClass:
enable: false