diff --git a/helm/templates/agent.yaml b/helm/templates/agent.yaml index 9b51c132..d752de77 100644 --- a/helm/templates/agent.yaml +++ b/helm/templates/agent.yaml @@ -144,7 +144,7 @@ spec: - name: ISSUE_MESSAGE_FILE value: "true" - name: MAX_VOLUMES_PERNODE - value: "{{ .Values.agent.max_volumes_pre_node }}" + value: "{{ .Values.agent.max_volumes_per_node }}" {{- if .Values.global.YodaSchedulerSvcIP }} - name: EXTENDER_SVC_IP value: "{{ .Values.global.YodaSchedulerSvcIP }}" diff --git a/helm/values-acka.yaml b/helm/values-acka.yaml index 1d9a006b..63956934 100644 --- a/helm/values-acka.yaml +++ b/helm/values-acka.yaml @@ -27,7 +27,7 @@ agent: volume_name_prefix: yoda spdk: false driverMode: node - max_volumes_pre_node: 256 + max_volumes_per_node: 256 extender: name: yoda-scheduler-extender # scheduling strategy: binpack/spread diff --git a/helm/values.yaml b/helm/values.yaml index 57db75dd..0a66ec9b 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -33,7 +33,7 @@ agent: # all: agent will start as csi controller and csi node # node: agent will start as csi node driverMode: node - max_volumes_pre_node: 256 + max_volumes_per_node: 256 extender: name: open-local-scheduler-extender # scheduling strategy: binpack/spread diff --git a/pkg/csi/nodeserver.go b/pkg/csi/nodeserver.go index d42a5b65..7d0d64a4 100644 --- a/pkg/csi/nodeserver.go +++ b/pkg/csi/nodeserver.go @@ -64,7 +64,7 @@ func newNodeServer(options *driverOptions) *nodeServer { if volumeNum != "" { num, err := strconv.ParseInt(volumeNum, 10, 64) if err != nil { - log.Fatalf("NewNodeServer: MAX_VOLUMES_PERNODE must be int64, but get: %s", volumeNum) + log.Fatalf("NewNodeServer: MAX_VOLUMES_PERNODE must be integer, but get: %s", volumeNum) } else { if num < 0 || num > int64(MaxVolumesPerNodeLimited) { log.Errorf("NewNodeServer: MAX_VOLUMES_PERNODE must between 0-%d, but get: %s", int64(MaxVolumesPerNodeLimited), volumeNum) diff --git a/pkg/csi/type.go b/pkg/csi/type.go index 798ffdd4..8a000ee4 100644 --- a/pkg/csi/type.go +++ b/pkg/csi/type.go @@ -56,9 +56,9 @@ const ( DirectTag = "direct" // StripingType striping type StripingType = "striping" - // DefaultMaxVolumesPerNode define default max volumes one node + // DefaultMaxVolumesPerNode define default max volumes per node DefaultMaxVolumesPerNode = 64 - // MaxVolumesPerNodeLimited define limit max volumes one node + // MaxVolumesPerNodeLimited define limit max volumes per node MaxVolumesPerNodeLimited = 1024 )