Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

Commit

Permalink
feat: add Azure Stack support for k8s 1.18.18, 1.19.10, and 1.20.6
Browse files Browse the repository at this point in the history
  • Loading branch information
JesusAlvarezTorres committed Apr 30, 2021
1 parent 1747dcb commit 2485199
Show file tree
Hide file tree
Showing 5 changed files with 108 additions and 4 deletions.
47 changes: 47 additions & 0 deletions examples/azure-stack/conformance/kubernetes1.19.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"apiVersion": "vlabs",
"location": "",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.19",
"kubernetesConfig": {
"useInstanceMetadata": false,
"networkPlugin": "kubenet"
}
},
"customCloudProfile": {
"portalURL": "",
"identitySystem": ""
},
"masterProfile": {
"dnsPrefix": "",
"distro": "ubuntu",
"count": 3,
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "linuxpool",
"count": 3,
"vmSize": "Standard_D2_v2",
"distro": "ubuntu",
"availabilityProfile": "AvailabilitySet",
"AcceleratedNetworkingEnabled": false
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
47 changes: 47 additions & 0 deletions examples/azure-stack/conformance/kubernetes1.20.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"apiVersion": "vlabs",
"location": "",
"properties": {
"orchestratorProfile": {
"orchestratorRelease": "1.20",
"kubernetesConfig": {
"useInstanceMetadata": false,
"networkPlugin": "kubenet"
}
},
"customCloudProfile": {
"portalURL": "",
"identitySystem": ""
},
"masterProfile": {
"dnsPrefix": "",
"distro": "ubuntu",
"count": 3,
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "linuxpool",
"count": 3,
"vmSize": "Standard_D2_v2",
"distro": "ubuntu",
"availabilityProfile": "AvailabilitySet",
"AcceleratedNetworkingEnabled": false
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
10 changes: 8 additions & 2 deletions pkg/api/common/versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,10 @@ var AllKubernetesSupportedVersionsAzureStack = map[string]bool{
"1.17.11": false,
"1.17.17": true,
"1.18.10": false,
"1.18.15": true,
"1.18.15": false,
"1.18.18": true,
"1.19.10": true,
"1.20.6": true,
}

// AllKubernetesWindowsSupportedVersionsAzureStack maintain a set of available k8s Windows versions in aks-engine on Azure Stack
Expand All @@ -311,7 +314,10 @@ var AllKubernetesWindowsSupportedVersionsAzureStack = map[string]bool{
"1.17.11": false,
"1.17.17": true,
"1.18.10": false,
"1.18.15": true,
"1.18.15": false,
"1.18.18": true,
"1.19.10": true,
"1.20.6": true,
}

// GetDefaultKubernetesVersion returns the default Kubernetes version, that is the latest patch of the default release
Expand Down
4 changes: 3 additions & 1 deletion vhd/packer/configure-windows-vhd.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ function Get-FilesToCacheOnVHD {
);
"c:\akse-cache\win-k8s\" = @(
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.17-azs/windowszip/v1.17.17-azs-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.15-azs/windowszip/v1.18.15-azs-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.18-azs/windowszip/v1.18.18-azs-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.10-azs/windowszip/v1.19.10-azs-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.20.6-azs/windowszip/v1.20.6-azs-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.17/windowszip/v1.17.17-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.18/windowszip/v1.18.18-1int.zip",
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.10/windowszip/v1.19.10-1int.zip",
Expand Down
4 changes: 3 additions & 1 deletion vhd/packer/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,11 @@ echo " - busybox" >> ${VHD_LOGS_FILEPATH}
K8S_VERSIONS="
1.21.0
1.20.6
1.20.6-azs
1.19.10
1.19.10-azs
1.18.18
1.18.15-azs
1.18.18-azs
1.17.17
1.17.17-azs
"
Expand Down

0 comments on commit 2485199

Please sign in to comment.