github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23519 from sttts/sttts-mac-test-compile

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-26 17:11:24 -07:00
commit ab20b884df
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/mesos/pkg/flagutil/cadvisor.go
View File

@ -19,10 +19,6 @@ package flagutil
import ( import (
"flag" "flag"
// TODO(jdef) kill this once cadvisor flags are no longer configured by
// global variables. Importing it this way guarantees that the global flag
// variables are initialized.
_ "github.com/google/cadvisor/manager"
// kubelet attempts to customize default values for some cadvisor flags, so // kubelet attempts to customize default values for some cadvisor flags, so
// make sure that we pick these up. // make sure that we pick these up.
_ "k8s.io/kubernetes/pkg/kubelet/cadvisor" _ "k8s.io/kubernetes/pkg/kubelet/cadvisor"

24
contrib/mesos/pkg/flagutil/cadvisor_linux.go Normal file
View File

@ -0,0 +1,24 @@
/*
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package flagutil
import (
// TODO(jdef) kill this once cadvisor flags are no longer configured by
// global variables. Importing it this way guarantees that the global flag
// variables are initialized.
_ "github.com/google/cadvisor/manager"
)