Use different values for requests and limits of the up init container

Signed-off-by: Pablo Chico de Guzman <pchico83@gmail.com>
okteto · Dec 24, 2020 · 18f2f5c · 18f2f5c
1 parent 74a1f43
commit 18f2f5c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/pkg/k8s/deployments/translate.go b/pkg/k8s/deployments/translate.go
@@ -47,11 +47,14 @@ var (
 	devTerminationGracePeriodSeconds int64
 	falseBoolean                     = false
 
-	//OktetoUpInitContainerCPU cpu used by the up init container
-	OktetoUpInitContainerCPU = resource.MustParse("25m")
-
-	//OktetoUpInitContainerMemory memory used by the up init container
-	OktetoUpInitContainerMemory = resource.MustParse("25Mi")
+	//OktetoUpInitContainerRequestsCPU cpu requests used by the up init container
+	OktetoUpInitContainerRequestsCPU = resource.MustParse("10m")
+	//OktetoUpInitContainerRequestsMemory memory requests used by the up init container
+	OktetoUpInitContainerRequestsMemory = resource.MustParse("10Mi")
+	//OktetoUpInitContainerLimitsCPU cpu limits used by the up init container
+	OktetoUpInitContainerLimitsCPU = resource.MustParse("30m")
+	//OktetoUpInitContainerLimitsMemory limits requests used by the up init container
+	OktetoUpInitContainerLimitsMemory = resource.MustParse("30Mi")
 )
 
 func translate(t *model.Translation, c *kubernetes.Clientset, isOktetoNamespace bool) error {
@@ -454,12 +457,12 @@ func TranslateOktetoInitBinContainer(oktetoBinImageTag string, spec *apiv1.PodSp
 		},
 		Resources: apiv1.ResourceRequirements{
 			Requests: map[apiv1.ResourceName]resource.Quantity{
-				apiv1.ResourceCPU:    OktetoUpInitContainerCPU,
-				apiv1.ResourceMemory: OktetoUpInitContainerMemory,
+				apiv1.ResourceCPU:    OktetoUpInitContainerRequestsCPU,
+				apiv1.ResourceMemory: OktetoUpInitContainerRequestsMemory,
 			},
 			Limits: map[apiv1.ResourceName]resource.Quantity{
-				apiv1.ResourceCPU:    OktetoUpInitContainerCPU,
-				apiv1.ResourceMemory: OktetoUpInitContainerMemory,
+				apiv1.ResourceCPU:    OktetoUpInitContainerLimitsCPU,
+				apiv1.ResourceMemory: OktetoUpInitContainerLimitsMemory,
 			},
 		},
 	}

diff --git a/pkg/k8s/deployments/translate_test.go b/pkg/k8s/deployments/translate_test.go
@@ -199,12 +199,12 @@ services:
 							},
 							Resources: apiv1.ResourceRequirements{
 								Requests: map[apiv1.ResourceName]resource.Quantity{
-									apiv1.ResourceCPU:    OktetoUpInitContainerCPU,
-									apiv1.ResourceMemory: OktetoUpInitContainerMemory,
+									apiv1.ResourceCPU:    OktetoUpInitContainerRequestsCPU,
+									apiv1.ResourceMemory: OktetoUpInitContainerRequestsMemory,
 								},
 								Limits: map[apiv1.ResourceName]resource.Quantity{
-									apiv1.ResourceCPU:    OktetoUpInitContainerCPU,
-									apiv1.ResourceMemory: OktetoUpInitContainerMemory,
+									apiv1.ResourceCPU:    OktetoUpInitContainerLimitsCPU,
+									apiv1.ResourceMemory: OktetoUpInitContainerLimitsMemory,
 								},
 							},
 						},
@@ -533,12 +533,12 @@ persistentVolume:
 							},
 							Resources: apiv1.ResourceRequirements{
 								Requests: map[apiv1.ResourceName]resource.Quantity{
-									apiv1.ResourceCPU:    OktetoUpInitContainerCPU,
-									apiv1.ResourceMemory: OktetoUpInitContainerMemory,
+									apiv1.ResourceCPU:    OktetoUpInitContainerRequestsCPU,
+									apiv1.ResourceMemory: OktetoUpInitContainerRequestsMemory,
 								},
 								Limits: map[apiv1.ResourceName]resource.Quantity{
-									apiv1.ResourceCPU:    OktetoUpInitContainerCPU,
-									apiv1.ResourceMemory: OktetoUpInitContainerMemory,
+									apiv1.ResourceCPU:    OktetoUpInitContainerLimitsCPU,
+									apiv1.ResourceMemory: OktetoUpInitContainerLimitsMemory,
 								},
 							},
 						},