Operator can limit ephemeral disk used during staging

- these limits are set on the kpack image/build.
- `api.stagingRequirements.diskMB` from helm value is now considered as limits set by the platform operator.
- updates the description of `StagingDiskMB` in the CFBuild CRD to say its a "request" instead of "limit".

README.helm.md

@@ -43,7 +43,7 @@ Here are all the values that can be set for the chart:
     - `stack` (_String_): Stack.
     - `stagingRequirements`:
       - `buildCacheMB` (_Integer_): Persistent disk in MB for caching staging artifacts across builds.
-      - `diskMB` (_Integer_): Disk in MB for staging.
+      - `diskMB` (_Integer_): Ephemeral Disk limit in MB for staging apps.
       - `memoryMB` (_Integer_): Memory in MB for staging.
     - `type` (_String_): Lifecycle type (only `buildpack` accepted currently).
   - `replicas` (_Integer_): Number of replicas.

controllers/api/v1alpha1/cfbuild_types.go

@@ -30,7 +30,7 @@ type CFBuildSpec struct {
 
 	// The memory limit for the pod that will stage the image
 	StagingMemoryMB int `json:"stagingMemoryMB"`
-	// The disk limit for the pod that will stage the image
+	// The ephemeral-disk size request for the pod that will stage the image
 	StagingDiskMB int `json:"stagingDiskMB"`
 
 	// Specifies the buildpacks and stack for the build

controllers/config/config.go

@@ -42,6 +42,7 @@ type ControllerConfig struct {
 	ContainerRepositoryPrefix string `yaml:"containerRepositoryPrefix"`
 	ContainerRegistryType     string `yaml:"containerRegistryType"`
 	BuildCacheMB              int    `yaml:"buildCacheMB"`
+	DiskMB                    int    `yaml:"diskMB"`
 }
 
 type CFProcessDefaults struct {

controllers/config/config_test.go

@@ -46,6 +46,7 @@ var _ = Describe("LoadFromPath", func() {
 			LogLevel:                         zapcore.DebugLevel,
 			SpaceFinalizerAppDeletionTimeout: tools.PtrTo(int64(42)),
 			BuildCacheMB:                     1024,
+			DiskMB:                           512,
 		}
 	})
 
@@ -82,6 +83,7 @@ var _ = Describe("LoadFromPath", func() {
 			LogLevel:                         zapcore.DebugLevel,
 			SpaceFinalizerAppDeletionTimeout: tools.PtrTo(int64(42)),
 			BuildCacheMB:                     1024,
+			DiskMB:                           512,
 		}))
 	})
 

helm/korifi/controllers/configmap.yaml

@@ -39,6 +39,7 @@ data:
     containerRepositoryPrefix: {{ .Values.global.containerRepositoryPrefix | quote }}
     builderServiceAccount: kpack-service-account
     buildCacheMB: {{ .Values.api.lifecycle.stagingRequirements.buildCacheMB }}
+    diskMB: {{ .Values.api.lifecycle.stagingRequirements.diskMB }}
     {{- if .Values.global.eksContainerRegistryRoleARN }}
     containerRegistryType: "ECR"
     {{- end }}

helm/korifi/controllers/crds/korifi.cloudfoundry.org_cfbuilds.yaml

@@ -94,7 +94,8 @@ spec:
                 type: object
                 x-kubernetes-map-type: atomic
               stagingDiskMB:
-                description: The disk limit for the pod that will stage the image
+                description: The ephemeral-disk size request for the pod that will
+                  stage the image
                 type: integer
               stagingMemoryMB:
                 description: The memory limit for the pod that will stage the image

helm/korifi/values.schema.json

@@ -180,7 +180,7 @@
                   "type": "integer"
                 },
                 "diskMB": {
-                  "description": "Disk in MB for staging.",
+                  "description": "Ephemeral Disk limit in MB for staging apps.",
                   "type": "integer"
                 },
                 "buildCacheMB": {

kpack-image-builder/controllers/buildworkload_controller.go

@@ -702,6 +702,11 @@ func (r *BuildWorkloadReconciler) reconcileKpackImage(
 			Build: &buildv1alpha2.ImageBuild{
 				Services: buildWorkload.Spec.Services,
 				Env:      buildWorkload.Spec.Env,
+				Resources: corev1.ResourceRequirements{
+					Limits: corev1.ResourceList{
+						corev1.ResourceEphemeralStorage: *resource.NewScaledQuantity(int64(r.controllerConfig.DiskMB), resource.Mega),
+					},
+				},
 			},
 			Cache: &buildv1alpha2.ImageCacheConfig{
 				Volume: &buildv1alpha2.ImagePersistentVolumeCache{

kpack-image-builder/controllers/buildworkload_controller_test.go

@@ -162,6 +162,7 @@ var _ = Describe("BuildWorkloadReconciler", func() {
 					g.Expect(kpackImage.Spec.Source.Registry.ImagePullSecrets).To(BeEquivalentTo(source.Registry.ImagePullSecrets))
 					g.Expect(kpackImage.Spec.Build.Env).To(Equal(env))
 					g.Expect(kpackImage.Spec.Build.Services).To(BeEquivalentTo(services))
+					g.Expect(kpackImage.Spec.Build.Resources.Limits.StorageEphemeral().String()).To(Equal(fmt.Sprintf("%dM", 2048)))
 
 					g.Expect(kpackImage.Spec.Builder.Kind).To(Equal("ClusterBuilder"))
 					g.Expect(kpackImage.Spec.Builder.Name).To(Equal("cf-kpack-builder"))

kpack-image-builder/controllers/suite_test.go

@@ -128,6 +128,7 @@ var _ = BeforeSuite(func() {
 		ContainerRepositoryPrefix: "image/registry/tag",
 		BuilderServiceAccount:     "builder-service-account",
 		BuildCacheMB:              1024,
+		DiskMB:                    2048,
 	}
 
 	imageRepoCreator = new(fake.RepositoryCreator)