Skip to content

set vnet cluster nodes IP address counts to 1 for all vnet nodes #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhxu2 wants to merge 1 commit into
base: rel-v1.14.2
Choose a base branch
from
Open

set vnet cluster nodes IP address counts to 1 for all vnet nodes #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 3 additions & 14 deletions pkg/acsengine/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,9 @@ func setOrchestratorDefaults(cs *api.ContainerService) {

if a.OrchestratorProfile.KubernetesConfig.EnableRbac == nil {
a.OrchestratorProfile.KubernetesConfig.EnableRbac = pointerToBool(api.DefaultRBACEnabled)



}

if a.OrchestratorProfile.KubernetesConfig.EnableSecureKubelet == nil {
Expand Down Expand Up @@ -574,13 +577,6 @@ func setMasterNetworkDefaults(a *api.Properties, isUpgrade bool) {
if a.MasterProfile.IPAddressCount == 0 {
// Allocate one IP address for the node.
a.MasterProfile.IPAddressCount = 1

// Allocate IP addresses for pods if VNET integration is enabled.
if a.OrchestratorProfile.IsAzureCNI() {
if a.OrchestratorProfile.OrchestratorType == api.Kubernetes {
a.MasterProfile.IPAddressCount += a.OrchestratorProfile.KubernetesConfig.MaxPods
}
}
}

if a.MasterProfile.HTTPSourceAddressPrefix == "" {
Expand Down Expand Up @@ -618,13 +614,6 @@ func setAgentNetworkDefaults(a *api.Properties) {
if profile.IPAddressCount == 0 {
// Allocate one IP address for the node.
profile.IPAddressCount = 1

// Allocate IP addresses for pods if VNET integration is enabled.
if a.OrchestratorProfile.IsAzureCNI() {
if a.OrchestratorProfile.OrchestratorType == api.Kubernetes {
profile.IPAddressCount += a.OrchestratorProfile.KubernetesConfig.MaxPods
}
}
}
}
}
Expand Down