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-1.17] re-enable AKS BYO node test #5230

Merged
merged 1 commit into from
Nov 1, 2024
Merged

[release-1.17] re-enable AKS BYO node test #5230

Show file tree
Hide file tree
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
10 changes: 10 additions & 0 deletions test/e2e/aks_byo_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ package e2e
import (
"context"
"os"
"strings"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down Expand Up @@ -64,6 +65,15 @@ func AKSBYONodeSpec(ctx context.Context, inputGetter func() AKSBYONodeSpecInput)
Location: infraControlPlane.Spec.Location,
Template: infrav1exp.AzureMachinePoolMachineTemplate{
VMSize: os.Getenv("AZURE_NODE_MACHINE_TYPE"),
Image: &infrav1.Image{
// The old Marketplace images don't have newer Kubernetes versions that this test
// requires. Use the new Community Gallery instead.
ComputeGallery: &infrav1.AzureComputeGalleryImage{
Gallery: "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019",
Name: "capi-ubun2-2404",
Version: strings.TrimPrefix(input.KubernetesVersion, "v"),
},
},
},
},
}
Expand Down
21 changes: 10 additions & 11 deletions test/e2e/azure_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,17 +853,16 @@ var _ = Describe("Workload cluster creation", func() {
})
})

// TODO: restore when new CAPZ reference images are published
// By("creating a byo nodepool", func() {
// AKSBYONodeSpec(ctx, func() AKSBYONodeSpecInput {
// return AKSBYONodeSpecInput{
// Cluster: result.Cluster,
// KubernetesVersion: kubernetesVersion,
// WaitIntervals: e2eConfig.GetIntervals(specName, "wait-worker-nodes"),
// ExpectedWorkerNodes: result.ExpectedWorkerNodes(),
// }
// })
// })
By("creating a byo nodepool", func() {
AKSBYONodeSpec(ctx, func() AKSBYONodeSpecInput {
return AKSBYONodeSpecInput{
Cluster: result.Cluster,
KubernetesVersion: kubernetesVersion,
WaitIntervals: e2eConfig.GetIntervals(specName, "wait-worker-nodes"),
ExpectedWorkerNodes: result.ExpectedWorkerNodes(),
}
})
})

By("modifying custom patches", func() {
AKSPatchSpec(ctx, func() AKSPatchSpecInput {
Expand Down