Skip to content

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

Merge pull request #47489 from Mashimiao/cm-remove-unneeded

Automatic merge from submit-queue (batch tested with PRs 48264, 48324, 48125, 47944, 47489) remove unneeded variable Signed-off-by: 's avatarMa Shimiao <mashimiao.fnst@cn.fujitsu.com> **What this PR does / why we need it**: small fix, remove unneeded variable **Release note**: ```release-note NONE ```
parents ed8993e3 ec3bbf73
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
cmd/cloud-controller-manager/app/controllermanager.go
View file @ f663c4c8
...@@ -253,9 +253,8 @@ func StartControllers(s *options.CloudControllerManagerServer, kubeconfig *restc ...@@ -253,9 +253,8 @@ func StartControllers(s *options.CloudControllerManagerServer, kubeconfig *restc
// If apiserver is not running we should wait for some time and fail only then. This is particularly // If apiserver is not running we should wait for some time and fail only then. This is particularly
// important when we start apiserver and controller manager at the same time. // important when we start apiserver and controller manager at the same time.
var versionStrings []string
err = wait.PollImmediate(time.Second, 10*time.Second, func() (bool, error) { err = wait.PollImmediate(time.Second, 10*time.Second, func() (bool, error) {
if versionStrings, err = restclient.ServerAPIVersions(kubeconfig); err == nil { if _, err = restclient.ServerAPIVersions(kubeconfig); err == nil {
return true, nil return true, nil
} }
glog.Errorf("Failed to get api versions from server: %v", err) glog.Errorf("Failed to get api versions from server: %v", err)
......
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