github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Ensure we only run the cadvisor/docker init in !dockerless

Browse Source 
We do not want to run the `cadvisor/docker` init when we are using the
dockerless build tags. We can ensure this by isolating into a separate
file with the proper build tag constraints.
This commit is contained in:
mattjmcnaughton 2020-03-24 16:59:59 -04:00
parent 29fa1f4566
commit 49fc82f7ab
No known key found for this signature in database
GPG Key ID: BC530981A9A1CC9D
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/cadvisor/BUILD
View File

@ -10,6 +10,7 @@ go_library(
name = "go_default_library", name = "go_default_library",
srcs = [ srcs = [
"cadvisor_linux.go", "cadvisor_linux.go",
"cadvisor_linux_docker.go",
"cadvisor_unsupported.go", "cadvisor_unsupported.go",
"cadvisor_windows.go", "cadvisor_windows.go",
"doc.go", "doc.go",

1
pkg/kubelet/cadvisor/cadvisor_linux.go
View File

@ -29,7 +29,6 @@ import (
// Register supported container handlers. // Register supported container handlers.
_ "github.com/google/cadvisor/container/containerd/install" _ "github.com/google/cadvisor/container/containerd/install"
_ "github.com/google/cadvisor/container/crio/install" _ "github.com/google/cadvisor/container/crio/install"
_ "github.com/google/cadvisor/container/docker/install"
_ "github.com/google/cadvisor/container/systemd/install" _ "github.com/google/cadvisor/container/systemd/install"
// Register cloud info providers. // Register cloud info providers.

25
pkg/kubelet/cadvisor/cadvisor_linux_docker.go Normal file
View File

@ -0,0 +1,25 @@
// +build linux,!dockerless
/*
Copyright 2020 The Kubernetes Authors.
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 cadvisor
import (
// We only want to perform this docker specific cadvisor init when we are not
// using the `dockerless` build tag.
_ "github.com/google/cadvisor/container/docker/install"
)