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

Commit

Permalink
feat: add support for Kubernetes 1.15.0 (#1502)
Browse files Browse the repository at this point in the history
* feat: add support for Kubernetes 1.15.0

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.15.md

* docs: add example cluster configs for 1.15 and 1.14

* fix: update PSP test case expectation
  • Loading branch information
mboersma authored and jackfrancis committed Jun 22, 2019
1 parent 0eb1703 commit 34d3e66
Show file tree
Hide file tree
Showing 5 changed files with 79 additions and 7 deletions.
35 changes: 35 additions & 0 deletions examples/kubernetes-releases/kubernetes1.14.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.14"
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v3"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
35 changes: 35 additions & 0 deletions examples/kubernetes-releases/kubernetes1.15.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorRelease": "1.15"
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v3"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": ""
}
]
}
},
"servicePrincipalProfile": {
"clientId": "",
"secret": ""
}
}
}
1 change: 1 addition & 0 deletions packer/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ echo " - busybox" >> ${RELEASE_NOTES_FILEPATH}

# TODO: fetch supported k8s versions from an aks-engine command instead of hardcoding them here
K8S_VERSIONS="
1.15.0
1.14.3
1.14.1
1.14.1-azs
Expand Down
13 changes: 7 additions & 6 deletions pkg/api/common/versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,13 @@ var AllKubernetesSupportedVersions = map[string]bool{
"1.14.1": true,
"1.14.2": false, // disabled because of https://github.com/kubernetes/kubernetes/issues/78308
"1.14.3": true,
"1.15.0-alpha.1": true,
"1.15.0-alpha.2": true,
"1.15.0-alpha.3": true,
"1.15.0-beta.1": true,
"1.15.0-beta.2": true,
"1.15.0-rc.1": true,
"1.15.0-alpha.1": false,
"1.15.0-alpha.2": false,
"1.15.0-alpha.3": false,
"1.15.0-beta.1": false,
"1.15.0-beta.2": false,
"1.15.0-rc.1": false,
"1.15.0": true,
}

// GetDefaultKubernetesVersion returns the default Kubernetes version, that is the latest patch of the default release
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/defaults_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2455,7 +2455,7 @@ func TestDefaultEnablePodSecurityPolicy(t *testing.T) {
MasterProfile: &MasterProfile{},
},
},
expected: false,
expected: true,
},
{
name: "default",
Expand Down

0 comments on commit 34d3e66

Please sign in to comment.