Skip to content

Commit

Permalink
Merge pull request #5233 from k8s-infra-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…5230-to-release-1.16

[release-1.16] re-enable AKS BYO node test
  • Loading branch information
k8s-ci-robot authored Nov 1, 2024
2 parents 6b24c4e + 74f38f2 commit 5020b80
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 11 deletions.
10 changes: 10 additions & 0 deletions test/e2e/aks_byo_node.go
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
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

0 comments on commit 5020b80

Please sign in to comment.