Merge pull request #32 from IBM/bha-cpumemlimits

configure resource reqs and limits via configMap

Author: Bhagyashreek8

config/rbac/role.yaml

@@ -12,6 +12,9 @@ rules:
   - create
   - delete
   - get
+  - list
+  - update
+  - watch
 - apiGroups:
   - ""
   resources:

config/samples/resource_req_limit_configmap.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cos-csi-driver-configmap
+  namespace: ibm-object-csi-operator
+data:
+  ReconcileStorageClasses: "true"
+  #Resource Requests per container
+  CSINodeCPURequest: "40m"                    #container:ibm-object-csi-node, resource-type: cpu-request
+  CSINodeMemoryRequest: "40Mi"                #container:ibm-object-csi-node, resource-type: memory-request
+
+  #Resource Limits per container
+  CSINodeCPULimit: "4"                         #container:ibm-object-csi-node, resource-type: cpu-limit
+  CSINodeMemoryLimit: "800Mi"                  #container:ibm-object-csi-node, resource-type: memory-limit

controllers/constants/constants.go

@@ -60,8 +60,6 @@ const (
 	HealthPortName   = "healthz"
 	HealthPortNumber = 9808
 
-	DriverPrefix = "ibm-object-csi"
-
 	CSIController                         = "controller"
 	CSINode                               = "node"
 	CSIControllerServiceAccount           = "controller-sa"
@@ -73,6 +71,10 @@ const (
 	CSINodeSCCClusterRole                 = "node-scc-clusterrole"
 	CSINodeSCCClusterRoleBinding          = "node-scc-clusterrolebinding"
 
+	ResourceReqLimitsConfigMap      = "cos-csi-driver-configmap"
+	ObjectCSIDriverOperatorDeployNS = "ibm-object-csi-operator"
+	ObjectCSIDriver                 = "ibm-object-csi"
+
 	StorageClassPrefix = "ibm-object-storage-"
 	StorageClassSuffix = "-sc"
 
@@ -94,5 +96,5 @@ var CommonCSIResourceLabels = map[string]string{
 
 // GetResourceName returns the name of a resource for a CSI driver
 func GetResourceName(name string) string {
-	return fmt.Sprintf("%s-%s", DriverPrefix, name)
+	return fmt.Sprintf("%s-%s", ObjectCSIDriver, name)
 }

controllers/ibmobjectcsi_controller.go

@@ -42,9 +42,13 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"sigs.k8s.io/controller-runtime/pkg/event"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
@@ -64,7 +68,7 @@ type IBMObjectCSIReconciler struct {
 //+kubebuilder:rbac:groups=objectdriver.csi.ibm.com,resources=ibmobjectcsis/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=objectdriver.csi.ibm.com,resources=ibmobjectcsis/finalizers,verbs=update
 //+kubebuilder:rbac:groups="",resources=pods,verbs=get;delete;list;watch
-//+kubebuilder:rbac:groups="",resources=configmaps,verbs=get;create;delete
+//+kubebuilder:rbac:groups="",resources=configmaps,verbs=get;create;delete;list;watch;update
 //+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
 //+kubebuilder:rbac:groups="",resources=persistentvolumeclaims,verbs=get;list;watch;update;patch
 //+kubebuilder:rbac:groups="",resources=persistentvolumeclaims/status,verbs=get;update;patch
@@ -99,6 +103,13 @@ func (r *IBMObjectCSIReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	reqLogger.Info("Reconciling IBMObjectCSI")
 	r.ControllerHelper.Log = csiLog
 
+	// Check if the reconcile was triggered by the ConfigMap events
+	if req.Name == constants.ResourceReqLimitsConfigMap {
+		reqLogger.Info("Reconcile triggered by ConfigMap event")
+		// Handle the update of IBMObjectCSI
+		return r.handleConfigMapReconcile(ctx, req)
+	}
+
 	// Fetch the CSIDriver instance
 	instance := crutils.New(&objectdriverv1alpha1.IBMObjectCSI{})
 	err := r.Get(ctx, req.NamespacedName, instance.Unwrap())
@@ -175,6 +186,66 @@ func (r *IBMObjectCSIReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	return reconcile.Result{}, nil
 }
 
+// handleConfigMapReconcile handles reconciliation triggered by the ConfigMap event
+func (r *IBMObjectCSIReconciler) handleConfigMapReconcile(ctx context.Context, req ctrl.Request) (reconcile.Result, error) {
+	reqLogger := csiLog.WithValues("Request.Namespace", req.Namespace, "Request.Name", req.Name)
+	reqLogger.Info("Handling Reconcile IBMObjectCSI for ConfigMap event")
+
+	// Fetch the ConfigMap instance
+	configMap := &corev1.ConfigMap{}
+	err := r.Get(ctx, req.NamespacedName, configMap)
+	if err != nil {
+		if errors.IsNotFound(err) {
+			reqLogger.Info("ConfigMap", req.Name, "not found in namespace", req.Namespace)
+			// what action should be taken when cm is not found?
+		} else {
+			reqLogger.Error(err, "Failed to get ConfigMap", req.Name)
+			// Error reading the object - requeue the request.
+			return reconcile.Result{}, err
+		}
+	}
+
+	//get values from configMap
+	CSINodeCPURequest := configMap.Data["CSINodeCPURequest"]
+	CSINodeMemoryRequest := configMap.Data["CSINodeMemoryRequest"]
+	CSINodeCPULimit := configMap.Data["CSINodeCPULimit"]
+	CSINodeMemoryLimit := configMap.Data["CSINodeMemoryLimit"]
+
+	reqLogger.Info("The resource requests and limits fetched from configmap",
+		"CSINodeCPURequest", CSINodeCPURequest, "CSINodeMemoryRequest", CSINodeMemoryRequest,
+		"CSINodeCPULimit", CSINodeCPULimit, "CSINodeMemoryLimit", CSINodeMemoryLimit)
+
+	// Fetch the IBMObjectCSI instance
+	instance := &objectdriverv1alpha1.IBMObjectCSI{}
+
+	err = r.Get(ctx, types.NamespacedName{
+		Namespace: constants.ObjectCSIDriverOperatorDeployNS,
+		Name:      constants.ObjectCSIDriver},
+		instance)
+	if err != nil {
+		reqLogger.Error(err, "Failed to get IBMObjectCSI instance")
+		return reconcile.Result{}, err
+	}
+	reqLogger.Info("IBMObjectCSI CR fetched successfully")
+
+	// Update the IBMObjectCSI instance with values from ConfigMap
+	instance.Spec.Node.Resources.Requests.CPU = CSINodeCPURequest
+	instance.Spec.Node.Resources.Requests.Memory = CSINodeMemoryRequest
+	instance.Spec.Node.Resources.Limits.CPU = CSINodeCPULimit
+	instance.Spec.Node.Resources.Limits.Memory = CSINodeMemoryLimit
+
+	// Update the instance in the Kubernetes API server
+	reqLogger.Info("Updating IBMObjectCSI CR with resource requests and limits for Node pods")
+	err = r.Update(ctx, instance)
+	if err != nil {
+		reqLogger.Error(err, "Failed to update IBMObjectCSI instance with ConfigMap values")
+		return reconcile.Result{}, err
+	}
+	reqLogger.Info("IBMObjectCSI CR is getting updated. Node pods will get restarted to reflect updated resource requests and limits")
+
+	return reconcile.Result{}, nil
+}
+
 func (r *IBMObjectCSIReconciler) updateStatus(instance *crutils.IBMObjectCSI, originalStatus objectdriverv1alpha1.IBMObjectCSIStatus) error {
 	logger := csiLog.WithName("updateStatus")
 
@@ -507,5 +578,35 @@ func (r *IBMObjectCSIReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&appsv1.Deployment{}).
 		Owns(&appsv1.DaemonSet{}).
 		Owns(&corev1.ServiceAccount{}).
+		Watches(&corev1.ConfigMap{}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(configMapPredicate())).
 		Complete(r)
 }
+
+func configMapPredicate() predicate.Predicate {
+	logger := csiLog.WithName("configMapPredicate")
+	triggerReconcile := predicate.Funcs{
+		CreateFunc: func(e event.CreateEvent) bool {
+			configmap := e.Object.(*corev1.ConfigMap)
+			if configmap.Name == constants.ResourceReqLimitsConfigMap {
+				logger.Info("Create detected on the configmap", "configmap", configmap.Name)
+				return true
+			}
+			return false
+		},
+		UpdateFunc: func(e event.UpdateEvent) bool {
+			configmap := e.ObjectNew.(*corev1.ConfigMap)
+			if configmap.Name == constants.ResourceReqLimitsConfigMap {
+				logger.Info("Update detected on the configmap", "configmap", configmap.Name)
+				return true
+			}
+			return false
+		},
+		DeleteFunc: func(event.DeleteEvent) bool {
+			return false
+		},
+		GenericFunc: func(event.GenericEvent) bool {
+			return false
+		},
+	}
+	return triggerReconcile
+}

controllers/ibmobjectcsi_controller_test.go

@@ -185,7 +185,7 @@ var (
 	csiDriver = &storagev1.CSIDriver{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   constants.DriverName,
-			Labels: map[string]string{"app.kubernetes.io/name": constants.DriverPrefix},
+			Labels: map[string]string{"app.kubernetes.io/name": constants.ObjectCSIDriver},
 		},
 		Spec: storagev1.CSIDriverSpec{
 			AttachRequired: util.False(),

controllers/internal/crutils/static_resource_generator.go

@@ -18,7 +18,7 @@ func (c *IBMObjectCSI) GenerateCSIDriver() *storagev1.CSIDriver {
 		ObjectMeta: metav1.ObjectMeta{
 			Name: constants.DriverName,
 			Labels: map[string]string{
-				"app.kubernetes.io/name":       constants.DriverPrefix,
+				"app.kubernetes.io/name":       constants.ObjectCSIDriver,
 				"app.kubernetes.io/part-of":    constants.CSIDriverName,
 				"app.kubernetes.io/managed-by": constants.CSIOperatorName,
 			},