github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #60064 from tenxcloud/fix_cp_azure_grammar_error

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix grammar error of azure cloudprovider code

**What this PR does / why we need it**:
Fix grammar error to make it easy to understand

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-02-22 03:57:47 -08:00 committed by GitHub
commit c153aff99f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cloudprovider/providers/azure/azure_loadbalancer.go
View File

@ -233,7 +233,7 @@ func (az *Cloud) getServiceLoadBalancer(service *v1.Service, clusterName string,
} }
// selectLoadBalancer selects load balancer for the service in the cluster. // selectLoadBalancer selects load balancer for the service in the cluster.
// The selection algorithm selects the the load balancer with currently has // The selection algorithm selects the load balancer which currently has
// the minimum lb rules. If there are multiple LBs with same number of rules, // the minimum lb rules. If there are multiple LBs with same number of rules,
// then selects the first one (sorted based on name). // then selects the first one (sorted based on name).
func (az *Cloud) selectLoadBalancer(clusterName string, service *v1.Service, existingLBs *[]network.LoadBalancer, nodes []*v1.Node) (selectedLB *network.LoadBalancer, existsLb bool, err error) { func (az *Cloud) selectLoadBalancer(clusterName string, service *v1.Service, existingLBs *[]network.LoadBalancer, nodes []*v1.Node) (selectedLB *network.LoadBalancer, existsLb bool, err error) {

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

@ -132,7 +132,7 @@ func (az *Cloud) getLoadBalancerName(clusterName string, vmSetName string, isInt
return lbNamePrefix return lbNamePrefix
} }
// isMasterNode returns returns true is the node has a master role label. // isMasterNode returns true if the node has a master role label.
// The master role is determined by looking for: // The master role is determined by looking for:
// * a kubernetes.io/role="master" label // * a kubernetes.io/role="master" label
func isMasterNode(node *v1.Node) bool { func isMasterNode(node *v1.Node) bool {
@ -441,7 +441,7 @@ func (as *availabilitySet) GetIPByNodeName(name, vmSetName string) (string, erro
return targetIP, nil return targetIP, nil
} }
// getAgentPoolAvailabiliySets lists the virtual machines for for the resource group and then builds // getAgentPoolAvailabiliySets lists the virtual machines for the resource group and then builds
// a list of availability sets that match the nodes available to k8s. // a list of availability sets that match the nodes available to k8s.
func (as *availabilitySet) getAgentPoolAvailabiliySets(nodes []*v1.Node) (agentPoolAvailabilitySets *[]string, err error) { func (as *availabilitySet) getAgentPoolAvailabiliySets(nodes []*v1.Node) (agentPoolAvailabilitySets *[]string, err error) {
vms, err := as.VirtualMachineClientListWithRetry() vms, err := as.VirtualMachineClientListWithRetry()

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

@ -325,7 +325,7 @@ func (ss *scaleSet) listScaleSetVMs(scaleSetName string) ([]computepreview.Virtu
return allVMs, nil return allVMs, nil
} }
// getAgentPoolScaleSets lists the virtual machines for for the resource group and then builds // getAgentPoolScaleSets lists the virtual machines for the resource group and then builds
// a list of scale sets that match the nodes available to k8s. // a list of scale sets that match the nodes available to k8s.
func (ss *scaleSet) getAgentPoolScaleSets(nodes []*v1.Node) (*[]string, error) { func (ss *scaleSet) getAgentPoolScaleSets(nodes []*v1.Node) (*[]string, error) {
agentPoolScaleSets := &[]string{} agentPoolScaleSets := &[]string{}