Undo unneeded changes

Signed-off-by: Grant Linville <[email protected]>

pkg/controller/appdefinition/testdata/computeclass/sidecar/expected.yaml.d/appinstance.yaml

@@ -9,10 +9,9 @@ spec:
   computeClass:
     left: sample-compute-class
 status:
-  resolvedOfferings:
-    containers:
-      left:
-        memory: 1048576 # 1Mi
+  defaults:
+    memory:
+      left: 1048576 # 1Mi
   namespace: app-created-namespace
   appImage:
     id: test
@@ -35,7 +34,7 @@ status:
           dockerfile: "Dockerfile"
           context: "."
   conditions:
-    - type: resolved-offerings
+    - type: defaults
       reason: Success
       status: "True"
       success: true

pkg/controller/quota/quota.go

@@ -179,7 +179,7 @@ func addStorage(req router.Request, appInstance *v1.AppInstance, quotaRequest *a
 		case "0":
 			continue
 		case "":
-			sizeQuantity = resolvedVolumeSize(appInstance, name)
+			sizeQuantity = defaultVolumeSize(appInstance, name)
 		default:
 			parsedQuantity, err := resource.ParseQuantity(string(size))
 			if err != nil {
@@ -202,17 +202,17 @@ func addStorage(req router.Request, appInstance *v1.AppInstance, quotaRequest *a
 	return nil
 }
 
-// resolvedVolumeSize determines the size of the specified volume. If the volume has a resolved size set
-// on the status.Defaults.Volumes, it uses that. Otherwise, it uses the default size in the v1 package.
-func resolvedVolumeSize(appInstance *v1.AppInstance, name string) resource.Quantity {
+// defaultVolumeSize determines the default size of the specified volume. If the volume has a default size set
+// on the status.Defaults.Volumes, it uses that. Otherwise, it uses the default size set on the status.Defaults.VolumeSize.
+func defaultVolumeSize(appInstance *v1.AppInstance, name string) resource.Quantity {
 	// Use the v1.DefaultSize if the appInstance doesn't have a default size set on the status.
 	result := *v1.DefaultSize // Safe to dereference because it is statically set in the v1 package.
 
 	// If the volume has a default size set on status.Defaults.Volumes, use that.
-	if resolvedVolume, set := appInstance.Status.Defaults.Volumes[name]; set {
+	if defaultVolume, set := appInstance.Status.Defaults.Volumes[name]; set {
 		// We do not expect this to ever fail because VolumeClasses have their sizes validated. However,
 		// if it does fail, we'll just use the default size instead.
-		if parsedQuantity, err := resource.ParseQuantity(string(resolvedVolume.Size)); err == nil {
+		if parsedQuantity, err := resource.ParseQuantity(string(defaultVolume.Size)); err == nil {
 			result = parsedQuantity
 		}
 	}

pkg/controller/scheduling/testdata/computeclass/sidecar/expected.yaml

@@ -9,10 +9,9 @@ spec:
   computeClass:
     left: sample-compute-class
 status:
-  resolvedOfferings:
-    containers:
-      left:
-        memory: 1048576 # 1Mi
+  defaults:
+    memory:
+      left: 1048576 # 1Mi
   namespace: app-created-namespace
   appImage:
     id: test

pkg/server/registry/apigroups/acorn/apps/validator_test.go

@@ -94,7 +94,7 @@ func TestCannotChangeAppRegion(t *testing.T) {
 			name: "Cannot change region from calculated default",
 			oldApp: apiv1.App{
 				Status: internalv1.AppInstanceStatus{
-					ResolvedOfferings: internalv1.ResolvedOfferings{
+					Defaults: internalv1.Defaults{
 						Region: "old-acorn-test-region",
 					},
 				},