Skip to content

Commit 3f480f7

Browse files
authored
Merge pull request #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
2 parents b820a31 + 5493f59 commit 3f480f7

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

test/e2e/config/docker.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,8 @@ variables:
238238
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
239239
# This avoids building node images in the default case which improves the test duration significantly.
240240
KUBERNETES_VERSION_MANAGEMENT: "v1.28.0"
241+
# TODO when bumping this version: also remove the pinning of the conformanceImage at the [ipv6] tests in
242+
# `test/e2e/quick_start_test.go`.
241243
KUBERNETES_VERSION: "v1.28.0"
242244
KUBERNETES_VERSION_UPGRADE_FROM: "v1.27.3"
243245
KUBERNETES_VERSION_UPGRADE_TO: "v1.28.0"

test/e2e/quick_start_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ var _ = Describe("When following the Cluster API quick-start with dualstack and
125125
ClusterProxy: proxy.GetWorkloadCluster(ctx, namespace, clusterName),
126126
ArtifactsDirectory: artifactFolder,
127127
ConfigFilePath: "./data/kubetest/dualstack.yaml",
128+
// Pin the conformance image to workaround https://github.com/kubernetes-sigs/cluster-api/issues/9240 .
129+
// This should get dropped again when bumping to a version post v1.28.0 in `test/e2e/config/docker.yaml`.
130+
ConformanceImage: "gcr.io/k8s-staging-ci-images/conformance:v1.29.0-alpha.0.190_18290bfdc8fbe1",
128131
},
129132
)).To(Succeed())
130133
},
@@ -151,6 +154,9 @@ var _ = Describe("When following the Cluster API quick-start with dualstack and
151154
ClusterProxy: proxy.GetWorkloadCluster(ctx, namespace, clusterName),
152155
ArtifactsDirectory: artifactFolder,
153156
ConfigFilePath: "./data/kubetest/dualstack.yaml",
157+
// Pin the conformance image to workaround https://github.com/kubernetes-sigs/cluster-api/issues/9240 .
158+
// This should get dropped again when bumping to a version post v1.28.0 in `test/e2e/config/docker.yaml`.
159+
ConformanceImage: "gcr.io/k8s-staging-ci-images/conformance:v1.29.0-alpha.0.190_18290bfdc8fbe1",
154160
},
155161
)).To(Succeed())
156162
},

0 commit comments

Comments
 (0)