Add new Linux VHDs (#5041)

Azure · Jan 13, 2023 · 904b3ff · 904b3ff
1 parent 5c2febf
commit 904b3ff
Show file tree

Hide file tree

Showing 15 changed files with 1,673 additions and 15 deletions.
diff --git a/.pipelines/e2e-job-template.yaml b/.pipelines/e2e-job-template.yaml
@@ -35,6 +35,7 @@ jobs:
     MSI_USER_ASSIGNED_ID: '$(MSI_USER_ASSIGNED_ID_AKS_ENGINE_E2E)'
     CONTAINER_RUNTIME: ${{ parameters.containerRuntime }}
     BLOCK_SSH: ${{ parameters.runSSHTests }}
+    DISTRO: ${{ parameters.distro }}
 
   steps:
     - template: e2e-step-template.yaml

diff --git a/.pipelines/pr-e2e.yaml b/.pipelines/pr-e2e.yaml
@@ -132,3 +132,14 @@ jobs:
     enableKMSEncryption: false
     containerRuntime: 'containerd'
     runSSHTests: true
+
+- template: e2e-job-template.yaml
+  parameters:
+    name: 'k8s_1_24_2004_e2e'
+    k8sRelease: '1.24'
+    apimodel: 'examples/e2e-tests/kubernetes/release/default/definition-no-vnet.json'
+    createVNET: false
+    enableKMSEncryption: false
+    containerRuntime: 'containerd'
+    distro: 'aks-ubuntu-20.04'
+    runSSHTests: true
diff --git a/pkg/api/azenvtypes.go b/pkg/api/azenvtypes.go
@@ -148,7 +148,15 @@ var (
 		ImageOffer:     "aks",
 		ImageSku:       "aks-engine-ubuntu-1804-202112",
 		ImagePublisher: "microsoft-aks",
-		ImageVersion:   "2022.12.12",
+		ImageVersion:   "2023.01.10",
+	}
+
+	// AKSUbuntu2004OSImageConfig is the AKS Engine image based on Ubuntu 20.04-LTS.
+	AKSUbuntu2004OSImageConfig = AzureOSImageConfig{
+		ImageOffer:     "aks",
+		ImageSku:       "aks-engine-ubuntu-2004-202301",
+		ImagePublisher: "microsoft-aks",
+		ImageVersion:   "2023.01.10",
 	}
 
 	// AKSWindowsServer2019OSImageConfig is the aks-engine image based on Windows Server 2019
@@ -205,6 +213,7 @@ var (
 			AKS1604Deprecated: AKSUbuntu1604OSImageConfig, // for back-compat
 			AKSUbuntu1804:     AKSUbuntu1804OSImageConfig,
 			AKS1804Deprecated: AKSUbuntu1804OSImageConfig, // for back-compat
+			AKSUbuntu2004:     AKSUbuntu2004OSImageConfig,
 			ACC1604:           ACC1604OSImageConfig,
 		},
 	}
@@ -248,6 +257,7 @@ var (
 			AKS1604Deprecated: AKSUbuntu1604OSImageConfig, // for back-compat
 			AKSUbuntu1804:     AKSUbuntu1804OSImageConfig,
 			AKS1804Deprecated: AKSUbuntu1804OSImageConfig, // for back-compat
+			AKSUbuntu2004:     AKSUbuntu2004OSImageConfig,
 		},
 	}
 
@@ -290,6 +300,7 @@ var (
 			AKS1604Deprecated: AKSUbuntu1604OSImageConfig, // for back-compat
 			AKSUbuntu1804:     AKSUbuntu1804OSImageConfig,
 			AKS1804Deprecated: AKSUbuntu1804OSImageConfig, // for back-compat
+			AKSUbuntu2004:     AKSUbuntu2004OSImageConfig,
 		},
 	}
 

diff --git a/pkg/api/const.go b/pkg/api/const.go
@@ -28,6 +28,7 @@ const (
 	AKSDockerEngine   Distro = "aks-docker-engine" // deprecated docker-engine distro.
 	AKSUbuntu1604     Distro = "aks-ubuntu-16.04"
 	AKSUbuntu1804     Distro = "aks-ubuntu-18.04"
+	AKSUbuntu2004     Distro = "aks-ubuntu-20.04"
 	ACC1604           Distro = "acc-16.04"
 )
 

diff --git a/pkg/api/defaults-kubelet_test.go b/pkg/api/defaults-kubelet_test.go
@@ -760,7 +760,7 @@ func TestProtectKernelDefaults(t *testing.T) {
 	// Validate that --protect-kernel-defaults is "true" by default for relevant distros
 	for _, distro := range DistroValues {
 		switch distro {
-		case AKSUbuntu1604, AKSUbuntu1804:
+		case AKSUbuntu1604, AKSUbuntu1804, AKSUbuntu2004:
 			cs = CreateMockContainerService("testcluster", "", 3, 2, false)
 			cs.Properties.MasterProfile.Distro = distro
 			cs.Properties.AgentPoolProfiles[0].Distro = distro
@@ -839,7 +839,7 @@ func TestProtectKernelDefaults(t *testing.T) {
 	// Validate that --protect-kernel-defaults is overridable
 	for _, distro := range DistroValues {
 		switch distro {
-		case Ubuntu, Ubuntu2004, Ubuntu2004Gen2, Ubuntu1804, Ubuntu1804Gen2, AKSUbuntu1604, AKSUbuntu1804:
+		case Ubuntu, Ubuntu2004, Ubuntu2004Gen2, Ubuntu1804, Ubuntu1804Gen2, AKSUbuntu1604, AKSUbuntu1804, AKSUbuntu2004:
 			cs = CreateMockContainerService("testcluster", "", 3, 2, false)
 			cs.Properties.MasterProfile.Distro = "ubuntu"
 			cs.Properties.AgentPoolProfiles[0].Distro = "ubuntu"

diff --git a/pkg/api/defaults.go b/pkg/api/defaults.go
@@ -25,7 +25,7 @@ import (
 )
 
 // DistroValues is a list of currently supported distros
-var DistroValues = []Distro{"", Ubuntu, Ubuntu2004, Ubuntu2004Gen2, Ubuntu1804, Flatcar, AKSUbuntu1604, AKSUbuntu1804, Ubuntu1804Gen2, ACC1604}
+var DistroValues = []Distro{"", Ubuntu, Ubuntu2004, Ubuntu2004Gen2, Ubuntu1804, Flatcar, AKSUbuntu1604, AKSUbuntu1804, Ubuntu1804Gen2, AKSUbuntu2004, ACC1604}
 
 // PropertiesDefaultsParams is the parameters when we set the properties defaults for ContainerService.
 type PropertiesDefaultsParams struct {

diff --git a/pkg/api/types.go b/pkg/api/types.go
@@ -1286,7 +1286,7 @@ func (m *MasterProfile) IsStorageAccount() bool {
 
 // IsVHDDistro returns true if the distro uses VHD SKUs
 func (m *MasterProfile) IsVHDDistro() bool {
-	return m.Distro == AKSUbuntu1604 || m.Distro == AKSUbuntu1804
+	return m.Distro == AKSUbuntu1604 || m.Distro == AKSUbuntu1804 || m.Distro == AKSUbuntu2004
 }
 
 // IsAuditDEnabled returns true if the master profile is configured for auditd
@@ -1361,7 +1361,7 @@ func (m *MasterProfile) IsUbuntu1804() bool {
 // IsUbuntu2004 returns true if the master profile distro is based on Ubuntu 20.04
 func (m *MasterProfile) IsUbuntu2004() bool {
 	switch m.Distro {
-	case Ubuntu2004, Ubuntu2004Gen2:
+	case AKSUbuntu2004, Ubuntu2004, Ubuntu2004Gen2:
 		return true
 	default:
 		return false
@@ -1430,7 +1430,7 @@ func (a *AgentPoolProfile) IsFlatcar() bool {
 
 // IsVHDDistro returns true if the distro uses VHD SKUs
 func (a *AgentPoolProfile) IsVHDDistro() bool {
-	return a.Distro == AKSUbuntu1604 || a.Distro == AKSUbuntu1804
+	return a.Distro == AKSUbuntu1604 || a.Distro == AKSUbuntu1804 || a.Distro == AKSUbuntu2004
 }
 
 // IsAuditDEnabled returns true if the master profile is configured for auditd
@@ -1513,7 +1513,7 @@ func (a *AgentPoolProfile) IsUbuntu1804() bool {
 func (a *AgentPoolProfile) IsUbuntu2004() bool {
 	if a.OSType != Windows {
 		switch a.Distro {
-		case Ubuntu2004, Ubuntu2004Gen2:
+		case AKSUbuntu2004, Ubuntu2004, Ubuntu2004Gen2:
 			return true
 		default:
 			return false

diff --git a/pkg/api/vlabs/const.go b/pkg/api/vlabs/const.go
@@ -33,6 +33,7 @@ const (
 	AKSDockerEngine   Distro = "aks-docker-engine" // deprecated docker-engine distro.
 	AKSUbuntu1604     Distro = "aks-ubuntu-16.04"
 	AKSUbuntu1804     Distro = "aks-ubuntu-18.04"
+	AKSUbuntu2004     Distro = "aks-ubuntu-20.04"
 	ACC1604           Distro = "acc-16.04"
 )
 
@@ -100,7 +101,7 @@ var (
 	ContainerRuntimeValues = [...]string{"", Docker, Containerd}
 
 	// DistroValues holds the valid values for OS distros
-	DistroValues = []Distro{"", Ubuntu, Ubuntu2004, Ubuntu2004Gen2, Ubuntu1804, Ubuntu1804Gen2, Flatcar, AKSUbuntu1604, AKSUbuntu1804, ACC1604}
+	DistroValues = []Distro{"", Ubuntu, Ubuntu2004, Ubuntu2004Gen2, Ubuntu1804, Ubuntu1804Gen2, Flatcar, AKSUbuntu1604, AKSUbuntu1804, AKSUbuntu2004, ACC1604}
 
 	// DependenciesLocationValues holds the valid values for dependencies location
 	DependenciesLocationValues = []DependenciesLocation{"", AzureCustomCloudDependenciesLocationPublic, AzureCustomCloudDependenciesLocationChina, AzureCustomCloudDependenciesLocationGerman, AzureCustomCloudDependenciesLocationUSGovernment}

diff --git a/pkg/api/vlabs/types.go b/pkg/api/vlabs/types.go
@@ -750,7 +750,7 @@ func (m *MasterProfile) IsUbuntu1804() bool {
 // IsUbuntu2004 returns true if the master profile distro is based on Ubuntu 20.04
 func (m *MasterProfile) IsUbuntu2004() bool {
 	switch m.Distro {
-	case Ubuntu2004, Ubuntu2004Gen2:
+	case AKSUbuntu2004, Ubuntu2004, Ubuntu2004Gen2:
 		return true
 	default:
 		return false
@@ -938,7 +938,7 @@ func (a *AgentPoolProfile) IsUbuntu1804() bool {
 func (a *AgentPoolProfile) IsUbuntu2004() bool {
 	if a.OSType != Windows {
 		switch a.Distro {
-		case Ubuntu2004, Ubuntu2004Gen2:
+		case AKSUbuntu2004, Ubuntu2004, Ubuntu2004Gen2:
 			return true
 		default:
 			return false

diff --git a/pkg/api/vlabs/validate_test.go b/pkg/api/vlabs/validate_test.go
@@ -250,6 +250,11 @@ func Test_OrchestratorProfile_Validate(t *testing.T) {
 						Count:  10,
 						Distro: AKSUbuntu1804,
 					},
+					{
+						Name:   "ubuntu2004pool",
+						Count:  10,
+						Distro: AKSUbuntu2004,
+					},
 				},
 			},
 		},
@@ -4460,7 +4465,7 @@ func TestAgentPoolProfile_ValidateAuditDEnabled(t *testing.T) {
 				if err := cs.Properties.validateAgentPoolProfiles(false); err.Error() != expectedMsg {
 					t.Errorf("expected error with message : %s, but got %s", expectedMsg, err.Error())
 				}
-			case Ubuntu, Ubuntu1804, Ubuntu1804Gen2, AKSUbuntu1604, AKSUbuntu1804, ACC1604:
+			case Ubuntu, Ubuntu1804, Ubuntu1804Gen2, AKSUbuntu1604, AKSUbuntu1804, AKSUbuntu2004, ACC1604:
 				if err := cs.Properties.validateAgentPoolProfiles(false); err != nil {
 					t.Errorf("AuditDEnabled should work with distro %s, got error %s", distro, err.Error())
 				}
@@ -4483,7 +4488,7 @@ func TestMasterProfile_ValidateAuditDEnabled(t *testing.T) {
 				if err := cs.Properties.validateMasterProfile(false); err.Error() != expectedMsg {
 					t.Errorf("expected error with message : %s, but got %s", expectedMsg, err.Error())
 				}
-			case Ubuntu, Ubuntu1804, Ubuntu1804Gen2, AKSUbuntu1604, AKSUbuntu1804, ACC1604:
+			case Ubuntu, Ubuntu1804, Ubuntu1804Gen2, AKSUbuntu1604, AKSUbuntu1804, AKSUbuntu2004, ACC1604:
 				if err := cs.Properties.validateMasterProfile(false); err != nil {
 					t.Errorf("AuditDEnabled should work with distro %s, got error %s", distro, err.Error())
 				}

diff --git a/pkg/armhelpers/support_validator.go b/pkg/armhelpers/support_validator.go
@@ -90,6 +90,8 @@ func toImageConfig(distro api.Distro) api.AzureOSImageConfig {
 		return api.AKSUbuntu1604OSImageConfig
 	case api.AKSUbuntu1804:
 		return api.AKSUbuntu1804OSImageConfig
+	case api.AKSUbuntu2004:
+		return api.AKSUbuntu2004OSImageConfig
 	case api.ACC1604:
 		return api.ACC1604OSImageConfig
 	default:

diff --git a/test/e2e/engine/template.go b/test/e2e/engine/template.go
@@ -1,4 +1,6 @@
-//+build test
+//go:build test
+// +build test
+
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
@@ -428,7 +430,7 @@ func Build(cfg *config.Config, masterSubnetID string, agentSubnetIDs []string, i
 	if config.Distro != "" {
 		prop.MasterProfile.Distro = vlabs.Distro(config.Distro)
 		for _, pool := range prop.AgentPoolProfiles {
-			if !pool.IsWindows() {
+			if !pool.IsWindows() && pool.Distro == "" {
 				pool.Distro = vlabs.Distro(config.Distro)
 			}
 		}

diff --git a/...-engine-ubuntu-1804-202112_2022.12.12.txt → ...ne-ubuntu-1804-202112_2022.12.12 copy.txt b/...-engine-ubuntu-1804-202112_2022.12.12.txt → ...ne-ubuntu-1804-202112_2022.12.12 copy.txt