Add support to configure MaxVolumesPerNode for of csi node

Add support to configure MaxVolumesPerNode setting of csi node via the cos-csi-driver-configmap.
The configmap value will be synced to the CR
The node syncer will then update the MAX_VOLUMES_PER_NODE env var on the daemonset

Depends on IBM/ibm-object-csi-driver#173

Signed-off-by: Benjamin Isinger <[email protected]>

Author: isibeni

api/v1alpha1/ibmobjectcsi_types.go

@@ -69,6 +69,9 @@ type IBMObjectCSINodeSpec struct {
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
 
 	Resources ResourcesSpec `json:"resources,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	MaxVolumesPerNode string `json:"maxVolumesPerNode,omitempty"`
 }
 
 // IBMObjectCSIControllerSpec defines the desired state of IBMObjectCSIController

controllers/ibmobjectcsi_controller.go

@@ -222,10 +222,15 @@ func (r *IBMObjectCSIReconciler) handleConfigMapReconcile(ctx context.Context, r
 	CSINodeMemoryRequest := configMap.Data["CSINodeMemoryRequest"]
 	CSINodeCPULimit := configMap.Data["CSINodeCPULimit"]
 	CSINodeMemoryLimit := configMap.Data["CSINodeMemoryLimit"]
+	CSINodeMaxVolumesPerNode := configMap.Data["CSINodeMaxVolumesPerNode"]
 
-	reqLogger.Info("The resource requests and limits fetched from configmap",
-		"CSINodeCPURequest", CSINodeCPURequest, "CSINodeMemoryRequest", CSINodeMemoryRequest,
-		"CSINodeCPULimit", CSINodeCPULimit, "CSINodeMemoryLimit", CSINodeMemoryLimit)
+	reqLogger.Info("Configruration fetched from configmap",
+		"CSINodeCPURequest", CSINodeCPURequest,
+		"CSINodeMemoryRequest", CSINodeMemoryRequest,
+		"CSINodeCPULimit", CSINodeCPULimit,
+		"CSINodeMemoryLimit", CSINodeMemoryLimit,
+		"CSINodeMaxVolumesPerNode", CSINodeMaxVolumesPerNode,
+	)
 
 	// Fetch the IBMObjectCSI instance
 	instance := &objectdriverv1alpha1.IBMObjectCSI{}
@@ -245,9 +250,10 @@ func (r *IBMObjectCSIReconciler) handleConfigMapReconcile(ctx context.Context, r
 	instance.Spec.Node.Resources.Requests.Memory = CSINodeMemoryRequest
 	instance.Spec.Node.Resources.Limits.CPU = CSINodeCPULimit
 	instance.Spec.Node.Resources.Limits.Memory = CSINodeMemoryLimit
+	instance.Spec.Node.MaxVolumesPerNode = CSINodeMaxVolumesPerNode
 
 	// Update the instance in the Kubernetes API server
-	reqLogger.Info("Updating IBMObjectCSI CR with resource requests and limits for Node pods")
+	reqLogger.Info("Updating IBMObjectCSI CR with ConfigMap values")
 	err = r.Update(ctx, instance)
 	if err != nil {
 		reqLogger.Error(err, "Failed to update IBMObjectCSI instance with ConfigMap values")

controllers/syncer/csi_node.go

@@ -212,14 +212,23 @@ func envVarFromField(name, fieldPath string) corev1.EnvVar {
 func (s *csiNodeSyncer) getEnvFor(name string) []corev1.EnvVar {
 	switch name {
 	case constants.NodeContainerName:
-		return []corev1.EnvVar{
+		envVars := []corev1.EnvVar{
 			{
 				Name:  "CSI_ENDPOINT",
 				Value: constants.CSINodeEndpoint,
 			},
 			envVarFromField("KUBE_NODE_NAME", "spec.nodeName"),
 		}
 
+		if s.driver.Spec.Node.MaxVolumesPerNode != "" {
+			envVars = append(envVars, corev1.EnvVar{
+				Name:  "MAX_VOLUMES_PER_NODE",
+				Value: s.driver.Spec.Node.MaxVolumesPerNode,
+			})
+		}
+
+		return envVars
+
 	case constants.CSINodeDriverRegistrar:
 		return []corev1.EnvVar{
 			{