Skip to content
This repository has been archived by the owner on Mar 16, 2024. It is now read-only.

Commit

Permalink
wip: fixup me
Browse files Browse the repository at this point in the history
Signed-off-by: Nick Hale <[email protected]>
  • Loading branch information
njhale committed Feb 12, 2024
1 parent 35a1769 commit 56cbd0a
Show file tree
Hide file tree
Showing 21 changed files with 93 additions and 5 deletions.
4 changes: 2 additions & 2 deletions pkg/apis/internal.admin.acorn.io/v1/default.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func getCurrentClusterComputeClassDefault(ctx context.Context, c client.Client,
defaultCCC = z.Pointer(clusterComputeClass)
}

if clusterComputeClass.Name == projectDefault {
if projectDefault != "" && clusterComputeClass.Name == projectDefault {
projectDefaultCCC = z.Pointer(clusterComputeClass)
}
}
Expand Down Expand Up @@ -68,7 +68,7 @@ func getCurrentProjectComputeClassDefault(ctx context.Context, c client.Client,
defaultPCC = z.Pointer(projectComputeClass)
}

if projectDefault projectComputeClass.Name == projectDefault {
if projectDefault != "" && projectComputeClass.Name == projectDefault {
projectDefaultPCC = z.Pointer(projectComputeClass)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ status:
resolvedOfferings:
containers:
"":
class: sample-compute-class
memory: 0
left:
class: sample-compute-class
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ status:
resolvedOfferings:
containers:
"":
class: sample-compute-class
memory: 0
left:
class: sample-compute-class
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ status:
resolvedOfferings:
containers:
"":
class: sample-compute-class
memory: 0
left:
class: sample-compute-class
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@ description: Simple description for a simple ComputeClass
cpuScaler: 0.25
default: true
priorityClassName: does-not-exist
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@ description: Simple description for a simple ComputeClass
cpuScaler: 0.25
default: true
priorityClassName: exists
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,9 @@ affinity:
- key: foo
operator: In
values:
- bar
- bar
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,9 @@ affinity:
- key: foo
operator: In
values:
- bar
- bar
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,9 @@ affinity:
- key: foo
operator: In
values:
- bar
- bar
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
5 changes: 5 additions & 0 deletions pkg/controller/scheduling/testdata/memory/job/existing.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
kind: ProjectInstance
apiVersion: internal.acorn.io/v1
metadata:
name: app-namespace

0 comments on commit 56cbd0a

Please sign in to comment.