fix: calculate resolvedOfferings for sidecars (#2451)

Signed-off-by: Grant Linville <grant@acorn.io>

Author: g-linville

pkg/controller/resolvedofferings/computeclass.go

@@ -74,61 +74,71 @@ func resolveComputeClasses(req router.Request, cfg *apiv1.Config, appInstance *v
 
 func resolveComputeClass(req router.Request, appInstance *v1.AppInstance, configDefault *int64, defaultCC *adminv1.ProjectComputeClassInstance, defaultCCName string, containers map[string]v1.Container) error {
 	for name, container := range containers {
-		var cpuScaler *float64
-		ccName := ""
-
-		// First, get the compute class for the workload
-		cc, err := computeclasses.GetClassForWorkload(req.Ctx, req.Client, appInstance.Spec.ComputeClasses, container, name, appInstance.Namespace)
+		resolvedOfferings, err := resolveComputeClassForContainer(req, appInstance, configDefault, defaultCC, defaultCCName, name, container)
 		if err != nil {
 			return err
 		}
-		if cc == nil {
-			cc = defaultCC
-		}
-		if cc != nil {
-			ccName = cc.Name
-			cpuScaler = &cc.CPUScaler
-		} else {
-			ccName = defaultCCName
-		}
+		appInstance.Status.ResolvedOfferings.Containers[name] = resolvedOfferings
 
-		// Next, determine the memory request. This is the order of priority:
-		// 1. runtime-level overrides from the user (in app.Spec)
-		// 2. defaults in the acorn image
-		// 3. defaults from compute class
-		// 4. global default
-
-		memory := configDefault // set to global default first, then check the higher priority values
-
-		if appInstance.Spec.Memory[name] != nil { // runtime-level overrides from the user
-			memory = appInstance.Spec.Memory[name]
-		} else if appInstance.Spec.Memory[""] != nil { // runtime-level overrides from the user for all containers in the app
-			memory = appInstance.Spec.Memory[""]
-		} else if container.Memory != nil { // defaults in the acorn image
-			memory = container.Memory
-		} else if cc != nil { // defaults from compute class
-			parsedMemory, err := computeclasses.ParseComputeClassMemoryInternal(cc.Memory)
+		for sidecarName, sidecar := range container.Sidecars {
+			resolvedOfferingsSidecar, err := resolveComputeClassForContainer(req, appInstance, configDefault, defaultCC, defaultCCName, sidecarName, sidecar)
 			if err != nil {
 				return err
 			}
-			def := parsedMemory.Def.Value()
-			memory = &def
+			appInstance.Status.ResolvedOfferings.Containers[sidecarName] = resolvedOfferingsSidecar
 		}
+	}
 
-		appInstance.Status.ResolvedOfferings.Containers[name] = v1.ContainerResolvedOffering{
-			Class:     ccName,
-			Memory:    memory,
-			CPUScaler: cpuScaler,
-		}
+	return nil
+}
 
-		for sidecarName := range container.Sidecars {
-			appInstance.Status.ResolvedOfferings.Containers[sidecarName] = v1.ContainerResolvedOffering{
-				Class:     ccName,
-				Memory:    memory,
-				CPUScaler: cpuScaler,
-			}
+func resolveComputeClassForContainer(req router.Request, appInstance *v1.AppInstance, configDefault *int64, defaultCC *adminv1.ProjectComputeClassInstance, defaultCCName, containerName string, container v1.Container) (v1.ContainerResolvedOffering, error) {
+	var (
+		cpuScaler *float64
+		ccName    string
+	)
+
+	// First, get the compute class for the workload
+	cc, err := computeclasses.GetClassForWorkload(req.Ctx, req.Client, appInstance.Spec.ComputeClasses, container, containerName, appInstance.Namespace)
+	if err != nil {
+		return v1.ContainerResolvedOffering{}, err
+	}
+	if cc == nil {
+		cc = defaultCC
+	}
+	if cc != nil {
+		ccName = cc.Name
+		cpuScaler = &cc.CPUScaler
+	} else {
+		ccName = defaultCCName
+	}
+
+	// Next, determine the memory request. This is the order of priority:
+	// 1. runtime-level overrides from the user (in app.Spec)
+	// 2. defaults in the acorn image
+	// 3. defaults from compute class
+	// 4. global default
+
+	memory := configDefault // set to global default first, then check the higher priority values
+
+	if appInstance.Spec.Memory[containerName] != nil { // runtime-level overrides from the user
+		memory = appInstance.Spec.Memory[containerName]
+	} else if appInstance.Spec.Memory[""] != nil { // runtime-level overrides from the user for all containers in the app
+		memory = appInstance.Spec.Memory[""]
+	} else if container.Memory != nil { // defaults in the acorn image
+		memory = container.Memory
+	} else if cc != nil { // defaults from compute class
+		parsedMemory, err := computeclasses.ParseComputeClassMemoryInternal(cc.Memory)
+		if err != nil {
+			return v1.ContainerResolvedOffering{}, err
 		}
+		def := parsedMemory.Def.Value()
+		memory = &def
 	}
 
-	return nil
+	return v1.ContainerResolvedOffering{
+		Class:     ccName,
+		Memory:    memory,
+		CPUScaler: cpuScaler,
+	}, nil
 }

pkg/controller/resolvedofferings/testdata/computeclass/acornfile-override-compute-class/expected.golden

@@ -54,7 +54,7 @@ status:
       left:
         class: sample-compute-class
         cpuScaler: 0.25
-        memory: 2097152
+        memory: 1048576
       oneimage:
         class: sample-compute-class
         cpuScaler: 0.25

pkg/controller/resolvedofferings/testdata/computeclass/all-set-overwrite/expected.golden

@@ -53,7 +53,7 @@ status:
       "":
         memory: 1048576
       left:
-        memory: 2097152
+        memory: 1048576
       oneimage:
         memory: 2097152
     region: local

pkg/controller/resolvedofferings/testdata/computeclass/container/expected.golden

@@ -52,7 +52,7 @@ status:
       "":
         memory: 0
       left:
-        memory: 1048576
+        memory: 0
       oneimage:
         memory: 1048576
     region: local

pkg/controller/resolvedofferings/testdata/computeclass/job/expected.golden

@@ -52,7 +52,7 @@ status:
       "":
         memory: 0
       left:
-        memory: 1048576
+        memory: 0
       oneimage:
         memory: 1048576
     region: local

pkg/controller/resolvedofferings/testdata/computeclass/overwrite-acornfile-memory/expected.golden

@@ -53,7 +53,7 @@ status:
       "":
         memory: 0
       left:
-        memory: 1048576
+        memory: 0
       oneimage:
         memory: 1048576
     region: local

pkg/controller/resolvedofferings/testdata/computeclass/sidecar/expected.golden

@@ -52,7 +52,7 @@ status:
       "":
         memory: 0
       left:
-        memory: 0
+        memory: 1048576
       oneimage:
         memory: 0
     region: local

pkg/controller/resolvedofferings/testdata/computeclass/user-override-compute-class/expected.golden

@@ -56,7 +56,7 @@ status:
       left:
         class: sample-compute-class
         cpuScaler: 0.25
-        memory: 3145728
+        memory: 1048576
       oneimage:
         class: sample-compute-class
         cpuScaler: 0.25

pkg/controller/resolvedofferings/testdata/computeclass/with-acornfile-memory/expected.golden

@@ -51,7 +51,7 @@ status:
       "":
         memory: 0
       left:
-        memory: 1048576
+        memory: 0
       oneimage:
         memory: 1048576
     region: local