Merge pull request #12130 from sivchari/update-kubebuilder-envtest

✨  Update KUBEBUILDER_ENVTEST_KUBERNETES_VERSION

Author: k8s-ci-robot

Makefile

@@ -44,7 +44,7 @@ export GO111MODULE=on
 #
 # Kubebuilder.
 #
-export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.32.0
+export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.33.0
 export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
 export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
 

controllers/crdmigrator/crd_migrator_test.go

@@ -288,7 +288,12 @@ func TestReconcile(t *testing.T) {
 			if skipCRDMigrationPhases.Has(StorageVersionMigrationPhase) {
 				// If storage version migration was skipped before, we now cannot deploy CRDs that remove v1beta1.
 				g.Expect(err).To(HaveOccurred())
-				g.Expect(err.Error()).To(ContainSubstring("status.storedVersions[0]: Invalid value: \"v1beta1\": must appear in spec.versions"))
+				g.Expect(err.Error()).To(Or(
+					// Kubernetes < v1.33.0
+					ContainSubstring("status.storedVersions[0]: Invalid value: \"v1beta1\": must appear in spec.versions"),
+					// Kubernetes >= v1.33.0
+					ContainSubstring("status.storedVersions[0]: Invalid value: \"v1beta1\": missing from spec.versions"),
+				))
 				return
 			}
 			g.Expect(err).ToNot(HaveOccurred())