Skip to content

Commit 2a2364e

Browse files
awesomenixawesomenix
committed
ubuntu 2004 doesnt support 1.35, use 1.34
1 parent 4564778 commit 2a2364e

2 files changed

Lines changed: 15 additions & 45 deletions

File tree

‎e2e/config/vhd.go‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,6 @@ var (
7070
Gallery: imageGalleryLinux,
7171
}
7272

73-
VHDUbuntu2004FIPSContainerd = &Image{
74-
Name: "2004fipscontainerd",
75-
OS: OSUbuntu,
76-
Arch: "amd64",
77-
Distro: datamodel.AKSUbuntuFipsContainerd2004,
78-
Gallery: imageGalleryLinux,
79-
UnsupportedLocalDns: true,
80-
UnsupportedGen2: true,
81-
SkipOldVHDValidations: true,
82-
}
83-
8473
VHDUbuntu2004FIPSGen2Containerd = &Image{
8574
Name: "2004gen2fipscontainerd",
8675
OS: OSUbuntu,

‎e2e/scenario_test.go‎

Lines changed: 15 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -838,33 +838,14 @@ func Test_Ubuntu2204FIPS(t *testing.T) {
838838
})
839839
}
840840

841-
func Test_Ubuntu2004FIPS(t *testing.T) {
842-
RunScenario(t, &Scenario{
843-
Description: "Tests that a node using the Ubuntu 2004 FIPS Gen1 VHD can be properly bootstrapped",
844-
Config: Config{
845-
Cluster: ClusterKubenet,
846-
VHD: config.VHDUbuntu2004FIPSContainerd,
847-
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
848-
},
849-
VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {
850-
},
851-
Validator: func(ctx context.Context, s *Scenario) {
852-
ValidateInstalledPackageVersion(ctx, s, "moby-containerd", components.GetExpectedPackageVersions("containerd", "ubuntu", "r2004")[0])
853-
ValidateInstalledPackageVersion(ctx, s, "moby-runc", components.GetExpectedPackageVersions("runc", "ubuntu", "r2004")[0])
854-
ValidateSSHServiceEnabled(ctx, s)
855-
ValidateFIPSProvider(ctx, s)
856-
},
857-
},
858-
})
859-
}
860-
861841
func Test_Ubuntu2004Gen2FIPS(t *testing.T) {
862842
RunScenario(t, &Scenario{
863843
Description: "Tests that a node using the Ubuntu 2004 FIPS Gen2 VHD can be properly bootstrapped",
864844
Config: Config{
865845
Cluster: ClusterKubenet,
866846
VHD: config.VHDUbuntu2004FIPSGen2Containerd,
867847
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
848+
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
868849
},
869850
VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {
870851
},
@@ -2800,8 +2781,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Enabled(t *testing.T) {
28002781
Cluster: ClusterLatestKubernetesVersion,
28012782
VHD: config.VHDUbuntu2204Gen2Containerd,
28022783
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
2803-
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
2804-
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
2784+
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
2785+
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
28052786
// Enable ServiceAccountImagePullProfile with test values
28062787
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
28072788
Enabled: true,
@@ -2836,8 +2817,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Disabled(t *testing.T) {
28362817
Cluster: ClusterLatestKubernetesVersion,
28372818
VHD: config.VHDUbuntu2204Gen2Containerd,
28382819
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
2839-
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
2840-
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
2820+
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
2821+
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
28412822
// Explicitly disable ServiceAccountImagePullProfile
28422823
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
28432824
Enabled: false,
@@ -2867,8 +2848,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_EnabledWithoutDefaultIDs(t *te
28672848
Cluster: ClusterLatestKubernetesVersion,
28682849
VHD: config.VHDUbuntu2204Gen2Containerd,
28692850
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
2870-
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
2871-
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
2851+
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
2852+
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
28722853
// Enable ServiceAccountImagePullProfile without default client/tenant IDs
28732854
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
28742855
Enabled: true,
@@ -2907,8 +2888,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_NetworkIsolated(t *testing.T)
29072888
Cluster: ClusterAzureBootstrapProfileCache,
29082889
VHD: config.VHDUbuntu2204Gen2Containerd,
29092890
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
2910-
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
2911-
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
2891+
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
2892+
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
29122893
// Enable ServiceAccountImagePullProfile with test values
29132894
nbc.ContainerService.Properties.SecurityProfile = &datamodel.SecurityProfile{
29142895
PrivateEgress: &datamodel.PrivateEgress{
@@ -2952,7 +2933,7 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Enabled_Scriptless(t *testing.
29522933
Cluster: ClusterLatestKubernetesVersion,
29532934
VHD: config.VHDUbuntu2204Gen2Containerd,
29542935
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
2955-
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
2936+
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
29562937
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
29572938
Enabled: true,
29582939
DefaultClientID: "test-client-id-12345",
@@ -2963,8 +2944,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Enabled_Scriptless(t *testing.
29632944
nbc.KubeletConfig["--image-credential-provider-bin-dir"] = "/var/lib/kubelet/credential-provider"
29642945
},
29652946
AKSNodeConfigMutator: func(_ *Cluster, aksConfig *aksnodeconfigv1.Configuration) {
2966-
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
2967-
aksConfig.KubernetesVersion = "1.34.0"
2947+
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
2948+
aksConfig.KubernetesVersion = "1.34.8"
29682949
// Enable ServiceAccountImagePullProfile with test values
29692950
aksConfig.ServiceAccountImagePullProfile = &aksnodeconfigv1.ServiceAccountImagePullProfile{
29702951
Enabled: true,
@@ -3008,7 +2989,7 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Disabled_Scriptless(t *testing
30082989
Cluster: ClusterLatestKubernetesVersion,
30092990
VHD: config.VHDUbuntu2204Gen2Containerd,
30102991
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
3011-
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
2992+
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
30122993
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
30132994
Enabled: false,
30142995
DefaultClientID: "should-not-appear-client-id",
@@ -3019,8 +3000,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Disabled_Scriptless(t *testing
30193000
nbc.KubeletConfig["--image-credential-provider-bin-dir"] = "/var/lib/kubelet/credential-provider"
30203001
},
30213002
AKSNodeConfigMutator: func(_ *Cluster, aksConfig *aksnodeconfigv1.Configuration) {
3022-
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
3023-
aksConfig.KubernetesVersion = "1.34.0"
3003+
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
3004+
aksConfig.KubernetesVersion = "1.34.8"
30243005
// Disable ServiceAccountImagePullProfile
30253006
aksConfig.ServiceAccountImagePullProfile = &aksnodeconfigv1.ServiceAccountImagePullProfile{
30263007
Enabled: false,

0 commit comments

Comments
 (0)