Merge pull request #56003 from BenTheElder/fix-cross-cadvisor

Automatic merge from submit-queue. 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>. fix cadvisor.New signature for cross build **What this PR does / why we need it**: fixes the `pkg/kubelet/cadvisor.New` signature on non-linux platforms to match the new one on linux. This should fix the cross build **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #56002 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` /sig release

Merge pull request #56003 from BenTheElder/fix-cross-cadvisor
849d7f85 · Kubernetes Submit Queue · GitHub · db4134d0 · 1f34863b · 849d7f85
Unverified Commit 849d7f85 authored Nov 20, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

cadvisor_unsupported.go pkg/kubelet/cadvisor/cadvisor_unsupported.go +1 -1

cadvisor_windows.go pkg/kubelet/cadvisor/cadvisor_windows.go +1 -1

No files found.
--- a/pkg/kubelet/cadvisor/cadvisor_unsupported.go
+++ b/pkg/kubelet/cadvisor/cadvisor_unsupported.go
@@ -31,7 +31,7 @@ type cadvisorUnsupported struct {

 var _ Interface = new(cadvisorUnsupported)

-func New(address string, port uint, imageFsInfoProvider ImageFsInfoProvider, rootPath string) (Interface, error) {
+func New(address string, port uint, imageFsInfoProvider ImageFsInfoProvider, rootPath string, usingLegacyStats bool) (Interface, error) {
 	return &cadvisorUnsupported{}, nil
 }


--- a/pkg/kubelet/cadvisor/cadvisor_windows.go
+++ b/pkg/kubelet/cadvisor/cadvisor_windows.go
@@ -32,7 +32,7 @@ type cadvisorClient struct {
 var _ Interface = new(cadvisorClient)

 // New creates a cAdvisor and exports its API on the specified port if port > 0.
-func New(address string, port uint, imageFsInfoProvider ImageFsInfoProvider, rootPath string) (Interface, error) {
+func New(address string, port uint, imageFsInfoProvider ImageFsInfoProvider, rootPath string, usingLegacyStats bool) (Interface, error) {
 	client, err := winstats.NewPerfCounterClient()
 	return &cadvisorClient{winStatsClient: client}, err
 }