Skip to content

Commit 17def93

Browse files
committed
feat(operator): strict ordering unit test passing
1 parent 058e687 commit 17def93

File tree

15 files changed

+45
-47
lines changed

15 files changed

+45
-47
lines changed

chart/templates/skyhook-crd.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ metadata:
44
name: skyhooks.skyhook.nvidia.com
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.15.0
7+
skyhook.nvidia.com/pause: "false"
8+
skyhook.nvidia.com/disable: "false"
79
labels:
810
{{- include "chart.labels" . | nindent 4 }}
911
spec:
@@ -426,12 +428,6 @@ spec:
426428
type: object
427429
description: Packages are the DAG of packages to be applied to nodes.
428430
type: object
429-
pause:
430-
default: false
431-
description: |-
432-
Pause halt the operator from proceeding. THIS is for admin use to stop skyhook if there is an issue or
433-
concert without needing to delete to ad in discovery of the issue.
434-
type: boolean
435431
podNonInterruptLabels:
436432
description: PodNonInterruptLabels are a set of labels we want to
437433
monitor pods for whether they Interruptible
@@ -484,6 +480,11 @@ spec:
484480
description: This skyhook is required to have been completed before
485481
any workloads can start
486482
type: boolean
483+
priority:
484+
description: Priority determines the order in which skyhooks are applied. Lower values are applied first.
485+
type: integer
486+
minimum: 0
487+
default: 0
487488
serial:
488489
default: false
489490
description: Serial tells skyhook if it allowed to run in parallel or

k8s-tests/chainsaw/skyhook/cleanup-pods/chainsaw-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kind: Test
2424
metadata:
2525
name: cleanup-pods
2626
spec:
27-
concurrent: true
27+
concurrent: false
2828
description: |
2929
This test runs a simple skyhook with dependsOn. We wait tell completed, then trigger update to force config cycle on package B. Once config
3030
is complete, we update again to make the package error, and at the same clear out the node annotation to trigger cleanup.

k8s-tests/chainsaw/skyhook/config-skyhook/chainsaw-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
accordingly but the package with the config changes may be skipeed and hang, and this asserts that it doesn't hang in that condition. Then once that completes the same two
3232
packages have the key with a config interrupt changed and it's asserted that the config, interrupt, and post-interrupt runs for both those packages. Then once that completes
3333
again it does one more update on a key for the same two packages which doesn't have a config interrupt defined and makes sure that the config steps are ran for that.
34-
concurrent: true
34+
concurrent: false
3535
timeouts:
3636
assert: 360s
3737
catch: ## if errors, print the most important info

k8s-tests/chainsaw/skyhook/depends-on/chainsaw-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kind: Test
2424
metadata:
2525
name: depends-on
2626
spec:
27-
concurrent: true
27+
concurrent: false
2828
description: |
2929
Test makes sure depends-on works as expected. c depends on a, and b. Make sure a and b complete before c starts.
3030
timeouts:

k8s-tests/chainsaw/skyhook/failure-skyhook/chainsaw-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kind: Test
2424
metadata:
2525
name: failure-skyhook
2626
spec:
27-
concurrent: true
27+
concurrent: false
2828
timeouts:
2929
assert: 240s
3030
catch: ## if errors, print the most important info

k8s-tests/chainsaw/skyhook/pod-finalizer/chainsaw-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kind: Test
2424
metadata:
2525
name: pod-finalization
2626
spec:
27-
concurrent: true
27+
concurrent: false
2828
timeouts:
2929
assert: 180s
3030
steps:

k8s-tests/chainsaw/skyhook/simple-skyhook/chainsaw-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kind: Test
2424
metadata:
2525
name: simple-skyhook
2626
spec:
27-
concurrent: true
27+
concurrent: false
2828
# skip: false ## this test doesn't seem to be useful, just slows things down, leaving it for, should delete at some point if still skipped
2929
timeouts:
3030
assert: 240s

k8s-tests/chainsaw/skyhook/simple-update-skyhook/chainsaw-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kind: Test
2424
metadata:
2525
name: simple-update-skyhook
2626
spec:
27-
concurrent: true
27+
concurrent: false
2828
timeouts:
2929
assert: 240s
3030
catch: ## if errors, print the most important info

k8s-tests/chainsaw/skyhook/skyhook-upgrade/chainsaw-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kind: Test
2424
metadata:
2525
name: skyhook-upgrade
2626
spec:
27-
concurrent: true
27+
concurrent: false
2828
skip: true ## skipping because this test current requires manual updating of the version
2929
description: |
3030
This test is skipped because it is because its not automated to change versions while its running.

k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/chainsaw-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
asserted that it runs in upgrade before finishing as normal. Then finally we assert that the uninstall still works when every package is removed from the SCR by removing the last package
3232
and then making sure that it's uninstalled successfully.
3333
Additionally we are assert pod resource requests and limits are set correctly from defaults.
34-
concurrent: true
34+
concurrent: false
3535
timeouts:
3636
assert: 420s
3737
catch: ## if errors, print the most important info

0 commit comments

Comments
 (0)