Resolved offerings second try

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

docs/docs/40-admin/03-computeclasses.md

@@ -40,6 +40,7 @@ affinity: # The same affinity fields for Pods
             operator: In
             values:
             - bar
+supportedRegions: ["local"] # should always be set to ["local"]
 ```
 
 If `memory.min`, `memory.max`, `memory.values`, `affinity`, and `tolerations` are not given, then there are no scheduling rules for workloads using the compute class.

pkg/apis/internal.acorn.io/v1/appinstance.go

@@ -15,6 +15,7 @@ type AppInstanceCondition string
 var (
 	AppInstanceConditionDefined             = "defined"
 	AppInstanceConditionDefaults            = "defaults"
+	AppInstanceConditionResolvedOfferings   = "resolved-offerings"
 	AppInstanceConditionScheduling          = "scheduling"
 	AppInstanceConditionNamespace           = "namespace"
 	AppInstanceConditionParsed              = "parsed"
@@ -210,6 +211,7 @@ type AppInstanceStatus struct {
 	Scheduling                map[string]Scheduling   `json:"scheduling,omitempty"`
 	Conditions                []Condition             `json:"conditions,omitempty"`
 	Defaults                  Defaults                `json:"defaults,omitempty"`
+	ResolvedOfferings         ResolvedOfferings       `json:"resolvedOfferings,omitempty"`
 	Summary                   CommonSummary           `json:"summary,omitempty"`
 	Permissions               []Permissions           `json:"permissions,omitempty"`               // Permissions given to this appInstance (only containers within, not nested Acorns/Services)
 	DeniedConsumerPermissions []Permissions           `json:"deniedConsumerPermissions,omitempty"` // Permissions given to this appInstance by a consumed service, which it is not authorized to have
@@ -242,6 +244,25 @@ type VolumeDefault struct {
 	AccessModes AccessModes `json:"accessModes,omitempty"`
 }
 
+type ResolvedOfferings struct {
+	Volumes    map[string]VolumeResolvedOffering    `json:"volumes,omitempty"`
+	VolumeSize *resource.Quantity                   `json:"volumeSize,omitempty"`
+	Containers map[string]ContainerResolvedOffering `json:"containers,omitempty"`
+	Region     string                               `json:"region,omitempty"`
+}
+
+type VolumeResolvedOffering struct {
+	Class       string      `json:"class,omitempty"`
+	Size        Quantity    `json:"size,omitempty"`
+	AccessModes AccessModes `json:"accessModes,omitempty"`
+}
+
+type ContainerResolvedOffering struct {
+	Class     string   `json:"class,omitempty"`
+	Memory    *int64   `json:"memory,omitempty"`
+	CPUScaler *float64 `json:"cpuScaler,omitempty"`
+}
+
 type Scheduling struct {
 	Requirements      corev1.ResourceRequirements `json:"requirements,omitempty"`
 	Affinity          *corev1.Affinity            `json:"affinity,omitempty"`

pkg/cli/testdata/TestAll/acorn_all_-o_json.golden

@@ -32,6 +32,7 @@ ACORNS:
                 "appSpec": {},
                 "appStatus": {},
                 "defaults": {},
+                "resolvedOfferings": {},
                 "summary": {}
             }
         }

pkg/cli/testdata/TestAll/acorn_all_-o_yaml.golden

@@ -18,6 +18,7 @@ items:
     appStatus: {}
     columns: {}
     defaults: {}
+    resolvedOfferings: {}
     staged:
       appImage:
         buildContext: {}

pkg/controller/appdefinition/deploy.go

@@ -597,12 +597,34 @@ func containerAnnotation(container v1.Container) string {
 	return string(json)
 }
 
+func resolvedOfferingsAnnotation(appInstance *v1.AppInstance, container v1.Container) (string, error) {
+	if resolved, exists := appInstance.Status.ResolvedOfferings.Containers[container.Name]; exists {
+		data, err := convert.EncodeToMap(resolved)
+		if err != nil {
+			return "", err
+		}
+
+		j, err := json.Marshal(data)
+		if err != nil {
+			return "", err
+		}
+
+		return string(j), nil
+	}
+	return "", nil
+}
+
 func podAnnotations(appInstance *v1.AppInstance, container v1.Container) map[string]string {
 	annotations := map[string]string{
 		labels.AcornContainerSpec: containerAnnotation(container),
 	}
 	addPrometheusAnnotations(annotations, container)
 
+	offerings, err := resolvedOfferingsAnnotation(appInstance, container)
+	if err == nil && offerings != "" {
+		annotations[labels.AcornContainerResolvedOfferings] = offerings
+	}
+
 	images := map[string]string{}
 	addImageAnnotations(images, appInstance, container)
 

pkg/controller/appdefinition/testdata/TestComputeMem.golden

@@ -117,6 +117,7 @@ status:
   appStatus: {}
   columns: {}
   defaults: {}
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}
@@ -158,6 +159,7 @@ status:
   appStatus: {}
   columns: {}
   defaults: {}
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}
@@ -202,6 +204,7 @@ status:
     type: defined
   defaults: {}
   namespace: app-created-namespace
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}

pkg/controller/appdefinition/testdata/acorn/basic/expected.golden

@@ -133,6 +133,7 @@ status:
   appStatus: {}
   columns: {}
   defaults: {}
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}
@@ -214,6 +215,7 @@ status:
     type: defined
   defaults: {}
   namespace: app-created-namespace
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}

pkg/controller/appdefinition/testdata/acorn/labels/expected.golden

@@ -151,6 +151,7 @@ status:
   appStatus: {}
   columns: {}
   defaults: {}
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}
@@ -256,6 +257,7 @@ status:
     type: defined
   defaults: {}
   namespace: app-created-namespace
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}

pkg/controller/appdefinition/testdata/assignnamespace/expected.golden

@@ -21,6 +21,7 @@ status:
     type: namespace
   defaults: {}
   namespace: default-1234567890ab
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}
@@ -52,6 +53,7 @@ status:
     type: namespace
   defaults: {}
   namespace: default-1234567890ab
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}

pkg/controller/appdefinition/testdata/autoupgrade/with-local-image/expected.golden

@@ -23,6 +23,7 @@ status:
     type: image-pull
   defaults: {}
   namespace: app-created-namespace
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}

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

@@ -240,6 +240,7 @@ status:
       oneimage: 2097152
   namespace: app-created-namespace
   observedGeneration: 1
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements:

pkg/controller/appdefinition/testdata/computeclass/all-set/expected.golden

@@ -239,6 +239,7 @@ status:
       oneimage: 1048576
   namespace: app-created-namespace
   observedGeneration: 1
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements:

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

@@ -239,6 +239,7 @@ status:
       oneimage: 1048576
   namespace: app-created-namespace
   observedGeneration: 1
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements:

pkg/controller/appdefinition/testdata/computeclass/different-computeclass/expected.golden

@@ -388,6 +388,7 @@ status:
       twoimage: 1048576
   namespace: app-created-namespace
   observedGeneration: 1
+  resolvedOfferings: {}
   scheduling:
     oneimage:
       affinity:

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

@@ -238,6 +238,7 @@ status:
       oneimage: 1048576
   namespace: app-created-namespace
   observedGeneration: 1
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements:

pkg/controller/appdefinition/testdata/computeclass/overwrite-acornfile-computeclass/expected.golden

@@ -240,6 +240,7 @@ status:
       oneimage: 1048576
   namespace: app-created-namespace
   observedGeneration: 1
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements:

pkg/controller/appdefinition/testdata/computeclass/two-containers/expected.golden

@@ -373,6 +373,7 @@ status:
       twoimage: 0
   namespace: app-created-namespace
   observedGeneration: 1
+  resolvedOfferings: {}
   scheduling:
     oneimage:
       affinity:

pkg/controller/appdefinition/testdata/computeclass/with-acornfile-computeclass/expected.golden

@@ -238,6 +238,7 @@ status:
       oneimage: 1048576
   namespace: app-created-namespace
   observedGeneration: 1
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements:

pkg/controller/appdefinition/testdata/depends-ready/expected.golden

@@ -307,6 +307,7 @@ status:
     type: defined
   defaults: {}
   namespace: app-created-namespace
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}

pkg/controller/appdefinition/testdata/depends/expected.golden

@@ -311,6 +311,7 @@ status:
     type: defined
   defaults: {}
   namespace: app-created-namespace
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}

pkg/controller/appdefinition/testdata/deployspec/basic/expected.golden

@@ -323,6 +323,7 @@ status:
     type: defined
   defaults: {}
   namespace: app-created-namespace
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}

pkg/controller/appdefinition/testdata/deployspec/filter-user-labels/expected.golden

@@ -458,6 +458,7 @@ status:
     type: defined
   defaults: {}
   namespace: app-created-namespace
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}

pkg/controller/appdefinition/testdata/deployspec/karpenter/expected.golden

@@ -380,6 +380,7 @@ status:
     type: defined
   defaults: {}
   namespace: app-created-namespace
+  resolvedOfferings: {}
   staged:
     appImage:
       buildContext: {}