github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #55663 from whateverv5/openstack-log 

Automatic merge from submit-queue (batch tested with PRs 53780, 55663, 55321, 52421, 55659). 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>.

Using lower case of fmt.Errorf

**Special notes for your reviewer**:
follow up #54280

**Release note**:
```release-note
NONE
```

/assign @NickrenREN 
/assign @anguslees
pull/6/head
Kubernetes Submit Queue 2017-11-15 09:30:29 -08:00 committed by GitHub
parent 5e178936a1 aafac9fec2
commit 3468963837
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View File

@ -335,7 +335,7 @@ func waitLoadbalancerActiveProvisioningStatus(client *gophercloud.ServiceClient,
if loadbalancer.ProvisioningStatus == activeStatus {
return true, nil
} else if loadbalancer.ProvisioningStatus == errorStatus {
return true, fmt.Errorf("Loadbalancer has gone into ERROR state")
return true, fmt.Errorf("loadbalancer has gone into ERROR state")
} else {
return false, nil
}
@ -343,7 +343,7 @@ func waitLoadbalancerActiveProvisioningStatus(client *gophercloud.ServiceClient,
})
if err == wait.ErrWaitTimeout {
err = fmt.Errorf("Loadbalancer failed to go into ACTIVE provisioning status within alloted time")
err = fmt.Errorf("loadbalancer failed to go into ACTIVE provisioning status within alloted time")
}
return provisioningStatus, err
}
@ -368,7 +368,7 @@ func waitLoadbalancerDeleted(client *gophercloud.ServiceClient, loadbalancerID s
})
if err == wait.ErrWaitTimeout {
err = fmt.Errorf("Loadbalancer failed to delete within the alloted time")
err = fmt.Errorf("loadbalancer failed to delete within the alloted time")
}
return err
@ -444,7 +444,7 @@ func (lbaas *LbaasV2) createLoadBalancer(service *v1.Service, name string, inter
loadbalancer, err := loadbalancers.Create(lbaas.network, createOpts).Extract()
if err != nil {
return nil, fmt.Errorf("Error creating loadbalancer %v: %v", createOpts, err)
return nil, fmt.Errorf("error creating loadbalancer %v: %v", createOpts, err)
}
return loadbalancer, nil
}
@ -465,7 +465,7 @@ func (lbaas *LbaasV2) GetLoadBalancer(clusterName string, service *v1.Service) (
if portID != "" {
floatIP, err := getFloatingIPByPortID(lbaas.network, portID)
if err != nil {
return nil, false, fmt.Errorf("Error getting floating ip for port %s: %v", portID, err)
return nil, false, fmt.Errorf("error getting floating ip for port %s: %v", portID, err)
}
status.Ingress = []v1.LoadBalancerIngress{{IP: floatIP.FloatingIP}}
} else {