From 49fc82f7abfa3bf841dbe403ebf0d459c00bc8d1 Mon Sep 17 00:00:00 2001
From: mattjmcnaughton <mattjmcnaughton@gmail.com>
Date: Tue, 24 Mar 2020 16:59:59 -0400
Subject: [PATCH] Ensure we only run the `cadvisor/docker` init in !dockerless

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.
---
 pkg/kubelet/cadvisor/BUILD                    |  1 +
 pkg/kubelet/cadvisor/cadvisor_linux.go        |  1 -
 pkg/kubelet/cadvisor/cadvisor_linux_docker.go | 25 +++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkg/kubelet/cadvisor/cadvisor_linux_docker.go

diff --git a/pkg/kubelet/cadvisor/BUILD b/pkg/kubelet/cadvisor/BUILD
index f3d64675cee..a965343615f 100644
--- a/pkg/kubelet/cadvisor/BUILD
+++ b/pkg/kubelet/cadvisor/BUILD
@@ -10,6 +10,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "cadvisor_linux.go",
+        "cadvisor_linux_docker.go",
         "cadvisor_unsupported.go",
         "cadvisor_windows.go",
         "doc.go",
diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go
index 7f52070b146..7d20b77e2a6 100644
--- a/pkg/kubelet/cadvisor/cadvisor_linux.go
+++ b/pkg/kubelet/cadvisor/cadvisor_linux.go
@@ -29,7 +29,6 @@ import (
 	// Register supported container handlers.
 	_ "github.com/google/cadvisor/container/containerd/install"
 	_ "github.com/google/cadvisor/container/crio/install"
-	_ "github.com/google/cadvisor/container/docker/install"
 	_ "github.com/google/cadvisor/container/systemd/install"
 
 	// Register cloud info providers.
diff --git a/pkg/kubelet/cadvisor/cadvisor_linux_docker.go b/pkg/kubelet/cadvisor/cadvisor_linux_docker.go
new file mode 100644
index 00000000000..46802f7c52f
--- /dev/null
+++ b/pkg/kubelet/cadvisor/cadvisor_linux_docker.go
@@ -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"
+)