From 5493f590e4b36cac4f6b310200c67b2b4d5946ce Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Mon, 21 Aug 2023 11:18:31 +0200 Subject: [PATCH] test: pin conformance image to a version which includes a fix for the dualstack tests --- test/e2e/config/docker.yaml | 2 ++ test/e2e/quick_start_test.go | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/test/e2e/config/docker.yaml b/test/e2e/config/docker.yaml index 37695d06713d..61140d0d6722 100644 --- a/test/e2e/config/docker.yaml +++ b/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" diff --git a/test/e2e/quick_start_test.go b/test/e2e/quick_start_test.go index 91b59ef90078..04335920c6d3 100644 --- a/test/e2e/quick_start_test.go +++ b/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()) },