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

Commit

Permalink
AKS distro is for Kubernetes only (#3951)
Browse files Browse the repository at this point in the history
  • Loading branch information
jackfrancis authored Oct 4, 2018
1 parent a0948f2 commit 6dd1876
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
14 changes: 8 additions & 6 deletions pkg/acsengine/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -491,10 +491,11 @@ func setExtensionDefaults(a *api.Properties) {
}

func setMasterProfileDefaults(a *api.Properties, isUpgrade bool) {
// don't default Distro for OpenShift
if !a.OrchestratorProfile.IsOpenShift() {
if a.MasterProfile.Distro == "" {
if a.MasterProfile.Distro == "" {
if a.OrchestratorProfile.IsKubernetes() {
a.MasterProfile.Distro = api.AKS
} else if !a.OrchestratorProfile.IsOpenShift() {
a.MasterProfile.Distro = api.Ubuntu
}
}
// set default to VMAS for now
Expand Down Expand Up @@ -646,14 +647,15 @@ func setAgentProfileDefaults(a *api.Properties, isUpgrade, isScale bool) {
profile.AcceleratedNetworkingEnabled = helpers.PointerToBool(!isUpgrade && !isScale && helpers.AcceleratedNetworkingSupported(profile.VMSize))
}

// don't default Distro for OpenShift
if !a.OrchestratorProfile.IsOpenShift() {
if profile.Distro == "" {
if profile.Distro == "" {
if a.OrchestratorProfile.IsKubernetes() {
if profile.OSDiskSizeGB != 0 && profile.OSDiskSizeGB < api.VHDDiskSizeAKS {
profile.Distro = api.Ubuntu
} else {
profile.Distro = api.AKS
}
} else if !a.OrchestratorProfile.IsOpenShift() {
profile.Distro = api.Ubuntu
}
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/acsengine/defaults_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -652,14 +652,14 @@ func TestSetComponentsNetworkDefaults(t *testing.T) {
expectedDistro api.Distro // expected result default disto to be used
}{
{
"ubuntu_kubernetes",
"default_kubernetes",
api.OrchestratorProfile{
OrchestratorType: api.Kubernetes,
},
api.AKS,
},
{
"rhel_openshift",
"default_openshift",
api.OrchestratorProfile{
OrchestratorType: api.OpenShift,
},
Expand Down

0 comments on commit 6dd1876

Please sign in to comment.