Skip to content

fix: ubuntu 2004 doesnt support 1.35, use 1.34 #8828

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

Open
awesomenix wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −45
Open

fix: ubuntu 2004 doesnt support 1.35, use 1.34 #8828

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
11 changes: 0 additions & 11 deletions e2e/config/vhd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,6 @@ var (
Gallery: imageGalleryLinux,
}

VHDUbuntu2004FIPSContainerd = &Image{
Name: "2004fipscontainerd",
OS: OSUbuntu,
Arch: "amd64",
Distro: datamodel.AKSUbuntuFipsContainerd2004,
Gallery: imageGalleryLinux,
UnsupportedLocalDns: true,
UnsupportedGen2: true,
SkipOldVHDValidations: true,
}

VHDUbuntu2004FIPSGen2Containerd = &Image{
Name: "2004gen2fipscontainerd",
OS: OSUbuntu,
Expand Down
49 changes: 15 additions & 34 deletions e2e/scenario_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,33 +838,14 @@ func Test_Ubuntu2204FIPS(t *testing.T) {
})
}

func Test_Ubuntu2004FIPS(t *testing.T) {
RunScenario(t, &Scenario{
Description: "Tests that a node using the Ubuntu 2004 FIPS Gen1 VHD can be properly bootstrapped",
Config: Config{
Cluster: ClusterKubenet,
VHD: config.VHDUbuntu2004FIPSContainerd,
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
},
VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {
},
Validator: func(ctx context.Context, s *Scenario) {
ValidateInstalledPackageVersion(ctx, s, "moby-containerd", components.GetExpectedPackageVersions("containerd", "ubuntu", "r2004")[0])
ValidateInstalledPackageVersion(ctx, s, "moby-runc", components.GetExpectedPackageVersions("runc", "ubuntu", "r2004")[0])
ValidateSSHServiceEnabled(ctx, s)
ValidateFIPSProvider(ctx, s)
},
},
})
}

func Test_Ubuntu2004Gen2FIPS(t *testing.T) {
RunScenario(t, &Scenario{
Description: "Tests that a node using the Ubuntu 2004 FIPS Gen2 VHD can be properly bootstrapped",
Config: Config{
Cluster: ClusterKubenet,
VHD: config.VHDUbuntu2004FIPSGen2Containerd,
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
},
VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {
},
Expand Down Expand Up @@ -2800,8 +2781,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Enabled(t *testing.T) {
Cluster: ClusterLatestKubernetesVersion,
VHD: config.VHDUbuntu2204Gen2Containerd,
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
// Enable ServiceAccountImagePullProfile with test values
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
Enabled: true,
Expand Down Expand Up @@ -2836,8 +2817,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Disabled(t *testing.T) {
Cluster: ClusterLatestKubernetesVersion,
VHD: config.VHDUbuntu2204Gen2Containerd,
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
// Explicitly disable ServiceAccountImagePullProfile
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
Enabled: false,
Expand Down Expand Up @@ -2867,8 +2848,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_EnabledWithoutDefaultIDs(t *te
Cluster: ClusterLatestKubernetesVersion,
VHD: config.VHDUbuntu2204Gen2Containerd,
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
// Enable ServiceAccountImagePullProfile without default client/tenant IDs
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
Enabled: true,
Expand Down Expand Up @@ -2907,8 +2888,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_NetworkIsolated(t *testing.T)
Cluster: ClusterAzureBootstrapProfileCache,
VHD: config.VHDUbuntu2204Gen2Containerd,
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
// Enable ServiceAccountImagePullProfile with test values
nbc.ContainerService.Properties.SecurityProfile = &datamodel.SecurityProfile{
PrivateEgress: &datamodel.PrivateEgress{
Expand Down Expand Up @@ -2952,7 +2933,7 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Enabled_Scriptless(t *testing.
Cluster: ClusterLatestKubernetesVersion,
VHD: config.VHDUbuntu2204Gen2Containerd,
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
Enabled: true,
DefaultClientID: "test-client-id-12345",
Expand All @@ -2963,8 +2944,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Enabled_Scriptless(t *testing.
nbc.KubeletConfig["--image-credential-provider-bin-dir"] = "/var/lib/kubelet/credential-provider"
},
AKSNodeConfigMutator: func(_ *Cluster, aksConfig *aksnodeconfigv1.Configuration) {
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
aksConfig.KubernetesVersion = "1.34.0"
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
aksConfig.KubernetesVersion = "1.34.8"
// Enable ServiceAccountImagePullProfile with test values
aksConfig.ServiceAccountImagePullProfile = &aksnodeconfigv1.ServiceAccountImagePullProfile{
Enabled: true,
Expand Down Expand Up @@ -3008,7 +2989,7 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Disabled_Scriptless(t *testing
Cluster: ClusterLatestKubernetesVersion,
VHD: config.VHDUbuntu2204Gen2Containerd,
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
Enabled: false,
DefaultClientID: "should-not-appear-client-id",
Expand All @@ -3019,8 +3000,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Disabled_Scriptless(t *testing
nbc.KubeletConfig["--image-credential-provider-bin-dir"] = "/var/lib/kubelet/credential-provider"
},
AKSNodeConfigMutator: func(_ *Cluster, aksConfig *aksnodeconfigv1.Configuration) {
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
aksConfig.KubernetesVersion = "1.34.0"
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
aksConfig.KubernetesVersion = "1.34.8"
// Disable ServiceAccountImagePullProfile
aksConfig.ServiceAccountImagePullProfile = &aksnodeconfigv1.ServiceAccountImagePullProfile{
Enabled: false,
Expand Down
Loading