🚧 Make workflows resources configurable (#8)

- volume size, memory request/limit, cpu request/limit - Close kintoproj/kinto-core#17
kintoproj · Mar 2, 2021 · 26aa240 · 26aa240
1 parent 16627a4
commit 26aa240
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 26 deletions.
diff --git a/kinto-build/.env-example b/kinto-build/.env-example
@@ -64,6 +64,9 @@ ARGO_WORKFLOW_CLI_IMAGE=kintohub/kinto-workflow-cli:latest
 # Argo workflow use an `emptyDir` ephemeral storage. Be careful setting up this limit since it's gonna use the node volume.
 ARGO_WORKFLOW_VOLUME_SIZE=1Gi
 
-# Resources limit for the main step
+# Resources for the main step
 ARGO_WORKFLOW_MEMORY_LIMIT=2Gi # must be > 2Gi
 ARGO_WORKFLOW_CPU_LIMIT=1 # must be > 500m
+ARGO_WORKFLOW_MEMORY_REQUEST=
+ARGO_WORKFLOW_CPU_REQUEST=
+
diff --git a/kinto-build/internal/build/argo/argo.go b/kinto-build/internal/build/argo/argo.go
@@ -76,8 +76,6 @@ func submitWorkflow(
 	exitHandlerNeeded bool,
 	templates []v1alpha1.Template) (string, *utilsGoServer.Error) {
 
-	volumeSize := resource.MustParse(config.ArgoWorkflowVolumeSize)
-
 	workflowObject := &v1alpha1.Workflow{
 		ObjectMeta: v1.ObjectMeta{
 			GenerateName: name,
@@ -108,14 +106,6 @@ func submitWorkflow(
 						},
 					},
 				},
-				{
-					Name: workflowVolumeName,
-					VolumeSource: corev1.VolumeSource{
-						EmptyDir: &corev1.EmptyDirVolumeSource{
-							SizeLimit: &volumeSize,
-						},
-					},
-				},
 			},
 			ServiceAccountName: config.ArgoWorkflowServiceAccount,
 			NodeSelector:       nil,
@@ -127,6 +117,21 @@ func submitWorkflow(
 		},
 	}
 
+	if config.ArgoWorkflowVolumeSize != "" {
+		volumeSize := resource.MustParse(config.ArgoWorkflowVolumeSize)
+
+		workflowObject.Spec.Volumes = append(
+			workflowObject.Spec.Volumes,
+			corev1.Volume{
+				Name: workflowVolumeName,
+				VolumeSource: corev1.VolumeSource{
+					EmptyDir: &corev1.EmptyDirVolumeSource{
+						SizeLimit: &volumeSize,
+					},
+				},
+			})
+	}
+
 	if exitHandlerNeeded {
 		workflowObject.Spec.OnExit = workflowOnExit
 	}

diff --git a/kinto-build/internal/build/argo/templates.go b/kinto-build/internal/build/argo/templates.go
@@ -127,22 +127,41 @@ func genMainWorkflowTemplate() v1alpha1.Template {
 					MountPath: "/kaniko/.docker",
 				},
 			},
-			Resources: corev1.ResourceRequirements{
-				Requests: corev1.ResourceList{
-					corev1.ResourceCPU:              resource.MustParse("500m"),
-					corev1.ResourceMemory:           resource.MustParse("2Gi"),
-					corev1.ResourceEphemeralStorage: resource.MustParse(config.ArgoWorkflowVolumeSize),
-				},
-				Limits: corev1.ResourceList{
-					corev1.ResourceCPU:              resource.MustParse(config.ArgoWorkflowCPULimit),
-					corev1.ResourceMemory:           resource.MustParse(config.ArgoWorkflowMemoryLimit),
-					corev1.ResourceEphemeralStorage: resource.MustParse(config.ArgoWorkflowVolumeSize),
-				},
-			},
+			Resources: genWorkflowResource(),
 		},
 	}
 }
 
+func genWorkflowResource() corev1.ResourceRequirements {
+	resources := corev1.ResourceRequirements{
+		Requests: corev1.ResourceList{},
+		Limits:   corev1.ResourceList{},
+	}
+
+	if config.ArgoWorkflowVolumeSize != "" {
+		resources.Requests[corev1.ResourceEphemeralStorage] = resource.MustParse(config.ArgoWorkflowVolumeSize)
+		resources.Limits[corev1.ResourceEphemeralStorage] = resource.MustParse(config.ArgoWorkflowVolumeSize)
+	}
+
+	if config.ArgoWorkflowMemoryRequest != "" {
+		resources.Requests[corev1.ResourceMemory] = resource.MustParse(config.ArgoWorkflowMemoryRequest)
+	}
+
+	if config.ArgoWorkflowCPURequest != "" {
+		resources.Requests[corev1.ResourceCPU] = resource.MustParse(config.ArgoWorkflowCPURequest)
+	}
+
+	if config.ArgoWorkflowMemoryLimit != "" {
+		resources.Limits[corev1.ResourceMemory] = resource.MustParse(config.ArgoWorkflowMemoryLimit)
+	}
+
+	if config.ArgoWorkflowCPULimit != "" {
+		resources.Limits[corev1.ResourceCPU] = resource.MustParse(config.ArgoWorkflowCPULimit)
+	}
+
+	return resources
+}
+
 func genBuildAndDeployWorkflow(
 	envId, blockName, releaseId, kintoCoreHost string,
 	buildConfig *types.BuildConfig,

diff --git a/kinto-build/internal/config/config.go b/kinto-build/internal/config/config.go
@@ -37,6 +37,8 @@ var (
 	ArgoWorkflowVolumeSize         string
 	ArgoWorkflowMemoryLimit        string
 	ArgoWorkflowCPULimit           string
+	ArgoWorkflowMemoryRequest      string
+	ArgoWorkflowCPURequest         string
 )
 
 func LoadConfig() {
@@ -67,7 +69,9 @@ func LoadConfig() {
 	ArgoWorkflowImagePullPolicy = config.GetString("ARGO_WORKFLOW_IMAGE_PULL_POLICY", "IfNotPresent")
 	ArgoWorkflowMainImage = config.GetStringOrDie("ARGO_WORKFLOW_MAIN_IMAGE")
 	ArgoWorkflowCliImage = config.GetStringOrDie("ARGO_WORKFLOW_CLI_IMAGE")
-	ArgoWorkflowVolumeSize = config.GetString("ARGO_WORKFLOW_VOLUME_SIZE", "1Gi")
-	ArgoWorkflowMemoryLimit = config.GetString("ARGO_WORKFLOW_MEMORY_LIMIT", "2Gi")
-	ArgoWorkflowCPULimit = config.GetString("ARGO_WORKFLOW_CPU_LIMIT", "1")
+	ArgoWorkflowVolumeSize = config.GetString("ARGO_WORKFLOW_VOLUME_SIZE", "")
+	ArgoWorkflowMemoryLimit = config.GetString("ARGO_WORKFLOW_MEMORY_LIMIT", "")
+	ArgoWorkflowCPULimit = config.GetString("ARGO_WORKFLOW_CPU_LIMIT", "")
+	ArgoWorkflowMemoryRequest = config.GetString("ARGO_WORKFLOW_MEMORY_REQUEST", "")
+	ArgoWorkflowCPURequest = config.GetString("ARGO_WORKFLOW_CPU_REQUEST", "")
 }