add controller side changes and tests

Signed-off-by: Oscar Ward <[email protected]>
acorn-io · Feb 14, 2024 · aba032b · aba032b
1 parent 643edce
commit aba032b
Show file tree

Hide file tree

Showing 23 changed files with 880 additions and 2 deletions.
diff --git a/pkg/controller/defaults/memory_test.go b/pkg/controller/defaults/memory_test.go
@@ -45,6 +45,14 @@ func TestMemorySameGeneration(t *testing.T) {
 	tester.DefaultTest(t, scheme.Scheme, "testdata/memory/same-generation", Calculate)
 }
 
+func TestTwoCCCDefaultsCrossRegion(t *testing.T) {
+	tester.DefaultTest(t, scheme.Scheme, "testdata/memory/two-ccc-defaults-different-regions", Calculate)
+}
+
+func TestTwoPCCDefaultsCrossRegion(t *testing.T) {
+	tester.DefaultTest(t, scheme.Scheme, "testdata/memory/two-pcc-defaults-different-regions", Calculate)
+}
+
 func TestTwoCCCDefaultsShouldError(t *testing.T) {
 	harness, input, err := tester.FromDir(scheme.Scheme, "testdata/memory/two-ccc-defaults-should-error")
 	if err != nil {

diff --git a/pkg/controller/defaults/testdata/memory/two-ccc-defaults-different-regions/existing.yaml b/pkg/controller/defaults/testdata/memory/two-ccc-defaults-different-regions/existing.yaml
@@ -0,0 +1,54 @@
+---
+kind: ClusterComputeClassInstance
+apiVersion: internal.admin.acorn.io/v1
+metadata:
+  name: sample-compute-class
+description: Simple description for a simple ComputeClass
+cpuScaler: 0.25
+default: true
+memory:
+  min: 1Mi # 1Mi
+  max: 2Mi # 2Mi
+  default: 1Mi # 1Mi
+supportedRegions: [local]
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: foo
+          operator: In
+          values:
+          - bar
+---
+kind: ClusterComputeClassInstance
+apiVersion: internal.admin.acorn.io/v1
+metadata:
+  name: sample-compute-class-other
+description: Simple description for a simple ComputeClass
+cpuScaler: 0.25
+default: true
+supportedRegions: [non-local]
+memory:
+  min: 1Mi # 1Mi
+  max: 2Mi # 2Mi
+  default: 2Mi # 2Mi
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: foo
+          operator: In
+          values:
+          - bar
+---
+kind: ProjectInstance
+apiVersion: internal.acorn.io/v1
+metadata:
+  name: app-namespace
+spec: {}
+status:
+  defaultRegion: local
+  supportedRegions:
+    - local
diff --git a/pkg/controller/defaults/testdata/memory/two-ccc-defaults-different-regions/expected.golden b/pkg/controller/defaults/testdata/memory/two-ccc-defaults-different-regions/expected.golden
@@ -0,0 +1,62 @@
+`apiVersion: internal.acorn.io/v1
+kind: AppInstance
+metadata:
+  creationTimestamp: null
+  name: app-name
+  namespace: app-namespace
+  uid: 1234567890abcdef
+spec:
+  image: test
+  memory:
+    oneimage: 1048576
+status:
+  appImage:
+    buildContext: {}
+    id: test
+    imageData: {}
+    vcs: {}
+  appSpec:
+    containers:
+      oneimage:
+        build:
+          context: .
+          dockerfile: Dockerfile
+        image: image-name
+        metrics: {}
+        ports:
+        - port: 80
+          protocol: http
+          targetPort: 81
+        probes: null
+        sidecars:
+          left:
+            image: foo
+            metrics: {}
+            ports:
+            - port: 90
+              protocol: tcp
+              targetPort: 91
+            probes: null
+  appStatus: {}
+  columns: {}
+  conditions:
+    reason: Success
+    status: "True"
+    success: true
+    type: defaults
+  defaults:
+    memory:
+      "": 1048576
+      left: 1048576
+      oneimage: 1048576
+    region: local
+  namespace: app-created-namespace
+  observedGeneration: 1
+  resolvedOfferings: {}
+  staged:
+    appImage:
+      buildContext: {}
+      imageData: {}
+      vcs: {}
+  summary: {}
+`
diff --git a/pkg/controller/defaults/testdata/memory/two-ccc-defaults-different-regions/input.yaml b/pkg/controller/defaults/testdata/memory/two-ccc-defaults-different-regions/input.yaml
@@ -0,0 +1,33 @@
+kind: AppInstance
+apiVersion: internal.acorn.io/v1
+metadata:
+  name: app-name
+  namespace: app-namespace
+  uid: 1234567890abcdef
+spec:
+  image: test
+  memory:
+    oneimage: 1048576 # 1Mi
+status:
+  observedGeneration: 1
+  namespace: app-created-namespace
+  appImage:
+    id: test
+  appSpec:
+    containers:
+      oneimage:
+        sidecars:
+          left:
+            image: "foo"
+            ports:
+              - port: 90
+                targetPort: 91
+                protocol: tcp
+        ports:
+        - port: 80
+          targetPort: 81
+          protocol: http
+        image: "image-name"
+        build:
+          dockerfile: "Dockerfile"
+          context: "."
diff --git a/pkg/controller/defaults/testdata/memory/two-pcc-defaults-different-regions/existing.yaml b/pkg/controller/defaults/testdata/memory/two-pcc-defaults-different-regions/existing.yaml
@@ -0,0 +1,56 @@
+---
+kind: ProjectComputeClassInstance
+apiVersion: internal.admin.acorn.io/v1
+metadata:
+  name: sample-compute-class
+  namespace: app-namespace
+description: Simple description for a simple ComputeClass
+cpuScaler: 0.25
+default: true
+memory:
+  min: 1Mi # 1Mi
+  max: 2Mi # 2Mi
+  default: 1Mi # 1Mi
+supportedRegions: [local]
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: foo
+          operator: In
+          values:
+          - bar
+---
+kind: ProjectComputeClassInstance
+apiVersion: internal.admin.acorn.io/v1
+metadata:
+  name: sample-compute-class-other
+  namespace: app-namespace
+description: Simple description for a simple ComputeClass
+cpuScaler: 0.25
+default: true
+supportedRegions: [non-local]
+memory:
+  min: 1Mi # 1Mi
+  max: 2Mi # 2Mi
+  default: 2Mi # 2Mi
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: foo
+          operator: In
+          values:
+          - bar
+---
+kind: ProjectInstance
+apiVersion: internal.acorn.io/v1
+metadata:
+  name: app-namespace
+spec: {}
+status:
+  defaultRegion: local
+  supportedRegions:
+    - local
diff --git a/pkg/controller/defaults/testdata/memory/two-pcc-defaults-different-regions/expected.golden b/pkg/controller/defaults/testdata/memory/two-pcc-defaults-different-regions/expected.golden
@@ -0,0 +1,62 @@
+`apiVersion: internal.acorn.io/v1
+kind: AppInstance
+metadata:
+  creationTimestamp: null
+  name: app-name
+  namespace: app-namespace
+  uid: 1234567890abcdef
+spec:
+  image: test
+  memory:
+    oneimage: 1048576
+status:
+  appImage:
+    buildContext: {}
+    id: test
+    imageData: {}
+    vcs: {}
+  appSpec:
+    containers:
+      oneimage:
+        build:
+          context: .
+          dockerfile: Dockerfile
+        image: image-name
+        metrics: {}
+        ports:
+        - port: 80
+          protocol: http
+          targetPort: 81
+        probes: null
+        sidecars:
+          left:
+            image: foo
+            metrics: {}
+            ports:
+            - port: 90
+              protocol: tcp
+              targetPort: 91
+            probes: null
+  appStatus: {}
+  columns: {}
+  conditions:
+    reason: Success
+    status: "True"
+    success: true
+    type: defaults
+  defaults:
+    memory:
+      "": 0
+      left: 1048576
+      oneimage: 1048576
+    region: local
+  namespace: app-created-namespace
+  observedGeneration: 1
+  resolvedOfferings: {}
+  staged:
+    appImage:
+      buildContext: {}
+      imageData: {}
+      vcs: {}
+  summary: {}
+`
diff --git a/pkg/controller/defaults/testdata/memory/two-pcc-defaults-different-regions/input.yaml b/pkg/controller/defaults/testdata/memory/two-pcc-defaults-different-regions/input.yaml
@@ -0,0 +1,33 @@
+kind: AppInstance
+apiVersion: internal.acorn.io/v1
+metadata:
+  name: app-name
+  namespace: app-namespace
+  uid: 1234567890abcdef
+spec:
+  image: test
+  memory:
+    oneimage: 1048576 # 1Mi
+status:
+  observedGeneration: 1
+  namespace: app-created-namespace
+  appImage:
+    id: test
+  appSpec:
+    containers:
+      oneimage:
+        sidecars:
+          left:
+            image: "foo"
+            ports:
+              - port: 90
+                targetPort: 91
+                protocol: tcp
+        ports:
+        - port: 80
+          targetPort: 81
+          protocol: http
+        image: "image-name"
+        build:
+          dockerfile: "Dockerfile"
+          context: "."
diff --git a/pkg/controller/resolvedofferings/computeclass.go b/pkg/controller/resolvedofferings/computeclass.go
@@ -116,7 +116,7 @@ func resolveComputeClassForContainer(req router.Request, appInstance *v1.AppInst
 	var 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)
+	cc, err := computeclasses.GetClassForWorkload(req.Ctx, req.Client, appInstance.Spec.ComputeClasses, container, containerName, appInstance.Namespace, appInstance.GetRegion())
 	if err != nil {
 		return v1.ContainerResolvedOffering{}, err
 	}

diff --git a/pkg/controller/resolvedofferings/computeclass_test.go b/pkg/controller/resolvedofferings/computeclass_test.go
@@ -73,6 +73,14 @@ func TestTwoPCCDefaultsShouldError(t *testing.T) {
 	assert.True(t, resp.NoPrune, "NoPrune should be true when error occurs")
 }
 
+func TestTwoCCCDefaultsDifferentRegions(t *testing.T) {
+	tester.DefaultTest(t, scheme.Scheme, "testdata/computeclass/two-ccc-defaults-different-regions", Calculate)
+}
+
+func TestTwoPCCDefaultsDifferentRegions(t *testing.T) {
+	tester.DefaultTest(t, scheme.Scheme, "testdata/computeclass/two-pcc-defaults-different-regions", Calculate)
+}
+
 func TestComputeClassDefault(t *testing.T) {
 	tester.DefaultTest(t, scheme.Scheme, "testdata/computeclass/compute-class-default", Calculate)
 }

diff --git a/.../resolvedofferings/testdata/computeclass/two-ccc-defaults-different-regions/existing.yaml b/.../resolvedofferings/testdata/computeclass/two-ccc-defaults-different-regions/existing.yaml
@@ -0,0 +1,54 @@
+---
+kind: ClusterComputeClassInstance
+apiVersion: internal.admin.acorn.io/v1
+metadata:
+  name: sample-compute-class
+description: Simple description for a simple ComputeClass
+cpuScaler: 0.25
+default: true
+supportedRegions: [local]
+memory:
+  min: 1Mi # 1Mi
+  max: 2Mi # 2Mi
+  default: 1Mi # 1Mi
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: foo
+          operator: In
+          values:
+          - bar
+---
+kind: ClusterComputeClassInstance
+apiVersion: internal.admin.acorn.io/v1
+metadata:
+  name: sample-compute-class-other
+description: Simple description for a simple ComputeClass
+cpuScaler: 0.25
+default: true
+supportedRegions: [non-local]
+memory:
+  min: 1Mi # 1Mi
+  max: 2Mi # 2Mi
+  default: 2Mi # 2Mi
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: foo
+          operator: In
+          values:
+          - bar
+---
+kind: ProjectInstance
+apiVersion: internal.acorn.io/v1
+metadata:
+  name: app-namespace
+spec: {}
+status:
+  defaultRegion: local
+  supportedRegions:
+    - local