fix: update resoure request and limits across containers

Signed-off-by: Santosh Pillai <[email protected]>
openshift · Jun 17, 2022 · d9b5022 · d9b5022
1 parent 0c398aa
commit d9b5022
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 19 deletions.
diff --git a/controllers/defaults.go b/controllers/defaults.go
@@ -70,25 +70,41 @@ var (
 
 	// CSI Controller resource requests/limits
 	// TODO: Reduce these values and reach optimistic values without effecting performance
-	TopolvmControllerMemRequest = "250Mi"
-	TopolvmControllerMemLimit   = "250Mi"
-	TopolvmControllerCPURequest = "250m"
-	TopolvmControllerCPULimit   = "250m"
+	TopolvmControllerMemRequest = "100Mi"
+	TopolvmControllerMemLimit   = "150Mi"
+	TopolvmControllerCPURequest = "100m"
+	TopolvmControllerCPULimit   = "100m"
 
-	TopolvmCsiProvisionerMemRequest = "100Mi"
+	TopolvmCsiProvisionerMemRequest = "50Mi"
 	TopolvmCsiProvisionerMemLimit   = "100Mi"
-	TopolvmCsiProvisionerCPURequest = "100m"
-	TopolvmCsiProvisionerCPULimit   = "100m"
+	TopolvmCsiProvisionerCPURequest = "30m"
+	TopolvmCsiProvisionerCPULimit   = "50m"
 
-	TopolvmCsiResizerMemRequest = "100Mi"
+	TopolvmCsiResizerMemRequest = "50Mi"
 	TopolvmCsiResizerMemLimit   = "100Mi"
-	TopolvmCsiResizerCPURequest = "100m"
-	TopolvmCsiResizerCPULimit   = "100m"
+	TopolvmCsiResizerCPURequest = "20m"
+	TopolvmCsiResizerCPULimit   = "50m"
 
-	TopolvmCsiSnapshotterMemRequest = "100Mi"
+	TopolvmCsiSnapshotterMemRequest = "50Mi"
 	TopolvmCsiSnapshotterMemLimit   = "100Mi"
-	TopolvmCsiSnapshotterCPURequest = "100m"
-	TopolvmCsiSnapshotterCPULimit   = "100m"
+	TopolvmCsiSnapshotterCPURequest = "20m"
+	TopolvmCsiSnapshotterCPULimit   = "50m"
+
+	VgManagerMemRequest = "50Mi"
+	VgManagerMemLimit   = "100Mi"
+	VgManagerCPURequest = "30m"
+	VgManagerCPULimit   = "50m"
+
+	// topoLVM Node resource requests/limits
+	TopolvmNodeMemRequest = "100Mi"
+	TopolvmNodeMemLimit   = "150Mi"
+	TopolvmNodeCPURequest = "50m"
+	TopolvmNodeCPULimit   = "100m"
+
+	CSIRegistrarMemRequest = "30Mi"
+	CSIRegistrarMemLimit   = "50Mi"
+	CSIRegistrarCPURequest = "20m"
+	CSIRegistrarCPULimit   = "30m"
 
 	// CSI Provisioner requires below environment values to make use of CSIStorageCapacity
 	PodNameEnv   = "POD_NAME"
@@ -102,12 +118,6 @@ var (
 	TopolvmNodeContainerHealthzName = "healthz"
 	LvmdConfigFile                  = "/etc/topolvm/lvmd.yaml"
 
-	// topoLVM Node resource requests/limits
-	TopolvmNodeMemRequest = "250Mi"
-	TopolvmNodeMemLimit   = "250Mi"
-	TopolvmNodeCPURequest = "250m"
-	TopolvmNodeCPULimit   = "250m"
-
 	DefaultCSISocket  = "/run/topolvm/csi-topolvm.sock"
 	DefaultLVMdSocket = "/run/lvmd/lvmd.sock"
 	DeviceClassKey    = "topolvm.cybozu.com/device-class"

diff --git a/controllers/topolvm_node.go b/controllers/topolvm_node.go
@@ -354,12 +354,24 @@ func getCsiRegistrarContainer() *corev1.Container {
 		"rm -rf /registration/topolvm.cybozu.com /registration/topolvm.cybozu.com-reg.sock",
 	}
 
+	requirements := corev1.ResourceRequirements{
+		Limits: corev1.ResourceList{
+			corev1.ResourceCPU:    resource.MustParse(CSIRegistrarCPULimit),
+			corev1.ResourceMemory: resource.MustParse(CSIRegistrarMemLimit),
+		},
+		Requests: corev1.ResourceList{
+			corev1.ResourceCPU:    resource.MustParse(CSIRegistrarCPURequest),
+			corev1.ResourceMemory: resource.MustParse(CSIRegistrarMemRequest),
+		},
+	}
+
 	csiRegistrar := &corev1.Container{
 		Name:         "csi-registrar",
 		Image:        CsiRegistrarImage,
 		Args:         args,
 		Lifecycle:    &corev1.Lifecycle{PreStop: &corev1.LifecycleHandler{Exec: &corev1.ExecAction{Command: preStopCmd}}},
 		VolumeMounts: volumeMounts,
+		Resources:    requirements,
 	}
 	return csiRegistrar
 }

diff --git a/controllers/vgmanager_daemonset.go b/controllers/vgmanager_daemonset.go
@@ -22,6 +22,7 @@ import (
 	lvmv1alpha1 "github.com/red-hat-storage/lvm-operator/api/v1alpha1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -132,6 +133,17 @@ func newVGManagerDaemonset(lvmCluster *lvmv1alpha1.LVMCluster, namespace string,
 	command := []string{
 		"/vgmanager",
 	}
+
+	resourceRequirements := corev1.ResourceRequirements{
+		Limits: corev1.ResourceList{
+			corev1.ResourceCPU:    resource.MustParse(VgManagerCPULimit),
+			corev1.ResourceMemory: resource.MustParse(VgManagerMemLimit),
+		},
+		Requests: corev1.ResourceList{
+			corev1.ResourceCPU:    resource.MustParse(VgManagerCPURequest),
+			corev1.ResourceMemory: resource.MustParse(VgManagerMemRequest),
+		},
+	}
 	containers := []corev1.Container{
 		{
 			Name:    VGManagerUnit,
@@ -142,6 +154,7 @@ func newVGManagerDaemonset(lvmCluster *lvmv1alpha1.LVMCluster, namespace string,
 				RunAsUser:  &zero,
 			},
 			VolumeMounts: volumeMounts,
+			Resources:    resourceRequirements,
 			Env: []corev1.EnvVar{
 				{
 					Name: "NODE_NAME",