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

feat: add support for Kubernetes 1.15.0 #1502

Merged
merged 3 commits into from
Jun 20, 2019
Merged

feat: add support for Kubernetes 1.15.0 #1502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9614dfb
feat: add support for Kubernetes 1.15.0
mboersma Jun 18, 2019
f60ba18
docs: add example cluster configs for 1.15 and 1.14
mboersma Jun 19, 2019
77cc578
fix: update PSP test case expectation
mboersma Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions examples/kubernetes-releases/kubernetes1.14.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,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
View file
Open in desktop
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
View file
Open in desktop
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