fix: how we compare interrupt pods

Author: lockwobr

chart/templates/limitrange.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: LimitRange
 metadata:
-  name: {{ include "skyhook.fullname" . }}-default-limits
+  name: {{ include "chart.fullname" . }}-default-limits
   namespace: {{ .Release.Namespace }}
 spec:
   limits:

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

@@ -175,7 +175,7 @@ metadata:
   name: simple-skyhook
 status:
   status: complete
-  observedGeneration: 2
+  (to_number(observedGeneration) == `2` || to_number(observedGeneration) == `3`): true
   nodeState:
     (values(@)):
       - dexter|1.2.3:

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

@@ -33,9 +33,9 @@ spec:
         content: |
           ## remove annotation from last run
           ../rest_test.sh simple-skyhook
-    - create: ## set a limit range in the namespace
+    - apply: ## set a limit range in the namespace
         file: limitrange.yaml
-    - create:
+    - apply:
         file: skyhook.yaml
     - assert:
         file: assert.yaml

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

@@ -104,7 +104,7 @@ metadata:
   name: simple-update-skyhook
 status:
   status: complete
-  observedGeneration: 3
+  (to_number(observedGeneration) == `2` || to_number(observedGeneration) == `3`): true
   nodeState:
     (values(@)):
       - baxter|2.3.1-test:

operator/internal/controller/skyhook_controller.go

@@ -1756,8 +1756,12 @@ func podMatchesPackage(opts SkyhookOperatorOptions, _package *v1alpha1.Package,
 
 	// need to differentiate whether the pod is for an interrupt or not so we know
 	// what to expect and how to compare them
+	isInterrupt := false
+	_, limitRange := pod.Annotations["kubernetes.io/limit-ranger"]
+
 	if pod.Labels[fmt.Sprintf("%s/interrupt", v1alpha1.METADATA_PREFIX)] == "True" {
 		expectedPod = createInterruptPodForPackage(opts, &v1alpha1.Interrupt{}, "", _package, skyhook, "")
+		isInterrupt = true
 	} else {
 		expectedPod = createPodFromPackage(opts, _package, skyhook, "", stage)
 	}
@@ -1793,18 +1797,22 @@ func podMatchesPackage(opts SkyhookOperatorOptions, _package *v1alpha1.Package,
 			return false
 		}
 
-		// compare resource requests and limits (CPU, memory, etc.)
-		expectedResources := expectedContainer.Resources
-		actualResources := actualContainer.Resources
-		if skyhook.Spec.Packages[_package.Name].Resources != nil {
-			// If CR has resources specified, they should match exactly
-			if !reflect.DeepEqual(expectedResources, actualResources) {
-				return false
-			}
-		} else {
-			// If CR has no resources specified, ensure pod has no resource overrides
-			if actualResources.Requests != nil || actualResources.Limits != nil {
-				return false
+		if !isInterrupt { // dont compare these since they are not configured on interrupt
+			// compare resource requests and limits (CPU, memory, etc.)
+			expectedResources := expectedContainer.Resources
+			actualResources := actualContainer.Resources
+			if skyhook.Spec.Packages[_package.Name].Resources != nil {
+				// If CR has resources specified, they should match exactly
+				if !reflect.DeepEqual(expectedResources, actualResources) {
+					return false
+				}
+			} else {
+				// If CR has no resources specified, ensure pod has no resource overrides
+				if !limitRange {
+					if actualResources.Requests != nil || actualResources.Limits != nil {
+						return false
+					}
+				}
 			}
 		}
 	}