Unit tests passing (for real this time)

Signed-off-by: Grant Linville <[email protected]>
acorn-io · Dec 5, 2023 · f8c2178 · f8c2178
1 parent 173f049
commit f8c2178
Show file tree

Hide file tree

Showing 136 changed files with 286 additions and 391 deletions.
diff --git a/pkg/apis/internal.acorn.io/v1/appinstance.go b/pkg/apis/internal.acorn.io/v1/appinstance.go
@@ -14,7 +14,7 @@ type AppInstanceCondition string
 
 var (
 	AppInstanceConditionDefined             = "defined"
-	AppInstanceConditionDefaults            = "defaults"
+	AppInstanceConditionResolvedOfferings   = "resolved-offerings"
 	AppInstanceConditionScheduling          = "scheduling"
 	AppInstanceConditionNamespace           = "namespace"
 	AppInstanceConditionParsed              = "parsed"

diff --git a/pkg/controller/appdefinition/deploy.go b/pkg/controller/appdefinition/deploy.go
@@ -597,12 +597,25 @@ func containerAnnotation(container v1.Container) string {
 	return string(json)
 }
 
+func resolvedOfferingsAnnotation(appInstance *v1.AppInstance, container v1.Container) string {
+	if resolved, exists := appInstance.Status.ResolvedOfferings.Containers[container.Name]; exists {
+		data, _ := convert.EncodeToMap(resolved)
+		j, _ := json.Marshal(data)
+		return string(j)
+	}
+	return ""
+}
+
 func podAnnotations(appInstance *v1.AppInstance, container v1.Container) map[string]string {
 	annotations := map[string]string{
 		labels.AcornContainerSpec: containerAnnotation(container),
 	}
 	addPrometheusAnnotations(annotations, container)
 
+	if offerings := resolvedOfferingsAnnotation(appInstance, container); offerings != "" {
+		annotations[labels.AcornContainerResolvedOfferings] = offerings
+	}
+
 	images := map[string]string{}
 	addImageAnnotations(images, appInstance, container)
 

diff --git a/...roller/appdefinition/testdata/computeclass/all-set-overwrite-computeclass/expected.golden b/...roller/appdefinition/testdata/computeclass/all-set-overwrite-computeclass/expected.golden
@@ -224,7 +224,7 @@ status:
     reason: Success
     status: "True"
     success: true
-    type: defaults
+    type: resolved-offerings
     reason: Success
     status: "True"
     success: true
@@ -235,11 +235,7 @@ status:
     type: defined
   namespace: app-created-namespace
   observedGeneration: 1
-  resolvedOfferings:
-    memory:
-      "": 0
-      left: 2097152
-      oneimage: 2097152
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements:

diff --git a/pkg/controller/appdefinition/testdata/computeclass/all-set-overwrite-computeclass/input.yaml b/pkg/controller/appdefinition/testdata/computeclass/all-set-overwrite-computeclass/input.yaml
@@ -63,7 +63,7 @@ status:
           dockerfile: "Dockerfile"
           context: "."
   conditions:
-    - type: defaults
+    - type: resolved-offerings
       reason: Success
       status: "True"
       success: true

diff --git a/pkg/controller/appdefinition/testdata/computeclass/all-set/expected.golden b/pkg/controller/appdefinition/testdata/computeclass/all-set/expected.golden
@@ -223,7 +223,7 @@ status:
     reason: Success
     status: "True"
     success: true
-    type: defaults
+    type: resolved-offerings
     reason: Success
     status: "True"
     success: true
@@ -234,11 +234,7 @@ status:
     type: defined
   namespace: app-created-namespace
   observedGeneration: 1
-  resolvedOfferings:
-    memory:
-      "": 0
-      left: 1048576
-      oneimage: 1048576
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements:

diff --git a/pkg/controller/appdefinition/testdata/computeclass/all-set/input.yaml b/pkg/controller/appdefinition/testdata/computeclass/all-set/input.yaml
@@ -61,7 +61,7 @@ status:
           dockerfile: "Dockerfile"
           context: "."
   conditions:
-    - type: defaults
+    - type: resolved-offerings
       reason: Success
       status: "True"
       success: true

diff --git a/pkg/controller/appdefinition/testdata/computeclass/container/expected.golden b/pkg/controller/appdefinition/testdata/computeclass/container/expected.golden
@@ -223,7 +223,7 @@ status:
     reason: Success
     status: "True"
     success: true
-    type: defaults
+    type: resolved-offerings
     reason: Success
     status: "True"
     success: true
@@ -234,11 +234,7 @@ status:
     type: defined
   namespace: app-created-namespace
   observedGeneration: 1
-  resolvedOfferings:
-    memory:
-      "": 0
-      left: 1048576
-      oneimage: 1048576
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements:

diff --git a/pkg/controller/appdefinition/testdata/computeclass/container/input.yaml b/pkg/controller/appdefinition/testdata/computeclass/container/input.yaml
@@ -61,7 +61,7 @@ status:
           dockerfile: "Dockerfile"
           context: "."
   conditions:
-    - type: defaults
+    - type: resolved-offerings
       reason: Success
       status: "True"
       success: true

diff --git a/pkg/controller/appdefinition/testdata/computeclass/different-computeclass/expected.golden b/pkg/controller/appdefinition/testdata/computeclass/different-computeclass/expected.golden
@@ -372,7 +372,7 @@ status:
     reason: Success
     status: "True"
     success: true
-    type: defaults
+    type: resolved-offerings
     reason: Success
     status: "True"
     success: true
@@ -383,11 +383,7 @@ status:
     type: defined
   namespace: app-created-namespace
   observedGeneration: 1
-  resolvedOfferings:
-    memory:
-      "": 0
-      oneimage: 2097152
-      twoimage: 1048576
+  resolvedOfferings: {}
   scheduling:
     oneimage:
       affinity:

diff --git a/pkg/controller/appdefinition/testdata/computeclass/different-computeclass/input.yaml b/pkg/controller/appdefinition/testdata/computeclass/different-computeclass/input.yaml
@@ -73,7 +73,7 @@ status:
           dockerfile: "Dockerfile"
           context: "."
   conditions:
-    - type: defaults
+    - type: resolved-offerings
       reason: Success
       status: "True"
       success: true

diff --git a/pkg/controller/appdefinition/testdata/computeclass/job/expected.golden b/pkg/controller/appdefinition/testdata/computeclass/job/expected.golden
@@ -222,7 +222,7 @@ status:
     reason: Success
     status: "True"
     success: true
-    type: defaults
+    type: resolved-offerings
     reason: Success
     status: "True"
     success: true
@@ -233,11 +233,7 @@ status:
     type: defined
   namespace: app-created-namespace
   observedGeneration: 1
-  resolvedOfferings:
-    memory:
-      "": 0
-      left: 1048576
-      oneimage: 1048576
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements:

diff --git a/pkg/controller/appdefinition/testdata/computeclass/job/input.yaml b/pkg/controller/appdefinition/testdata/computeclass/job/input.yaml
@@ -61,7 +61,7 @@ status:
           dockerfile: "Dockerfile"
           context: "."
   conditions:
-    - type: defaults
+    - type: resolved-offerings
       reason: Success
       status: "True"
       success: true

diff --git a/...ller/appdefinition/testdata/computeclass/overwrite-acornfile-computeclass/expected.golden b/...ller/appdefinition/testdata/computeclass/overwrite-acornfile-computeclass/expected.golden
@@ -224,7 +224,7 @@ status:
     reason: Success
     status: "True"
     success: true
-    type: defaults
+    type: resolved-offerings
     reason: Success
     status: "True"
     success: true
@@ -235,11 +235,7 @@ status:
     type: defined
   namespace: app-created-namespace
   observedGeneration: 1
-  resolvedOfferings:
-    memory:
-      "": 0
-      left: 1048576
-      oneimage: 1048576
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements:

diff --git a/...ontroller/appdefinition/testdata/computeclass/overwrite-acornfile-computeclass/input.yaml b/...ontroller/appdefinition/testdata/computeclass/overwrite-acornfile-computeclass/input.yaml
@@ -62,7 +62,7 @@ status:
           context: "."
         class: sample-compute-class-01
   conditions:
-    - type: defaults
+    - type: resolved-offerings
       reason: Success
       status: "True"
       success: true

diff --git a/pkg/controller/appdefinition/testdata/computeclass/sidecar/expected.yaml.d/appinstance.yaml b/pkg/controller/appdefinition/testdata/computeclass/sidecar/expected.yaml.d/appinstance.yaml
@@ -34,7 +34,7 @@ status:
           dockerfile: "Dockerfile"
           context: "."
   conditions:
-    - type: defaults
+    - type: resolved-offerings
       reason: Success
       status: "True"
       success: true

diff --git a/pkg/controller/appdefinition/testdata/computeclass/sidecar/input.yaml b/pkg/controller/appdefinition/testdata/computeclass/sidecar/input.yaml
@@ -34,7 +34,7 @@ status:
           dockerfile: "Dockerfile"
           context: "."
   conditions:
-    - type: defaults
+    - type: resolved-offerings
       reason: Success
       status: "True"
       success: true

diff --git a/pkg/controller/appdefinition/testdata/computeclass/two-containers/expected.golden b/pkg/controller/appdefinition/testdata/computeclass/two-containers/expected.golden
@@ -357,7 +357,7 @@ status:
     reason: Success
     status: "True"
     success: true
-    type: defaults
+    type: resolved-offerings
     reason: Success
     status: "True"
     success: true
@@ -368,11 +368,7 @@ status:
     type: defined
   namespace: app-created-namespace
   observedGeneration: 1
-  resolvedOfferings:
-    memory:
-      "": 0
-      oneimage: 1048576
-      twoimage: 0
+  resolvedOfferings: {}
   scheduling:
     oneimage:
       affinity:

diff --git a/pkg/controller/appdefinition/testdata/computeclass/two-containers/input.yaml b/pkg/controller/appdefinition/testdata/computeclass/two-containers/input.yaml
@@ -58,7 +58,7 @@ status:
           dockerfile: "Dockerfile"
           context: "."
   conditions:
-    - type: defaults
+    - type: resolved-offerings
       reason: Success
       status: "True"
       success: true

diff --git a/...ontroller/appdefinition/testdata/computeclass/with-acornfile-computeclass/expected.golden b/...ontroller/appdefinition/testdata/computeclass/with-acornfile-computeclass/expected.golden
@@ -222,7 +222,7 @@ status:
     reason: Success
     status: "True"
     success: true
-    type: defaults
+    type: resolved-offerings
     reason: Success
     status: "True"
     success: true
@@ -233,11 +233,7 @@ status:
     type: defined
   namespace: app-created-namespace
   observedGeneration: 1
-  resolvedOfferings:
-    memory:
-      "": 0
-      left: 1048576
-      oneimage: 1048576
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements:

diff --git a/pkg/controller/appdefinition/testdata/computeclass/with-acornfile-computeclass/input.yaml b/pkg/controller/appdefinition/testdata/computeclass/with-acornfile-computeclass/input.yaml
@@ -60,7 +60,7 @@ status:
           context: "."
         class: sample-compute-class
   conditions:
-    - type: defaults
+    - type: resolved-offerings
       reason: Success
       status: "True"
       success: true

diff --git a/pkg/controller/appdefinition/testdata/memory/all-set-overwrite/expected.golden b/pkg/controller/appdefinition/testdata/memory/all-set-overwrite/expected.golden
@@ -217,18 +217,14 @@ status:
     reason: Success
     status: "True"
     success: true
-    type: defaults
+    type: resolved-offerings
     reason: Success
     status: "True"
     success: true
     type: defined
   namespace: app-created-namespace
   observedGeneration: 1
-  resolvedOfferings:
-    memory:
-      "": 1048576
-      left: 2097152
-      oneimage: 2097152
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements:

diff --git a/pkg/controller/appdefinition/testdata/memory/all-set-overwrite/input.yaml b/pkg/controller/appdefinition/testdata/memory/all-set-overwrite/input.yaml
@@ -55,7 +55,7 @@ status:
       reason: Success
       status: "True"
       success: true
-    - type: defaults
+    - type: resolved-offerings
       reason: Success
       status: "True"
       success: true
diff --git a/pkg/controller/appdefinition/testdata/memory/all-set/expected.golden b/pkg/controller/appdefinition/testdata/memory/all-set/expected.golden
@@ -216,18 +216,14 @@ status:
     reason: Success
     status: "True"
     success: true
-    type: defaults
+    type: resolved-offerings
     reason: Success
     status: "True"
     success: true
     type: defined
   namespace: app-created-namespace
   observedGeneration: 1
-  resolvedOfferings:
-    memory:
-      "": 1048576
-      left: 1048576
-      oneimage: 1048576
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements:

diff --git a/pkg/controller/appdefinition/testdata/memory/all-set/input.yaml b/pkg/controller/appdefinition/testdata/memory/all-set/input.yaml
@@ -54,7 +54,7 @@ status:
       reason: Success
       status: "True"
       success: true
-    - type: defaults
+    - type: resolved-offerings
       reason: Success
       status: "True"
       success: true
diff --git a/pkg/controller/appdefinition/testdata/memory/container/expected.golden b/pkg/controller/appdefinition/testdata/memory/container/expected.golden
@@ -212,18 +212,14 @@ status:
     reason: Success
     status: "True"
     success: true
-    type: defaults
+    type: resolved-offerings
     reason: Success
     status: "True"
     success: true
     type: defined
   namespace: app-created-namespace
   observedGeneration: 1
-  resolvedOfferings:
-    memory:
-      "": 0
-      left: 1048576
-      oneimage: 1048576
+  resolvedOfferings: {}
   scheduling:
     left:
       requirements: {}

diff --git a/pkg/controller/appdefinition/testdata/memory/container/input.yaml b/pkg/controller/appdefinition/testdata/memory/container/input.yaml
@@ -50,7 +50,7 @@ status:
       reason: Success
       status: "True"
       success: true 
-    - type: defaults
+    - type: resolved-offerings
       reason: Success
       status: "True"
       success: true