Merge pull request kubernetes#123886 from adrianreber/2024-03-12-criu-not-found

Handle containerd "CRIU not found" error message

Author: k8s-ci-robot

test/e2e_node/checkpoint_container.go

@@ -217,6 +217,9 @@ var _ = SIGDescribe("Checkpoint Container", nodefeature.CheckpointContainer, fun
 			// or
 			// '(rpc error: code = Unknown desc = checkpoint/restore support not available)'
 			// if the container engine explicitly disabled the checkpoint/restore support
+			// or
+			// '(rpc error: code = Unknown desc = CRIU binary not found or too old (<31600). Failed to checkpoint container'
+			// if the CRIU binary was not found if it is too old
 			if (int(statusError.ErrStatus.Code)) == http.StatusInternalServerError {
 				if strings.Contains(
 					statusError.ErrStatus.Message,
@@ -239,6 +242,13 @@ var _ = SIGDescribe("Checkpoint Container", nodefeature.CheckpointContainer, fun
 					ginkgo.Skip("Container engine does not implement 'CheckpointContainer'")
 					return
 				}
+				if strings.Contains(
+					statusError.ErrStatus.Message,
+					"(rpc error: code = Unknown desc = CRIU binary not found or too old (<31600). Failed to checkpoint container",
+				) {
+					ginkgo.Skip("Container engine reports missing or too old CRIU binary")
+					return
+				}
 			}
 			framework.Failf(
 				"Unexpected status code (%d) during 'CheckpointContainer': %q",