Skip to content

K
k3s
Commit 8863bd43 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45709 from YuPengZTE/devGetAllDaemonSetPods

Automatic merge from submit-queue (batch tested with PRs 45709, 41939) delete err when return _ Signed-off-by: 's avataryupengzte <yu.peng36@zte.com.cn> **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note ```
parents 810b4096 e463c28d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
pkg/controller/daemon/update.go
View file @ 8863bd43
...@@ -38,7 +38,7 @@ func (dsc *DaemonSetsController) rollingUpdate(ds *extensions.DaemonSet) error { ...@@ -38,7 +38,7 @@ func (dsc *DaemonSetsController) rollingUpdate(ds *extensions.DaemonSet) error {
return fmt.Errorf("couldn't get node to daemon pod mapping for daemon set %q: %v", ds.Name, err) return fmt.Errorf("couldn't get node to daemon pod mapping for daemon set %q: %v", ds.Name, err)
} }
_, oldPods, err := dsc.getAllDaemonSetPods(ds, nodeToDaemonPods) _, oldPods := dsc.getAllDaemonSetPods(ds, nodeToDaemonPods)
maxUnavailable, numUnavailable, err := dsc.getUnavailableNumbers(ds, nodeToDaemonPods) maxUnavailable, numUnavailable, err := dsc.getUnavailableNumbers(ds, nodeToDaemonPods)
if err != nil { if err != nil {
return fmt.Errorf("Couldn't get unavailable numbers: %v", err) return fmt.Errorf("Couldn't get unavailable numbers: %v", err)
...@@ -71,7 +71,7 @@ func (dsc *DaemonSetsController) rollingUpdate(ds *extensions.DaemonSet) error { ...@@ -71,7 +71,7 @@ func (dsc *DaemonSetsController) rollingUpdate(ds *extensions.DaemonSet) error {
return utilerrors.NewAggregate(errors) return utilerrors.NewAggregate(errors)
} }
func (dsc *DaemonSetsController) getAllDaemonSetPods(ds *extensions.DaemonSet, nodeToDaemonPods map[string][]*v1.Pod) ([]*v1.Pod, []*v1.Pod, error) { func (dsc *DaemonSetsController) getAllDaemonSetPods(ds *extensions.DaemonSet, nodeToDaemonPods map[string][]*v1.Pod) ([]*v1.Pod, []*v1.Pod) {
var newPods []*v1.Pod var newPods []*v1.Pod
var oldPods []*v1.Pod var oldPods []*v1.Pod
...@@ -84,7 +84,7 @@ func (dsc *DaemonSetsController) getAllDaemonSetPods(ds *extensions.DaemonSet, n ...@@ -84,7 +84,7 @@ func (dsc *DaemonSetsController) getAllDaemonSetPods(ds *extensions.DaemonSet, n
} }
} }
} }
return newPods, oldPods, nil return newPods, oldPods
} }
func (dsc *DaemonSetsController) getUnavailableNumbers(ds *extensions.DaemonSet, nodeToDaemonPods map[string][]*v1.Pod) (int, int, error) { func (dsc *DaemonSetsController) getUnavailableNumbers(ds *extensions.DaemonSet, nodeToDaemonPods map[string][]*v1.Pod) (int, int, error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment