This repository was archived by the owner on Oct 24, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 5 files changed +79
-7
lines changed
examples/kubernetes-releases Expand file tree Collapse file tree 5 files changed +79
-7
lines changed Original file line number Diff line number Diff line change 1+ {
2+ "apiVersion" : " vlabs" ,
3+ "properties" : {
4+ "orchestratorProfile" : {
5+ "orchestratorType" : " Kubernetes" ,
6+ "orchestratorRelease" : " 1.14"
7+ },
8+ "masterProfile" : {
9+ "count" : 1 ,
10+ "dnsPrefix" : " " ,
11+ "vmSize" : " Standard_D2_v3"
12+ },
13+ "agentPoolProfiles" : [
14+ {
15+ "name" : " agentpool1" ,
16+ "count" : 3 ,
17+ "vmSize" : " Standard_D2_v3"
18+ }
19+ ],
20+ "linuxProfile" : {
21+ "adminUsername" : " azureuser" ,
22+ "ssh" : {
23+ "publicKeys" : [
24+ {
25+ "keyData" : " "
26+ }
27+ ]
28+ }
29+ },
30+ "servicePrincipalProfile" : {
31+ "clientId" : " " ,
32+ "secret" : " "
33+ }
34+ }
35+ }
Original file line number Diff line number Diff line change 1+ {
2+ "apiVersion" : " vlabs" ,
3+ "properties" : {
4+ "orchestratorProfile" : {
5+ "orchestratorType" : " Kubernetes" ,
6+ "orchestratorRelease" : " 1.15"
7+ },
8+ "masterProfile" : {
9+ "count" : 1 ,
10+ "dnsPrefix" : " " ,
11+ "vmSize" : " Standard_D2_v3"
12+ },
13+ "agentPoolProfiles" : [
14+ {
15+ "name" : " agentpool1" ,
16+ "count" : 3 ,
17+ "vmSize" : " Standard_D2_v3"
18+ }
19+ ],
20+ "linuxProfile" : {
21+ "adminUsername" : " azureuser" ,
22+ "ssh" : {
23+ "publicKeys" : [
24+ {
25+ "keyData" : " "
26+ }
27+ ]
28+ }
29+ },
30+ "servicePrincipalProfile" : {
31+ "clientId" : " " ,
32+ "secret" : " "
33+ }
34+ }
35+ }
Original file line number Diff line number Diff line change @@ -361,6 +361,7 @@ echo " - busybox" >> ${RELEASE_NOTES_FILEPATH}
361361
362362# TODO: fetch supported k8s versions from an aks-engine command instead of hardcoding them here
363363K8S_VERSIONS="
364+ 1.15.0
3643651.14.3
3653661.14.1
3663671.14.1-azs
Original file line number Diff line number Diff line change @@ -123,12 +123,13 @@ var AllKubernetesSupportedVersions = map[string]bool{
123123 "1.14.1" : true ,
124124 "1.14.2" : false , // disabled because of https://github.com/kubernetes/kubernetes/issues/78308
125125 "1.14.3" : true ,
126- "1.15.0-alpha.1" : true ,
127- "1.15.0-alpha.2" : true ,
128- "1.15.0-alpha.3" : true ,
129- "1.15.0-beta.1" : true ,
130- "1.15.0-beta.2" : true ,
131- "1.15.0-rc.1" : true ,
126+ "1.15.0-alpha.1" : false ,
127+ "1.15.0-alpha.2" : false ,
128+ "1.15.0-alpha.3" : false ,
129+ "1.15.0-beta.1" : false ,
130+ "1.15.0-beta.2" : false ,
131+ "1.15.0-rc.1" : false ,
132+ "1.15.0" : true ,
132133}
133134
134135// GetDefaultKubernetesVersion returns the default Kubernetes version, that is the latest patch of the default release
Original file line number Diff line number Diff line change @@ -2455,7 +2455,7 @@ func TestDefaultEnablePodSecurityPolicy(t *testing.T) {
24552455 MasterProfile : & MasterProfile {},
24562456 },
24572457 },
2458- expected : false ,
2458+ expected : true ,
24592459 },
24602460 {
24612461 name : "default" ,
You can’t perform that action at this time.
0 commit comments