Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit 0a7c607

Browse files
author
Kubernetes Submit Queue
authored
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
2 parents ec75a5e + c0a02a6 commit 0a7c607

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,15 +335,15 @@ func waitLoadbalancerActiveProvisioningStatus(client *gophercloud.ServiceClient,
335335
if loadbalancer.ProvisioningStatus == activeStatus {
336336
return true, nil
337337
} else if loadbalancer.ProvisioningStatus == errorStatus {
338-
return true, fmt.Errorf("Loadbalancer has gone into ERROR state")
338+
return true, fmt.Errorf("loadbalancer has gone into ERROR state")
339339
} else {
340340
return false, nil
341341
}
342342

343343
})
344344

345345
if err == wait.ErrWaitTimeout {
346-
err = fmt.Errorf("Loadbalancer failed to go into ACTIVE provisioning status within alloted time")
346+
err = fmt.Errorf("loadbalancer failed to go into ACTIVE provisioning status within alloted time")
347347
}
348348
return provisioningStatus, err
349349
}
@@ -368,7 +368,7 @@ func waitLoadbalancerDeleted(client *gophercloud.ServiceClient, loadbalancerID s
368368
})
369369

370370
if err == wait.ErrWaitTimeout {
371-
err = fmt.Errorf("Loadbalancer failed to delete within the alloted time")
371+
err = fmt.Errorf("loadbalancer failed to delete within the alloted time")
372372
}
373373

374374
return err
@@ -444,7 +444,7 @@ func (lbaas *LbaasV2) createLoadBalancer(service *v1.Service, name string, inter
444444

445445
loadbalancer, err := loadbalancers.Create(lbaas.network, createOpts).Extract()
446446
if err != nil {
447-
return nil, fmt.Errorf("Error creating loadbalancer %v: %v", createOpts, err)
447+
return nil, fmt.Errorf("error creating loadbalancer %v: %v", createOpts, err)
448448
}
449449
return loadbalancer, nil
450450
}
@@ -465,7 +465,7 @@ func (lbaas *LbaasV2) GetLoadBalancer(clusterName string, service *v1.Service) (
465465
if portID != "" {
466466
floatIP, err := getFloatingIPByPortID(lbaas.network, portID)
467467
if err != nil {
468-
return nil, false, fmt.Errorf("Error getting floating ip for port %s: %v", portID, err)
468+
return nil, false, fmt.Errorf("error getting floating ip for port %s: %v", portID, err)
469469
}
470470
status.Ingress = []v1.LoadBalancerIngress{{IP: floatIP.FloatingIP}}
471471
} else {

0 commit comments

Comments
 (0)