Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-0.20] Ensure bundles override is used for template generation if available #8693

Merged
merged 1 commit into from
Aug 30, 2024
Merged

[release-0.20] Ensure bundles override is used for template generation if available #8693

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions test/framework/vsphere.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,12 +688,21 @@ func (v *VSphere) searchTemplate(ctx context.Context, template string) (string,

func readVersionsBundles(t testing.TB, release *releasev1.EksARelease, kubeVersion anywherev1.KubernetesVersion) *releasev1.VersionsBundle {
reader := newFileReader()
b, err := releases.ReadBundlesForRelease(reader, release)
if err != nil {
t.Fatal(err)
var allBundles *releasev1.Bundles
var err error
if getBundlesOverride() == "true" {
allBundles, err = bundles.Read(reader, defaultBundleReleaseManifestFile)
if err != nil {
t.Fatal(err)
}
} else {
allBundles, err = releases.ReadBundlesForRelease(reader, release)
if err != nil {
t.Fatal(err)
}
}

return bundles.VersionsBundleForKubernetesVersion(b, string(kubeVersion))
return bundles.VersionsBundleForKubernetesVersion(allBundles, string(kubeVersion))
}

func readVSphereConfig() (vsphereConfig, error) {
Expand Down
Loading