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

Merge pull request #72815 from humblec/md 

Remove explicit `nil` initialization and correct error strings.
pull/564/head
Kubernetes Prow Robot 2019-01-12 01:32:17 -08:00 committed by GitHub
parent 7319aced08 11045ca28e
commit 8feab37d41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/endpoint/endpoints_controller.go
View File

@ -428,8 +428,8 @@ func (e *EndpointController) syncService(key string) error {
} }
subsets := []v1.EndpointSubset{} subsets := []v1.EndpointSubset{}
var totalReadyEps int = 0 var totalReadyEps int
var totalNotReadyEps int = 0 var totalNotReadyEps int
for _, pod := range pods { for _, pod := range pods {
if len(pod.Status.PodIP) == 0 { if len(pod.Status.PodIP) == 0 {
@ -559,8 +559,8 @@ func (e *EndpointController) checkLeftoverEndpoints() {
func addEndpointSubset(subsets []v1.EndpointSubset, pod *v1.Pod, epa v1.EndpointAddress, func addEndpointSubset(subsets []v1.EndpointSubset, pod *v1.Pod, epa v1.EndpointAddress,
epp *v1.EndpointPort, tolerateUnreadyEndpoints bool) ([]v1.EndpointSubset, int, int) { epp *v1.EndpointPort, tolerateUnreadyEndpoints bool) ([]v1.EndpointSubset, int, int) {
var readyEps int = 0 var readyEps int
var notReadyEps int = 0 var notReadyEps int
ports := []v1.EndpointPort{} ports := []v1.EndpointPort{}
if epp != nil { if epp != nil {
ports = append(ports, *epp) ports = append(ports, *epp)

6
pkg/controller/garbagecollector/operations.go
View File

@ -93,11 +93,11 @@ func (gc *GarbageCollector) removeFinalizer(owner *node, targetFinalizer string)
return nil return nil
} }
if err != nil { if err != nil {
return fmt.Errorf("cannot finalize owner %s, because cannot get it: %v. The garbage collector will retry later.", owner.identity, err) return fmt.Errorf("cannot finalize owner %s, because cannot get it: %v. The garbage collector will retry later", owner.identity, err)
} }
accessor, err := meta.Accessor(ownerObject) accessor, err := meta.Accessor(ownerObject)
if err != nil { if err != nil {
return fmt.Errorf("cannot access the owner object %v: %v. The garbage collector will retry later.", ownerObject, err) return fmt.Errorf("cannot access the owner object %v: %v. The garbage collector will retry later", ownerObject, err)
} }
finalizers := accessor.GetFinalizers() finalizers := accessor.GetFinalizers()
var newFinalizers []string var newFinalizers []string
@ -119,7 +119,7 @@ func (gc *GarbageCollector) removeFinalizer(owner *node, targetFinalizer string)
return err return err
}) })
if errors.IsConflict(err) { if errors.IsConflict(err) {
return fmt.Errorf("updateMaxRetries(%d) has reached. The garbage collector will retry later for owner %v.", retry.DefaultBackoff.Steps, owner.identity) return fmt.Errorf("updateMaxRetries(%d) has reached. The garbage collector will retry later for owner %v", retry.DefaultBackoff.Steps, owner.identity)
} }
return err return err
} }