github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check all backends for vmss and standard instances

Browse Source
This commit is contained in:
Pengfei Ni
2018-04-20 09:48:33 +08:00
parent efb7ae6ebc
commit c69cea41a0
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cloudprovider/providers/azure/azure_standard.go
View File

@@ -630,7 +630,8 @@ func (as *availabilitySet) ensureHostInPool(serviceName string, nodeName types.N
// sets, the same network interface couldn't be added to more than one load balancer of // sets, the same network interface couldn't be added to more than one load balancer of
// the same type. Omit those nodes (e.g. masters) so Azure ARM won't complain // the same type. Omit those nodes (e.g. masters) so Azure ARM won't complain
// about this. // about this.
backendPool := *newBackendPools[0].ID for _, pool := range newBackendPools {
backendPool := *pool.ID
matches := backendPoolIDRE.FindStringSubmatch(backendPool) matches := backendPoolIDRE.FindStringSubmatch(backendPool)
if len(matches) == 2 { if len(matches) == 2 {
lbName := matches[1] lbName := matches[1]
@@ -640,6 +641,7 @@ func (as *availabilitySet) ensureHostInPool(serviceName string, nodeName types.N
} }
} }
} }
}
newBackendPools = append(newBackendPools, newBackendPools = append(newBackendPools,
network.BackendAddressPool{ network.BackendAddressPool{

8
pkg/cloudprovider/providers/azure/azure_vmss.go
View File

@@ -627,7 +627,8 @@ func (ss *scaleSet) ensureHostsInVMSetPool(serviceName string, backendPoolID str
// the same network interface couldn't be added to more than one load balancer of // the same network interface couldn't be added to more than one load balancer of
// the same type. Omit those nodes (e.g. masters) so Azure ARM won't complain // the same type. Omit those nodes (e.g. masters) so Azure ARM won't complain
// about this. // about this.
backendPool := *newBackendPools[0].ID for _, pool := range newBackendPools {
backendPool := *pool.ID
matches := backendPoolIDRE.FindStringSubmatch(backendPool) matches := backendPoolIDRE.FindStringSubmatch(backendPool)
if len(matches) == 2 { if len(matches) == 2 {
lbName := matches[1] lbName := matches[1]
@@ -637,6 +638,7 @@ func (ss *scaleSet) ensureHostsInVMSetPool(serviceName string, backendPoolID str
} }
} }
} }
}
newBackendPools = append(newBackendPools, newBackendPools = append(newBackendPools,
computepreview.SubResource{ computepreview.SubResource{
@@ -696,7 +698,7 @@ func (ss *scaleSet) EnsureHostsInPool(serviceName string, nodes []*v1.Node, back
for ssName, instanceIDs := range scalesets { for ssName, instanceIDs := range scalesets {
// Only add nodes belonging to specified vmSet to basic LB backends. // Only add nodes belonging to specified vmSet to basic LB backends.
if !ss.useStandardLoadBalancer() && ssName != vmSetName { if !ss.useStandardLoadBalancer() && !strings.EqualFold(ssName, vmSetName) {
continue continue
} }
@@ -859,7 +861,7 @@ func (ss *scaleSet) EnsureBackendPoolDeleted(poolID, vmSetName string, backendAd
for ssName := range scalesets { for ssName := range scalesets {
// Only remove nodes belonging to specified vmSet to basic LB backends. // Only remove nodes belonging to specified vmSet to basic LB backends.
if !ss.useStandardLoadBalancer() && ssName != vmSetName { if !ss.useStandardLoadBalancer() && !strings.EqualFold(ssName, vmSetName) {
continue continue
} }