Merge branch 'main' into fix-pods-ip-again

apeabody · web-flow · commit b2e23bb00e78 · 2025-10-14T17:44:24.000-07:00
diff --git a/test/integration/testutils/utils.go b/test/integration/testutils/utils.go
@@ -42,6 +42,9 @@ var (
 
 		// Internal errors can be retried
 		".*Error code 13, message: an internal error has occurred": "Internal error.",
+
+		// Incompatible operation in progress
+		".*Error 400: Cluster is running incompatible operation.*": "Incompatible operation.",
 	}
 
 	ClusterAlwaysExemptPaths = []string{"nodePools"} // node pools are separately checked by name

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,9 @@ var (`
`42`	`42`
`43`	`43`	`// Internal errors can be retried`
`44`	`44`	`".*Error code 13, message: an internal error has occurred": "Internal error.",`
	`45`	`+`
	`46`	`+ // Incompatible operation in progress`
	`47`	`+ ".Error 400: Cluster is running incompatible operation.": "Incompatible operation.",`
`45`	`48`	`}`
`46`	`49`
`47`	`50`	`ClusterAlwaysExemptPaths = []string{"nodePools"} // node pools are separately checked by name`