Skip to content

Commit 6b8a64c

Browse files
awesomenixawesomenix
committed
ubuntu 2004 doesnt support 1.35, use 1.34
1 parent bd46aff commit 6b8a64c

1 file changed

Lines changed: 15 additions & 14 deletions

File tree

‎e2e/scenario_test.go‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,7 @@ func Test_Ubuntu2004FIPS(t *testing.T) {
845845
Cluster: ClusterKubenet,
846846
VHD: config.VHDUbuntu2004FIPSContainerd,
847847
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
848+
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
848849
},
849850
VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {
850851
},
@@ -2800,8 +2801,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Enabled(t *testing.T) {
28002801
Cluster: ClusterLatestKubernetesVersion,
28012802
VHD: config.VHDUbuntu2204Gen2Containerd,
28022803
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
2803-
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
2804-
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
2804+
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
2805+
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
28052806
// Enable ServiceAccountImagePullProfile with test values
28062807
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
28072808
Enabled: true,
@@ -2836,8 +2837,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Disabled(t *testing.T) {
28362837
Cluster: ClusterLatestKubernetesVersion,
28372838
VHD: config.VHDUbuntu2204Gen2Containerd,
28382839
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
2839-
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
2840-
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
2840+
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
2841+
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
28412842
// Explicitly disable ServiceAccountImagePullProfile
28422843
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
28432844
Enabled: false,
@@ -2867,8 +2868,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_EnabledWithoutDefaultIDs(t *te
28672868
Cluster: ClusterLatestKubernetesVersion,
28682869
VHD: config.VHDUbuntu2204Gen2Containerd,
28692870
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
2870-
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
2871-
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
2871+
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
2872+
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
28722873
// Enable ServiceAccountImagePullProfile without default client/tenant IDs
28732874
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
28742875
Enabled: true,
@@ -2907,8 +2908,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_NetworkIsolated(t *testing.T)
29072908
Cluster: ClusterAzureBootstrapProfileCache,
29082909
VHD: config.VHDUbuntu2204Gen2Containerd,
29092910
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
2910-
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
2911-
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
2911+
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
2912+
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
29122913
// Enable ServiceAccountImagePullProfile with test values
29132914
nbc.ContainerService.Properties.SecurityProfile = &datamodel.SecurityProfile{
29142915
PrivateEgress: &datamodel.PrivateEgress{
@@ -2952,7 +2953,7 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Enabled_Scriptless(t *testing.
29522953
Cluster: ClusterLatestKubernetesVersion,
29532954
VHD: config.VHDUbuntu2204Gen2Containerd,
29542955
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
2955-
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
2956+
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
29562957
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
29572958
Enabled: true,
29582959
DefaultClientID: "test-client-id-12345",
@@ -2963,8 +2964,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Enabled_Scriptless(t *testing.
29632964
nbc.KubeletConfig["--image-credential-provider-bin-dir"] = "/var/lib/kubelet/credential-provider"
29642965
},
29652966
AKSNodeConfigMutator: func(_ *Cluster, aksConfig *aksnodeconfigv1.Configuration) {
2966-
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
2967-
aksConfig.KubernetesVersion = "1.34.0"
2967+
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
2968+
aksConfig.KubernetesVersion = "1.34.8"
29682969
// Enable ServiceAccountImagePullProfile with test values
29692970
aksConfig.ServiceAccountImagePullProfile = &aksnodeconfigv1.ServiceAccountImagePullProfile{
29702971
Enabled: true,
@@ -3008,7 +3009,7 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Disabled_Scriptless(t *testing
30083009
Cluster: ClusterLatestKubernetesVersion,
30093010
VHD: config.VHDUbuntu2204Gen2Containerd,
30103011
BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
3011-
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.0"
3012+
nbc.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.34.8"
30123013
nbc.ContainerService.Properties.ServiceAccountImagePullProfile = &datamodel.ServiceAccountImagePullProfile{
30133014
Enabled: false,
30143015
DefaultClientID: "should-not-appear-client-id",
@@ -3019,8 +3020,8 @@ func Test_Ubuntu2204Gen2_ImagePullIdentityBinding_Disabled_Scriptless(t *testing
30193020
nbc.KubeletConfig["--image-credential-provider-bin-dir"] = "/var/lib/kubelet/credential-provider"
30203021
},
30213022
AKSNodeConfigMutator: func(_ *Cluster, aksConfig *aksnodeconfigv1.Configuration) {
3022-
// Enforce Kubernetes 1.34.0 for ServiceAccountImagePullProfile testing
3023-
aksConfig.KubernetesVersion = "1.34.0"
3023+
// Enforce Kubernetes 1.34.8 for ServiceAccountImagePullProfile testing
3024+
aksConfig.KubernetesVersion = "1.34.8"
30243025
// Disable ServiceAccountImagePullProfile
30253026
aksConfig.ServiceAccountImagePullProfile = &aksnodeconfigv1.ServiceAccountImagePullProfile{
30263027
Enabled: false,

0 commit comments

Comments
 (0)