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

Merge pull request #74126 from danielqsj/cu

Browse Source 
correct error string according to golang best practice
This commit is contained in:
Kubernetes Prow Robot 2019-02-21 09:21:50 -08:00 committed by GitHub
commit 9b87046cb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/controller/controller_utils.go
View File

@ -126,7 +126,7 @@ var ExpKeyFunc = func(obj interface{}) (string, error) {
if e, ok := obj.(*ControlleeExpectations); ok { if e, ok := obj.(*ControlleeExpectations); ok {
return e.key, nil return e.key, nil
} }
return "", fmt.Errorf("Could not find key for obj %#v", obj) return "", fmt.Errorf("could not find key for obj %#v", obj)
} }
// ControllerExpectationsInterface is an interface that allows users to set and wait on expectations. // ControllerExpectationsInterface is an interface that allows users to set and wait on expectations.
@ -291,7 +291,7 @@ var UIDSetKeyFunc = func(obj interface{}) (string, error) {
if u, ok := obj.(*UIDSet); ok { if u, ok := obj.(*UIDSet); ok {
return u.key, nil return u.key, nil
} }
return "", fmt.Errorf("Could not find key for obj %#v", obj) return "", fmt.Errorf("could not find key for obj %#v", obj)
} }
// UIDSet holds a key and a set of UIDs. Used by the // UIDSet holds a key and a set of UIDs. Used by the
@ -627,7 +627,7 @@ func (f *FakePodControl) CreatePods(namespace string, spec *v1.PodTemplateSpec,
defer f.Unlock() defer f.Unlock()
f.CreateCallCount++ f.CreateCallCount++
if f.CreateLimit != 0 && f.CreateCallCount > f.CreateLimit { if f.CreateLimit != 0 && f.CreateCallCount > f.CreateLimit {
return fmt.Errorf("Not creating pod, limit %d already reached (create call %d)", f.CreateLimit, f.CreateCallCount) return fmt.Errorf("not creating pod, limit %d already reached (create call %d)", f.CreateLimit, f.CreateCallCount)
} }
f.Templates = append(f.Templates, *spec) f.Templates = append(f.Templates, *spec)
if f.Err != nil { if f.Err != nil {
@ -641,7 +641,7 @@ func (f *FakePodControl) CreatePodsWithControllerRef(namespace string, spec *v1.
defer f.Unlock() defer f.Unlock()
f.CreateCallCount++ f.CreateCallCount++
if f.CreateLimit != 0 && f.CreateCallCount > f.CreateLimit { if f.CreateLimit != 0 && f.CreateCallCount > f.CreateLimit {
return fmt.Errorf("Not creating pod, limit %d already reached (create call %d)", f.CreateLimit, f.CreateCallCount) return fmt.Errorf("not creating pod, limit %d already reached (create call %d)", f.CreateLimit, f.CreateCallCount)
} }
f.Templates = append(f.Templates, *spec) f.Templates = append(f.Templates, *spec)
f.ControllerRefs = append(f.ControllerRefs, *controllerRef) f.ControllerRefs = append(f.ControllerRefs, *controllerRef)
@ -656,7 +656,7 @@ func (f *FakePodControl) CreatePodsOnNode(nodeName, namespace string, template *
defer f.Unlock() defer f.Unlock()
f.CreateCallCount++ f.CreateCallCount++
if f.CreateLimit != 0 && f.CreateCallCount > f.CreateLimit { if f.CreateLimit != 0 && f.CreateCallCount > f.CreateLimit {
return fmt.Errorf("Not creating pod, limit %d already reached (create call %d)", f.CreateLimit, f.CreateCallCount) return fmt.Errorf("not creating pod, limit %d already reached (create call %d)", f.CreateLimit, f.CreateCallCount)
} }
f.Templates = append(f.Templates, *template) f.Templates = append(f.Templates, *template)
f.ControllerRefs = append(f.ControllerRefs, *controllerRef) f.ControllerRefs = append(f.ControllerRefs, *controllerRef)
@ -920,7 +920,7 @@ func AddOrUpdateTaintOnNode(c clientset.Interface, nodeName string, taints ...*v
for _, taint := range taints { for _, taint := range taints {
curNewNode, ok, err := taintutils.AddOrUpdateTaint(oldNodeCopy, taint) curNewNode, ok, err := taintutils.AddOrUpdateTaint(oldNodeCopy, taint)
if err != nil { if err != nil {
return fmt.Errorf("Failed to update taint of node!") return fmt.Errorf("failed to update taint of node")
} }
updated = updated || ok updated = updated || ok
newNode = curNewNode newNode = curNewNode
@ -977,7 +977,7 @@ func RemoveTaintOffNode(c clientset.Interface, nodeName string, node *v1.Node, t
for _, taint := range taints { for _, taint := range taints {
curNewNode, ok, err := taintutils.RemoveTaint(oldNodeCopy, taint) curNewNode, ok, err := taintutils.RemoveTaint(oldNodeCopy, taint)
if err != nil { if err != nil {
return fmt.Errorf("Failed to remove taint of node!") return fmt.Errorf("failed to remove taint of node")
} }
updated = updated || ok updated = updated || ok
newNode = curNewNode newNode = curNewNode
@ -1021,7 +1021,7 @@ func WaitForCacheSync(controllerName string, stopCh <-chan struct{}, cacheSyncs
klog.Infof("Waiting for caches to sync for %s controller", controllerName) klog.Infof("Waiting for caches to sync for %s controller", controllerName)
if !cache.WaitForCacheSync(stopCh, cacheSyncs...) { if !cache.WaitForCacheSync(stopCh, cacheSyncs...) {
utilruntime.HandleError(fmt.Errorf("Unable to sync caches for %s controller", controllerName)) utilruntime.HandleError(fmt.Errorf("unable to sync caches for %s controller", controllerName))
return false return false
} }