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

test: adding test coverage for image resolution codepath #89

Merged
merged 13 commits into from
Jan 20, 2024
+95 −58
Merged

test: adding test coverage for image resolution codepath #89

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ac3549a
testing az linux coverage
Bryce-Soghigian Jan 12, 2024
83b5d9d
test: adding coverage for Name() and UserData() in imagefamily interf…
Bryce-Soghigian Jan 12, 2024
6cef81e
ci
Bryce-Soghigian Jan 12, 2024
507921d
Update pkg/providers/instancetype/suite_test.go
Bryce-Soghigian Jan 12, 2024
b00aa74
Update pkg/providers/imagefamily/image_test.go
Bryce-Soghigian Jan 12, 2024
83abef6
test: using acceptance style for AzureLinux Coverage
Bryce-Soghigian Jan 12, 2024
6bbe7b9
test: moving image selection testing to acceptance test style
Bryce-Soghigian Jan 12, 2024
556c923
test: converting ImageProvider + Image Family tests to ginkgo accepta…
Bryce-Soghigian Jan 12, 2024
31a6d53
ci
Bryce-Soghigian Jan 12, 2024
55991d9
test: refactored Public Gallery URLS back into imagefamily
Bryce-Soghigian Jan 19, 2024
26b5717
fix: comment on gen2 over gen1 preference
Bryce-Soghigian Jan 19, 2024
a4a814b
.
Bryce-Soghigian Jan 19, 2024
3d4cbe5
Merge branch 'main' into bsoghigian/az-linux-more-coverage
tallaxes Jan 19, 2024
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
32 changes: 32 additions & 0 deletions pkg/providers/imagefamily/image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,31 @@ var _ = Describe("Image ID Resolution", func() {
Entry("Image version is empty, should get latest", imagefamily.Ubuntu2204Gen2CommunityImage, imagefamily.AKSUbuntuPublicGalleryURL, "", fmt.Sprintf("/CommunityGalleries/%s/images/%s/versions/%s", imagefamily.AKSUbuntuPublicGalleryURL, imagefamily.Ubuntu2204Gen2CommunityImage, latestImageVersion)),
Entry("Image version is specified, should use it", imagefamily.Ubuntu2204Gen2CommunityImage, imagefamily.AKSUbuntuPublicGalleryURL, olderImageVersion, fmt.Sprintf("/CommunityGalleries/%s/images/%s/versions/%s", imagefamily.AKSUbuntuPublicGalleryURL, imagefamily.Ubuntu2204Gen2CommunityImage, olderImageVersion)),
)
azLinuxNodeClass := test.AKSNodeClass()
azLinuxNodeClass.Spec.ImageFamily = lo.ToPtr(v1alpha2.AzureLinuxImageFamily)
DescribeTable("AzureLinux Image Resolution",
func(nodeClass *v1alpha2.AKSNodeClass, instanceType *cloudprovider.InstanceType, expectedImageID string) {
imageID, err := imageProvider.Get(context.Background(), nodeClass, instanceType, imagefamily.AzureLinux{})
Expect(err).To(BeNil())
Expect(imageID).To(Equal(expectedImageID))
},
Entry("Arm64 Image for HyperV Gen 2",
azLinuxNodeClass,
&cloudprovider.InstanceType{Name: "Standard_D8pls_v5", Requirements: scheduling.NewRequirements(scheduling.NewRequirement(corev1.LabelArchStable, corev1.NodeSelectorOpIn, corev1beta1.ArchitectureArm64), scheduling.NewRequirement(v1alpha2.LabelSKUHyperVGeneration, corev1.NodeSelectorOpIn, v1alpha2.HyperVGenerationV2))},
fmt.Sprintf("/CommunityGalleries/%s/images/V2gen2arm64/versions/1.1686127203.20217", imagefamily.AKSAzureLinuxPublicGalleryURL)),
Entry("Gen2 Image for HyperV Gen 2",
azLinuxNodeClass,
&cloudprovider.InstanceType{Name: "Standard_D2s_v3", Requirements: scheduling.NewRequirements(scheduling.NewRequirement(v1alpha2.LabelSKUHyperVGeneration, corev1.NodeSelectorOpIn, v1alpha2.HyperVGenerationV2))},
fmt.Sprintf("/CommunityGalleries/%s/images/V2gen2/versions/1.1686127203.20217", imagefamily.AKSAzureLinuxPublicGalleryURL)),
Entry("Gen1 Image for HyperV Gen 1",
azLinuxNodeClass,
&cloudprovider.InstanceType{Name: "Standard_D2s_v3", Requirements: scheduling.NewRequirements(scheduling.NewRequirement(v1alpha2.LabelSKUHyperVGeneration, corev1.NodeSelectorOpIn, v1alpha2.HyperVGenerationV1))},
fmt.Sprintf("/CommunityGalleries/%s/images/V2/versions/1.1686127203.20217", imagefamily.AKSAzureLinuxPublicGalleryURL)),
Entry("Gen2 Image if no preference is specified",
azLinuxNodeClass,
&cloudprovider.InstanceType{Name: "Standard_D2s_v3", Requirements: scheduling.NewRequirements()},
fmt.Sprintf("/CommunityGalleries/%s/images/V2gen2/versions/1.1686127203.20217", imagefamily.AKSAzureLinuxPublicGalleryURL)),
)

DescribeTable("Ubuntu2204 Image Resolution",
func(nodeClass *v1alpha2.AKSNodeClass, instanceType *cloudprovider.InstanceType, expectedImageID string) {
Expand Down Expand Up @@ -199,3 +224,10 @@ var _ = Describe("Image ID Parsing", func() {
Entry("empty image id should not parse", "badimageid", "", "", "", true),
)
})

var _ = Describe("ImageFamily Name", func() {
It("should return the correct image family name", func() {
Expect(imagefamily.Ubuntu2204{}.Name()).To(Equal(v1alpha2.Ubuntu2204ImageFamily))
Expect(imagefamily.AzureLinux{}.Name()).To(Equal(v1alpha2.AzureLinuxImageFamily))
})
})
7 changes: 7 additions & 0 deletions pkg/providers/instancetype/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,13 @@ var _ = Describe("InstanceType Provider", func() {
ExpectProvisioned(ctx, env.Client, cluster, cloudProvider, coreProvisioner, pod)
ExpectScheduled(ctx, env.Client, pod)
})
It("should support provisioning with azure linux", func() {
nodeClass.Spec.ImageFamily = lo.ToPtr(v1alpha2.AzureLinuxImageFamily)
ExpectApplied(ctx, env.Client, nodePool, nodeClass)
pod := coretest.UnschedulablePod(coretest.PodOptions{})
ExpectProvisioned(ctx, env.Client, cluster, cloudProvider, coreProvisioner, pod)
ExpectScheduled(ctx, env.Client, pod)
})
Context("VM profile", func() {
It("should have OS disk and network interface set to auto-delete", func() {
ExpectApplied(ctx, env.Client, nodePool, nodeClass)
Expand Down