Merge pull request kubernetes-sigs#9252 from chrischdi/pr-dualstack-1…

….28.0-conformance-fix

🐛 test: pin conformance image to a version which includes a fix for the dualstack tests

go.mod

@@ -35,16 +35,16 @@ require (
 	golang.org/x/text v0.12.0
 	gomodules.xyz/jsonpatch/v2 v2.4.0
 	google.golang.org/grpc v1.55.0
-	k8s.io/api v0.27.2
-	k8s.io/apiextensions-apiserver v0.27.2
-	k8s.io/apimachinery v0.27.2
-	k8s.io/apiserver v0.27.2
-	k8s.io/client-go v0.27.2
-	k8s.io/cluster-bootstrap v0.27.2
-	k8s.io/component-base v0.27.2
+	k8s.io/api v0.27.1
+	k8s.io/apiextensions-apiserver v0.27.1
+	k8s.io/apimachinery v0.27.1
+	k8s.io/apiserver v0.27.1
+	k8s.io/client-go v0.27.1
+	k8s.io/cluster-bootstrap v0.27.1
+	k8s.io/component-base v0.27.1
 	k8s.io/klog/v2 v2.90.1
 	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
-	k8s.io/kubectl v0.27.2
+	k8s.io/kubectl v0.27.1
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491
 	sigs.k8s.io/controller-runtime v0.15.1
 	sigs.k8s.io/yaml v1.3.0

test/e2e/config/docker.yaml

@@ -238,6 +238,8 @@ variables:
   # The following Kubernetes versions should be the latest versions with already published kindest/node images.
   # This avoids building node images in the default case which improves the test duration significantly.
   KUBERNETES_VERSION_MANAGEMENT: "v1.28.0"
+  # TODO when bumping this version: also remove the pinning of the conformanceImage at the [ipv6] tests in
+  # `test/e2e/quick_start_test.go`.
   KUBERNETES_VERSION: "v1.28.0"
   KUBERNETES_VERSION_UPGRADE_FROM: "v1.27.3"
   KUBERNETES_VERSION_UPGRADE_TO: "v1.28.0"

test/e2e/quick_start_test.go

@@ -125,6 +125,9 @@ var _ = Describe("When following the Cluster API quick-start with dualstack and
 						ClusterProxy:       proxy.GetWorkloadCluster(ctx, namespace, clusterName),
 						ArtifactsDirectory: artifactFolder,
 						ConfigFilePath:     "./data/kubetest/dualstack.yaml",
+						// Pin the conformance image to workaround https://github.com/kubernetes-sigs/cluster-api/issues/9240 .
+						// This should get dropped again when bumping to a version post v1.28.0 in `test/e2e/config/docker.yaml`.
+						ConformanceImage: "gcr.io/k8s-staging-ci-images/conformance:v1.29.0-alpha.0.190_18290bfdc8fbe1",
 					},
 				)).To(Succeed())
 			},
@@ -151,6 +154,9 @@ var _ = Describe("When following the Cluster API quick-start with dualstack and
 						ClusterProxy:       proxy.GetWorkloadCluster(ctx, namespace, clusterName),
 						ArtifactsDirectory: artifactFolder,
 						ConfigFilePath:     "./data/kubetest/dualstack.yaml",
+						// Pin the conformance image to workaround https://github.com/kubernetes-sigs/cluster-api/issues/9240 .
+						// This should get dropped again when bumping to a version post v1.28.0 in `test/e2e/config/docker.yaml`.
+						ConformanceImage: "gcr.io/k8s-staging-ci-images/conformance:v1.29.0-alpha.0.190_18290bfdc8fbe1",
 					},
 				)).To(Succeed())
 			},