fix: bug in uncordon logic

Author: lockwobr

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

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 #
@@ -33,6 +33,12 @@ spec:
   - try:
     - script:
         content: |
+          ## Verify skyhook-cli binary exists (symlink to operator/bin/skyhook)
+          if [[ ! -x ../skyhook-cli ]]; then
+            echo "ERROR: ../skyhook-cli does not exist or is not executable"
+            echo "Run 'make build-cli' in the operator directory first"
+            exit 1
+          fi
           ## remove annotation/labels from last run
           ../skyhook-cli reset strict-order-skyhook-zzz --confirm 2>/dev/null || true
           ../skyhook-cli reset strict-order-skyhook-b --confirm 2>/dev/null || true
@@ -57,7 +63,7 @@ spec:
           ../../metrics_test.py skyhook_node_status_count 1 -t skyhook_name=strict-order-skyhook-zzz -t status=complete
           ../../metrics_test.py skyhook_status 1 -t skyhook_name=strict-order-skyhook-c -t status=waiting
           ../../metrics_test.py skyhook_package_state_count 1 -t package_name=foobar -t package_version=1.2 -t skyhook_name=strict-order-skyhook-zzz -t state=complete
-          ../../metrics_test.py skyhook_package_stage_count 1 -t package_name=foobar -t package_version=1.2 -t skyhook_name=strict-order-skyhook-zzz -t stage=config
+          ../../metrics_test.py skyhook_package_stage_count 1 -t package_name=foobar -t package_version=1.2 -t skyhook_name=strict-order-skyhook-zzz -t stage=post-interrupt
     # make sure that if it was going to start b it will start b
     - sleep:
         duration: 5s

k8s-tests/chainsaw/skyhook/strict_order/skyhook-disable-update.yaml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 #
@@ -31,6 +31,9 @@ spec:
       skyhook.nvidia.com/test-node: skyhooke2e
   packages:
     foobar:
+      interrupt:
+        type: service
+        services: [cron]
       version: "1.2"
       image: ghcr.io/nvidia/skyhook/agentless
       env: 
@@ -54,6 +57,9 @@ spec:
       skyhook.nvidia.com/test-node: skyhooke2e
   packages:
     foobar:
+      interrupt:
+        type: service
+        services: [cron]
       version: "1.2"
       image: ghcr.io/nvidia/skyhook/agentless
       env: 

k8s-tests/chainsaw/skyhook/strict_order/skyhook-pause-update.yaml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 #
@@ -31,6 +31,9 @@ spec:
       skyhook.nvidia.com/test-node: skyhooke2e
   packages:
     foobar:
+      interrupt:
+        type: service
+        services: [cron]
       version: "1.2"
       image: ghcr.io/nvidia/skyhook/agentless
       env: 
@@ -54,6 +57,9 @@ spec:
       skyhook.nvidia.com/test-node: skyhooke2e
   packages:
     foobar:
+      interrupt:
+        type: service
+        services: [cron]
       version: "1.2"
       image: ghcr.io/nvidia/skyhook/agentless
       env: 

k8s-tests/chainsaw/skyhook/strict_order/skyhook.yaml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 #
@@ -30,6 +30,9 @@ spec:
       skyhook.nvidia.com/test-node: skyhooke2e
   packages:
     foobar:
+      interrupt:
+        type: service
+        services: [cron]
       version: "1.2"
       image: ghcr.io/nvidia/skyhook/agentless
       env: 
@@ -53,6 +56,9 @@ spec:
       skyhook.nvidia.com/test-node: skyhooke2e
   packages:
     foobar:
+      interrupt:
+        type: service
+        services: [cron]
       version: "1.2"
       image: ghcr.io/nvidia/skyhook/agentless
       env: 

operator/internal/wrapper/node.go

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  *
@@ -22,7 +22,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"sort"
-	"strings"
 
 	"github.com/NVIDIA/skyhook/operator/api/v1alpha1"
 	"github.com/NVIDIA/skyhook/operator/internal/graph"
@@ -396,21 +395,6 @@ func (node *skyhookNode) Cordon() {
 
 func (node *skyhookNode) Uncordon() {
 
-	other := false
-	for key := range node.Annotations {
-		if strings.HasPrefix(key, fmt.Sprintf("%s/cordon_", v1alpha1.METADATA_PREFIX)) &&
-			key != fmt.Sprintf("%s/cordon_%s", v1alpha1.METADATA_PREFIX, node.skyhookName) {
-			other = true
-			break
-		}
-	}
-
-	if other { // if others also hold a cordon, just remove our self
-		delete(node.Annotations, fmt.Sprintf("%s/cordon_%s", v1alpha1.METADATA_PREFIX, node.skyhookName))
-		node.updated = true
-		return
-	}
-
 	// if we hold a cordon remove it, also we dont want to remove a cordon if we dont have one...
 	_, ok := node.Annotations[fmt.Sprintf("%s/cordon_%s", v1alpha1.METADATA_PREFIX, node.skyhookName)]
 	if ok {