Skip to content

Commit 849d7f8

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#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 kubernetes#56002 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` /sig release
2 parents db4134d + 1f34863 commit 849d7f8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

pkg/kubelet/cadvisor/cadvisor_unsupported.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type cadvisorUnsupported struct {
3131

3232
var _ Interface = new(cadvisorUnsupported)
3333

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

pkg/kubelet/cadvisor/cadvisor_windows.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type cadvisorClient struct {
3232
var _ Interface = new(cadvisorClient)
3333

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

0 commit comments

Comments
 (0)