Skip to content

Commit 47a3d46

Browse files
committed
Fix test extension to use correct image
1 parent 0f91d7f commit 47a3d46

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.github/ISSUE_TEMPLATE/release_tracking.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ After the Kubernetes minor release:
6464
checking out the release tag of `https://github.com/kubernetes/cloud-provider-vsphere` and running:
6565
`helm template charts/vsphere-cpi --namespace kube-system > ../../sigs.k8s.io/cluster-api-provider-vsphere/packaging/flavorgen/cloudprovider/cpi/cpi.yaml`
6666
* Bump in:
67+
* `test/extension/handlers/topologymutation/handler.go`
6768
* `test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml`
6869
* `test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml`
6970
* Prior art: https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/pull/3294

test/extension/handlers/topologymutation/handler.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,13 +345,18 @@ func calculateImageName(templateVariables map[string]apiextensionsv1.JSON, isCon
345345
return "", err
346346
}
347347

348-
// Use known image.
348+
// Use known ubuntu-2204 image.
349349
if version == "v1.28.0" || version == "v1.29.0" || version == "v1.30.0" {
350350
return fmt.Sprintf("ubuntu-2204-kube-%s", version), nil
351351
}
352352

353-
// Fallback to ubuntu-2404-kube-v1.31.0 otherwise
354-
return "ubuntu-2404-kube-v1.31.0", nil
353+
// Use known ubuntu-2404 image.
354+
if version == "v1.31.0" || version == "v1.32.0" || version == "v1.33.0" || version == "v1.34.0" {
355+
return fmt.Sprintf("ubuntu-2404-kube-%s", version), nil
356+
}
357+
358+
// Fallback otherwise
359+
return "ubuntu-2404-kube-v1.35.0", nil
355360
}
356361

357362
// ValidateTopology implements the HandlerFunc for the ValidateTopology hook.

0 commit comments

Comments
 (0)