From b36f637f0d04659f2f0c4ba7d0c24cb117069c21 Mon Sep 17 00:00:00 2001
From: mattjmcnaughton <mattjmcnaughton@gmail.com>
Date: Sun, 2 Feb 2020 16:53:42 -0500
Subject: [PATCH] Add dockerless tags to all files in `dockershim`

As the final step, add the `dockerless` tags to all files in the
dockershim. Using `-tags=dockerless` in `go build`, we can compile
kubelet without the dockershim.

Once cadvisor no longer depends on `docker/docker`, compiling with
`-tags=dockerless` should be sufficient to compile the Kubelet w/o a
dependency on `docker/docker`.
---
 pkg/kubelet/dockershim/cm/container_manager.go                  | 2 ++
 pkg/kubelet/dockershim/cm/container_manager_linux.go            | 2 +-
 pkg/kubelet/dockershim/cm/container_manager_unsupported.go      | 2 +-
 pkg/kubelet/dockershim/cm/container_manager_windows.go          | 2 +-
 pkg/kubelet/dockershim/convert.go                               | 2 ++
 pkg/kubelet/dockershim/convert_test.go                          | 2 ++
 pkg/kubelet/dockershim/docker_checkpoint.go                     | 2 ++
 pkg/kubelet/dockershim/docker_checkpoint_test.go                | 2 ++
 pkg/kubelet/dockershim/docker_container.go                      | 2 ++
 pkg/kubelet/dockershim/docker_container_test.go                 | 2 ++
 pkg/kubelet/dockershim/docker_container_unsupported.go          | 2 +-
 pkg/kubelet/dockershim/docker_container_windows.go              | 2 +-
 pkg/kubelet/dockershim/docker_container_windows_test.go         | 2 ++
 pkg/kubelet/dockershim/docker_image.go                          | 2 ++
 pkg/kubelet/dockershim/docker_image_linux.go                    | 2 +-
 pkg/kubelet/dockershim/docker_image_test.go                     | 2 ++
 pkg/kubelet/dockershim/docker_image_unsupported.go              | 2 +-
 pkg/kubelet/dockershim/docker_image_windows.go                  | 2 +-
 pkg/kubelet/dockershim/docker_legacy_service.go                 | 2 ++
 pkg/kubelet/dockershim/docker_logs.go                           | 2 ++
 pkg/kubelet/dockershim/docker_sandbox.go                        | 2 ++
 pkg/kubelet/dockershim/docker_sandbox_test.go                   | 2 ++
 pkg/kubelet/dockershim/docker_service.go                        | 2 ++
 pkg/kubelet/dockershim/docker_service_test.go                   | 2 ++
 pkg/kubelet/dockershim/docker_stats.go                          | 2 ++
 pkg/kubelet/dockershim/docker_stats_linux.go                    | 2 +-
 pkg/kubelet/dockershim/docker_stats_test.go                     | 2 ++
 pkg/kubelet/dockershim/docker_stats_unsupported.go              | 2 +-
 pkg/kubelet/dockershim/docker_stats_windows.go                  | 2 +-
 pkg/kubelet/dockershim/docker_streaming.go                      | 2 ++
 pkg/kubelet/dockershim/docker_streaming_others.go               | 2 +-
 pkg/kubelet/dockershim/docker_streaming_windows.go              | 2 +-
 pkg/kubelet/dockershim/exec.go                                  | 2 ++
 pkg/kubelet/dockershim/helpers.go                               | 2 ++
 pkg/kubelet/dockershim/helpers_linux.go                         | 2 +-
 pkg/kubelet/dockershim/helpers_linux_test.go                    | 2 +-
 pkg/kubelet/dockershim/helpers_test.go                          | 2 ++
 pkg/kubelet/dockershim/helpers_unsupported.go                   | 2 +-
 pkg/kubelet/dockershim/helpers_windows.go                       | 2 +-
 pkg/kubelet/dockershim/libdocker/client.go                      | 2 ++
 pkg/kubelet/dockershim/libdocker/fake_client.go                 | 2 ++
 pkg/kubelet/dockershim/libdocker/helpers.go                     | 2 ++
 pkg/kubelet/dockershim/libdocker/helpers_test.go                | 2 ++
 pkg/kubelet/dockershim/libdocker/instrumented_client.go         | 2 ++
 pkg/kubelet/dockershim/libdocker/kube_docker_client.go          | 2 ++
 pkg/kubelet/dockershim/libdocker/kube_docker_client_test.go     | 2 ++
 pkg/kubelet/dockershim/metrics/metrics.go                       | 2 ++
 pkg/kubelet/dockershim/naming.go                                | 2 ++
 pkg/kubelet/dockershim/naming_test.go                           | 2 ++
 pkg/kubelet/dockershim/network/cni/cni.go                       | 2 ++
 pkg/kubelet/dockershim/network/cni/cni_others.go                | 2 +-
 pkg/kubelet/dockershim/network/cni/cni_test.go                  | 2 +-
 pkg/kubelet/dockershim/network/cni/cni_windows.go               | 2 +-
 pkg/kubelet/dockershim/network/cni/testing/mock_cni.go          | 2 ++
 pkg/kubelet/dockershim/network/hairpin/hairpin.go               | 2 ++
 pkg/kubelet/dockershim/network/hairpin/hairpin_test.go          | 2 ++
 pkg/kubelet/dockershim/network/hostport/fake_iptables.go        | 2 ++
 pkg/kubelet/dockershim/network/hostport/fake_iptables_test.go   | 2 ++
 pkg/kubelet/dockershim/network/hostport/hostport.go             | 2 ++
 pkg/kubelet/dockershim/network/hostport/hostport_manager.go     | 2 ++
 .../dockershim/network/hostport/hostport_manager_test.go        | 2 ++
 pkg/kubelet/dockershim/network/hostport/hostport_syncer.go      | 2 ++
 pkg/kubelet/dockershim/network/hostport/hostport_syncer_test.go | 2 ++
 pkg/kubelet/dockershim/network/hostport/hostport_test.go        | 2 ++
 pkg/kubelet/dockershim/network/hostport/testing/fake.go         | 2 ++
 pkg/kubelet/dockershim/network/kubenet/kubenet.go               | 2 ++
 pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go         | 2 +-
 pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go    | 2 ++
 pkg/kubelet/dockershim/network/kubenet/kubenet_unsupported.go   | 2 +-
 pkg/kubelet/dockershim/network/metrics/metrics.go               | 2 ++
 pkg/kubelet/dockershim/network/network.go                       | 2 ++
 pkg/kubelet/dockershim/network/plugins.go                       | 2 ++
 pkg/kubelet/dockershim/network/testing/fake_host.go             | 2 ++
 pkg/kubelet/dockershim/network/testing/mock_network_plugin.go   | 2 ++
 pkg/kubelet/dockershim/network/testing/plugins_test.go          | 2 ++
 pkg/kubelet/dockershim/remote/docker_server.go                  | 2 ++
 pkg/kubelet/dockershim/security_context.go                      | 2 ++
 pkg/kubelet/dockershim/security_context_test.go                 | 2 ++
 pkg/kubelet/dockershim/selinux_util.go                          | 2 ++
 pkg/kubelet/dockershim/selinux_util_test.go                     | 2 ++
 80 files changed, 138 insertions(+), 22 deletions(-)

diff --git a/pkg/kubelet/dockershim/cm/container_manager.go b/pkg/kubelet/dockershim/cm/container_manager.go
index 45abfcedb15..088bb6bbae9 100644
--- a/pkg/kubelet/dockershim/cm/container_manager.go
+++ b/pkg/kubelet/dockershim/cm/container_manager.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/cm/container_manager_linux.go b/pkg/kubelet/dockershim/cm/container_manager_linux.go
index da38ec0d1b1..bacb9738eca 100644
--- a/pkg/kubelet/dockershim/cm/container_manager_linux.go
+++ b/pkg/kubelet/dockershim/cm/container_manager_linux.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,!dockerless
 
 /*
 Copyright 2016 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/cm/container_manager_unsupported.go b/pkg/kubelet/dockershim/cm/container_manager_unsupported.go
index 736c6ebd16d..3cf286fa8dc 100644
--- a/pkg/kubelet/dockershim/cm/container_manager_unsupported.go
+++ b/pkg/kubelet/dockershim/cm/container_manager_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux,!windows
+// +build !linux,!windows,!dockerless
 
 /*
 Copyright 2016 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/cm/container_manager_windows.go b/pkg/kubelet/dockershim/cm/container_manager_windows.go
index 0c2ad462099..3d42314a61f 100644
--- a/pkg/kubelet/dockershim/cm/container_manager_windows.go
+++ b/pkg/kubelet/dockershim/cm/container_manager_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+// +build windows,!dockerless
 
 /*
 Copyright 2017 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/convert.go b/pkg/kubelet/dockershim/convert.go
index e38d4971127..1400d123bed 100644
--- a/pkg/kubelet/dockershim/convert.go
+++ b/pkg/kubelet/dockershim/convert.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/convert_test.go b/pkg/kubelet/dockershim/convert_test.go
index 1befadf72ee..a9b07eecab0 100644
--- a/pkg/kubelet/dockershim/convert_test.go
+++ b/pkg/kubelet/dockershim/convert_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_checkpoint.go b/pkg/kubelet/dockershim/docker_checkpoint.go
index e821feb9528..4d881f7771a 100644
--- a/pkg/kubelet/dockershim/docker_checkpoint.go
+++ b/pkg/kubelet/dockershim/docker_checkpoint.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2017 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_checkpoint_test.go b/pkg/kubelet/dockershim/docker_checkpoint_test.go
index 49f4e4d174a..9d64217e1e3 100644
--- a/pkg/kubelet/dockershim/docker_checkpoint_test.go
+++ b/pkg/kubelet/dockershim/docker_checkpoint_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2017 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_container.go b/pkg/kubelet/dockershim/docker_container.go
index d1397478763..ee0020f7f62 100644
--- a/pkg/kubelet/dockershim/docker_container.go
+++ b/pkg/kubelet/dockershim/docker_container.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_container_test.go b/pkg/kubelet/dockershim/docker_container_test.go
index d26a136ee05..7834da3315c 100644
--- a/pkg/kubelet/dockershim/docker_container_test.go
+++ b/pkg/kubelet/dockershim/docker_container_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_container_unsupported.go b/pkg/kubelet/dockershim/docker_container_unsupported.go
index e3848320ba1..a9ed72bd003 100644
--- a/pkg/kubelet/dockershim/docker_container_unsupported.go
+++ b/pkg/kubelet/dockershim/docker_container_unsupported.go
@@ -1,4 +1,4 @@
-// +build !windows
+// +build !windows,!dockerless
 
 /*
 Copyright 2019 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/docker_container_windows.go b/pkg/kubelet/dockershim/docker_container_windows.go
index 17b01c9c79d..57a7f8d8313 100644
--- a/pkg/kubelet/dockershim/docker_container_windows.go
+++ b/pkg/kubelet/dockershim/docker_container_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+// +build windows,!dockerless
 
 /*
 Copyright 2019 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/docker_container_windows_test.go b/pkg/kubelet/dockershim/docker_container_windows_test.go
index d6c39bcda3f..a2df1af0a39 100644
--- a/pkg/kubelet/dockershim/docker_container_windows_test.go
+++ b/pkg/kubelet/dockershim/docker_container_windows_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2019 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_image.go b/pkg/kubelet/dockershim/docker_image.go
index 356f34d0ec9..d9fa556c7a7 100644
--- a/pkg/kubelet/dockershim/docker_image.go
+++ b/pkg/kubelet/dockershim/docker_image.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_image_linux.go b/pkg/kubelet/dockershim/docker_image_linux.go
index 25e3d7a074e..221aa0d2ca4 100644
--- a/pkg/kubelet/dockershim/docker_image_linux.go
+++ b/pkg/kubelet/dockershim/docker_image_linux.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,!dockerless
 
 /*
 Copyright 2017 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/docker_image_test.go b/pkg/kubelet/dockershim/docker_image_test.go
index 0bdbda2559e..16b0ac124b5 100644
--- a/pkg/kubelet/dockershim/docker_image_test.go
+++ b/pkg/kubelet/dockershim/docker_image_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_image_unsupported.go b/pkg/kubelet/dockershim/docker_image_unsupported.go
index f6c1c72055b..282e8e7296e 100644
--- a/pkg/kubelet/dockershim/docker_image_unsupported.go
+++ b/pkg/kubelet/dockershim/docker_image_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux,!windows
+// +build !linux,!windows,!dockerless
 
 /*
 Copyright 2016 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/docker_image_windows.go b/pkg/kubelet/dockershim/docker_image_windows.go
index 3d559392ce1..dd2282f07f7 100644
--- a/pkg/kubelet/dockershim/docker_image_windows.go
+++ b/pkg/kubelet/dockershim/docker_image_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+// +build windows,!dockerless
 
 /*
 Copyright 2016 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/docker_legacy_service.go b/pkg/kubelet/dockershim/docker_legacy_service.go
index 770b1dab9c8..dde49f19505 100644
--- a/pkg/kubelet/dockershim/docker_legacy_service.go
+++ b/pkg/kubelet/dockershim/docker_legacy_service.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_logs.go b/pkg/kubelet/dockershim/docker_logs.go
index 8a157ce8baf..760ff654028 100644
--- a/pkg/kubelet/dockershim/docker_logs.go
+++ b/pkg/kubelet/dockershim/docker_logs.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2018 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_sandbox.go b/pkg/kubelet/dockershim/docker_sandbox.go
index 0a077204782..b86ff9c7cd0 100644
--- a/pkg/kubelet/dockershim/docker_sandbox.go
+++ b/pkg/kubelet/dockershim/docker_sandbox.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_sandbox_test.go b/pkg/kubelet/dockershim/docker_sandbox_test.go
index b34c933746d..9d385a5f089 100644
--- a/pkg/kubelet/dockershim/docker_sandbox_test.go
+++ b/pkg/kubelet/dockershim/docker_sandbox_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_service.go b/pkg/kubelet/dockershim/docker_service.go
index 4cb8a1f31d9..3bc3a8e78df 100644
--- a/pkg/kubelet/dockershim/docker_service.go
+++ b/pkg/kubelet/dockershim/docker_service.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_service_test.go b/pkg/kubelet/dockershim/docker_service_test.go
index 6523f6f97c2..27ced99a072 100644
--- a/pkg/kubelet/dockershim/docker_service_test.go
+++ b/pkg/kubelet/dockershim/docker_service_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_stats.go b/pkg/kubelet/dockershim/docker_stats.go
index ede30c4efbb..f9b441fa842 100644
--- a/pkg/kubelet/dockershim/docker_stats.go
+++ b/pkg/kubelet/dockershim/docker_stats.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2019 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_stats_linux.go b/pkg/kubelet/dockershim/docker_stats_linux.go
index 11d6add29c4..811bb066aaf 100644
--- a/pkg/kubelet/dockershim/docker_stats_linux.go
+++ b/pkg/kubelet/dockershim/docker_stats_linux.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,!dockerless
 
 /*
 Copyright 2017 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/docker_stats_test.go b/pkg/kubelet/dockershim/docker_stats_test.go
index b4ce51ae6be..fa2d1559b53 100644
--- a/pkg/kubelet/dockershim/docker_stats_test.go
+++ b/pkg/kubelet/dockershim/docker_stats_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2019 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_stats_unsupported.go b/pkg/kubelet/dockershim/docker_stats_unsupported.go
index 736215a9d64..560e243671b 100644
--- a/pkg/kubelet/dockershim/docker_stats_unsupported.go
+++ b/pkg/kubelet/dockershim/docker_stats_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux,!windows
+// +build !linux,!windows,!dockerless
 
 /*
 Copyright 2017 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/docker_stats_windows.go b/pkg/kubelet/dockershim/docker_stats_windows.go
index 086624c4737..8173d7be2d8 100644
--- a/pkg/kubelet/dockershim/docker_stats_windows.go
+++ b/pkg/kubelet/dockershim/docker_stats_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+// +build windows,!dockerless
 
 /*
 Copyright 2017 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/docker_streaming.go b/pkg/kubelet/dockershim/docker_streaming.go
index 76b2fecd11b..f1394ba5c27 100644
--- a/pkg/kubelet/dockershim/docker_streaming.go
+++ b/pkg/kubelet/dockershim/docker_streaming.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/docker_streaming_others.go b/pkg/kubelet/dockershim/docker_streaming_others.go
index 75570086894..059c448be47 100644
--- a/pkg/kubelet/dockershim/docker_streaming_others.go
+++ b/pkg/kubelet/dockershim/docker_streaming_others.go
@@ -1,4 +1,4 @@
-// +build !windows
+// +build !windows,!dockerless
 
 /*
 Copyright 2019 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/docker_streaming_windows.go b/pkg/kubelet/dockershim/docker_streaming_windows.go
index 151bd86066c..64c5ba18833 100644
--- a/pkg/kubelet/dockershim/docker_streaming_windows.go
+++ b/pkg/kubelet/dockershim/docker_streaming_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+// +build windows,!dockerless
 
 /*
 Copyright 2019 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/exec.go b/pkg/kubelet/dockershim/exec.go
index 4b0d085b5a1..a4d8862154f 100644
--- a/pkg/kubelet/dockershim/exec.go
+++ b/pkg/kubelet/dockershim/exec.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2015 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/helpers.go b/pkg/kubelet/dockershim/helpers.go
index c89db1a993a..c499cc01eb9 100644
--- a/pkg/kubelet/dockershim/helpers.go
+++ b/pkg/kubelet/dockershim/helpers.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/helpers_linux.go b/pkg/kubelet/dockershim/helpers_linux.go
index 11931a9ba9a..e18692150a5 100644
--- a/pkg/kubelet/dockershim/helpers_linux.go
+++ b/pkg/kubelet/dockershim/helpers_linux.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,!dockerless
 
 /*
 Copyright 2015 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/helpers_linux_test.go b/pkg/kubelet/dockershim/helpers_linux_test.go
index 2f7ddb5329e..76ad4bb85f3 100644
--- a/pkg/kubelet/dockershim/helpers_linux_test.go
+++ b/pkg/kubelet/dockershim/helpers_linux_test.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,!dockerless
 
 /*
 Copyright 2017 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/helpers_test.go b/pkg/kubelet/dockershim/helpers_test.go
index 62c07a5c3e8..ff2e09db13b 100644
--- a/pkg/kubelet/dockershim/helpers_test.go
+++ b/pkg/kubelet/dockershim/helpers_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/helpers_unsupported.go b/pkg/kubelet/dockershim/helpers_unsupported.go
index 623e0b56b44..72f1d1674aa 100644
--- a/pkg/kubelet/dockershim/helpers_unsupported.go
+++ b/pkg/kubelet/dockershim/helpers_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux,!windows
+// +build !linux,!windows,!dockerless
 
 /*
 Copyright 2015 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/helpers_windows.go b/pkg/kubelet/dockershim/helpers_windows.go
index effdf92be3d..8442f9d93ce 100644
--- a/pkg/kubelet/dockershim/helpers_windows.go
+++ b/pkg/kubelet/dockershim/helpers_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+// +build windows,!dockerless
 
 /*
 Copyright 2015 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/libdocker/client.go b/pkg/kubelet/dockershim/libdocker/client.go
index 5ec3d224c38..68a4de6a5ee 100644
--- a/pkg/kubelet/dockershim/libdocker/client.go
+++ b/pkg/kubelet/dockershim/libdocker/client.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2014 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/libdocker/fake_client.go b/pkg/kubelet/dockershim/libdocker/fake_client.go
index d75728d2e17..27d38ebfd93 100644
--- a/pkg/kubelet/dockershim/libdocker/fake_client.go
+++ b/pkg/kubelet/dockershim/libdocker/fake_client.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2014 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/libdocker/helpers.go b/pkg/kubelet/dockershim/libdocker/helpers.go
index 171b247f8f0..067de82151b 100644
--- a/pkg/kubelet/dockershim/libdocker/helpers.go
+++ b/pkg/kubelet/dockershim/libdocker/helpers.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2014 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/libdocker/helpers_test.go b/pkg/kubelet/dockershim/libdocker/helpers_test.go
index e6a48198343..2a31b658366 100644
--- a/pkg/kubelet/dockershim/libdocker/helpers_test.go
+++ b/pkg/kubelet/dockershim/libdocker/helpers_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2014 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/libdocker/instrumented_client.go b/pkg/kubelet/dockershim/libdocker/instrumented_client.go
index d2cefafb729..d6c80e3dee7 100644
--- a/pkg/kubelet/dockershim/libdocker/instrumented_client.go
+++ b/pkg/kubelet/dockershim/libdocker/instrumented_client.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2015 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/libdocker/kube_docker_client.go b/pkg/kubelet/dockershim/libdocker/kube_docker_client.go
index 7f961297a53..0daa7d7cd88 100644
--- a/pkg/kubelet/dockershim/libdocker/kube_docker_client.go
+++ b/pkg/kubelet/dockershim/libdocker/kube_docker_client.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/libdocker/kube_docker_client_test.go b/pkg/kubelet/dockershim/libdocker/kube_docker_client_test.go
index dca570bbd26..d004f38c6f5 100644
--- a/pkg/kubelet/dockershim/libdocker/kube_docker_client_test.go
+++ b/pkg/kubelet/dockershim/libdocker/kube_docker_client_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2017 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/metrics/metrics.go b/pkg/kubelet/dockershim/metrics/metrics.go
index 16be68982bc..73fd251707c 100644
--- a/pkg/kubelet/dockershim/metrics/metrics.go
+++ b/pkg/kubelet/dockershim/metrics/metrics.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2015 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/naming.go b/pkg/kubelet/dockershim/naming.go
index f464dab2831..47e55a05733 100644
--- a/pkg/kubelet/dockershim/naming.go
+++ b/pkg/kubelet/dockershim/naming.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/naming_test.go b/pkg/kubelet/dockershim/naming_test.go
index bc2f4408ac3..12b30f56c12 100644
--- a/pkg/kubelet/dockershim/naming_test.go
+++ b/pkg/kubelet/dockershim/naming_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/cni/cni.go b/pkg/kubelet/dockershim/network/cni/cni.go
index 5c471f9272d..c3748700e14 100644
--- a/pkg/kubelet/dockershim/network/cni/cni.go
+++ b/pkg/kubelet/dockershim/network/cni/cni.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2014 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/cni/cni_others.go b/pkg/kubelet/dockershim/network/cni/cni_others.go
index 55487454310..3c2c4852b71 100644
--- a/pkg/kubelet/dockershim/network/cni/cni_others.go
+++ b/pkg/kubelet/dockershim/network/cni/cni_others.go
@@ -1,4 +1,4 @@
-// +build !windows
+// +build !windows,!dockerless
 
 /*
 Copyright 2017 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/network/cni/cni_test.go b/pkg/kubelet/dockershim/network/cni/cni_test.go
index ef6009eee29..0005c1940cf 100644
--- a/pkg/kubelet/dockershim/network/cni/cni_test.go
+++ b/pkg/kubelet/dockershim/network/cni/cni_test.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,!dockerless
 
 /*
 Copyright 2014 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/network/cni/cni_windows.go b/pkg/kubelet/dockershim/network/cni/cni_windows.go
index 316d4df9b99..6554d7325d2 100644
--- a/pkg/kubelet/dockershim/network/cni/cni_windows.go
+++ b/pkg/kubelet/dockershim/network/cni/cni_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+// +build windows,!dockerless
 
 /*
 Copyright 2017 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/network/cni/testing/mock_cni.go b/pkg/kubelet/dockershim/network/cni/testing/mock_cni.go
index afc3a510f09..b81014f4919 100644
--- a/pkg/kubelet/dockershim/network/cni/testing/mock_cni.go
+++ b/pkg/kubelet/dockershim/network/cni/testing/mock_cni.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2014 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/hairpin/hairpin.go b/pkg/kubelet/dockershim/network/hairpin/hairpin.go
index a3e455ff10c..53e1be21e3d 100644
--- a/pkg/kubelet/dockershim/network/hairpin/hairpin.go
+++ b/pkg/kubelet/dockershim/network/hairpin/hairpin.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2015 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/hairpin/hairpin_test.go b/pkg/kubelet/dockershim/network/hairpin/hairpin_test.go
index eb4c15872e7..72e76b4e6d6 100644
--- a/pkg/kubelet/dockershim/network/hairpin/hairpin_test.go
+++ b/pkg/kubelet/dockershim/network/hairpin/hairpin_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2015 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/hostport/fake_iptables.go b/pkg/kubelet/dockershim/network/hostport/fake_iptables.go
index be59dd5a9a6..9080a58b3d5 100644
--- a/pkg/kubelet/dockershim/network/hostport/fake_iptables.go
+++ b/pkg/kubelet/dockershim/network/hostport/fake_iptables.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/hostport/fake_iptables_test.go b/pkg/kubelet/dockershim/network/hostport/fake_iptables_test.go
index bda4c024736..a503b6d822e 100644
--- a/pkg/kubelet/dockershim/network/hostport/fake_iptables_test.go
+++ b/pkg/kubelet/dockershim/network/hostport/fake_iptables_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/hostport/hostport.go b/pkg/kubelet/dockershim/network/hostport/hostport.go
index 1cf83d134c6..f92ad07e248 100644
--- a/pkg/kubelet/dockershim/network/hostport/hostport.go
+++ b/pkg/kubelet/dockershim/network/hostport/hostport.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2017 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/hostport/hostport_manager.go b/pkg/kubelet/dockershim/network/hostport/hostport_manager.go
index f7e076ac49a..f7820ae0231 100644
--- a/pkg/kubelet/dockershim/network/hostport/hostport_manager.go
+++ b/pkg/kubelet/dockershim/network/hostport/hostport_manager.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2017 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/hostport/hostport_manager_test.go b/pkg/kubelet/dockershim/network/hostport/hostport_manager_test.go
index a8d03affd92..b41e7908c0b 100644
--- a/pkg/kubelet/dockershim/network/hostport/hostport_manager_test.go
+++ b/pkg/kubelet/dockershim/network/hostport/hostport_manager_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2017 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/hostport/hostport_syncer.go b/pkg/kubelet/dockershim/network/hostport/hostport_syncer.go
index 517c5a30889..454b86973a6 100644
--- a/pkg/kubelet/dockershim/network/hostport/hostport_syncer.go
+++ b/pkg/kubelet/dockershim/network/hostport/hostport_syncer.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2014 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/hostport/hostport_syncer_test.go b/pkg/kubelet/dockershim/network/hostport/hostport_syncer_test.go
index 874da8780bb..d8ac3affae3 100644
--- a/pkg/kubelet/dockershim/network/hostport/hostport_syncer_test.go
+++ b/pkg/kubelet/dockershim/network/hostport/hostport_syncer_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/hostport/hostport_test.go b/pkg/kubelet/dockershim/network/hostport/hostport_test.go
index 97dd907c308..4721158f2a6 100644
--- a/pkg/kubelet/dockershim/network/hostport/hostport_test.go
+++ b/pkg/kubelet/dockershim/network/hostport/hostport_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2017 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/hostport/testing/fake.go b/pkg/kubelet/dockershim/network/hostport/testing/fake.go
index 3bde65cc2ed..24de155626c 100644
--- a/pkg/kubelet/dockershim/network/hostport/testing/fake.go
+++ b/pkg/kubelet/dockershim/network/hostport/testing/fake.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/kubenet/kubenet.go b/pkg/kubelet/dockershim/network/kubenet/kubenet.go
index 146ae732e70..558cf0bdfbe 100644
--- a/pkg/kubelet/dockershim/network/kubenet/kubenet.go
+++ b/pkg/kubelet/dockershim/network/kubenet/kubenet.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go
index e878e7c6175..5c5e4617b69 100644
--- a/pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go
+++ b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,!dockerless
 
 /*
 Copyright 2014 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go
index cedb7772b0c..85e791e37be 100644
--- a/pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go
+++ b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2015 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/kubenet/kubenet_unsupported.go b/pkg/kubelet/dockershim/network/kubenet/kubenet_unsupported.go
index 5b7ef00cb26..05d9c66fcf2 100644
--- a/pkg/kubelet/dockershim/network/kubenet/kubenet_unsupported.go
+++ b/pkg/kubelet/dockershim/network/kubenet/kubenet_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux
+// +build !linux,!dockerless
 
 /*
 Copyright 2014 The Kubernetes Authors.
diff --git a/pkg/kubelet/dockershim/network/metrics/metrics.go b/pkg/kubelet/dockershim/network/metrics/metrics.go
index b5da24400a6..eaa05f0649d 100644
--- a/pkg/kubelet/dockershim/network/metrics/metrics.go
+++ b/pkg/kubelet/dockershim/network/metrics/metrics.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2017 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/network.go b/pkg/kubelet/dockershim/network/network.go
index fbd1ba12550..a609c8cf8d9 100644
--- a/pkg/kubelet/dockershim/network/network.go
+++ b/pkg/kubelet/dockershim/network/network.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2014 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/plugins.go b/pkg/kubelet/dockershim/network/plugins.go
index 9c904202ba3..c3a4bc985aa 100644
--- a/pkg/kubelet/dockershim/network/plugins.go
+++ b/pkg/kubelet/dockershim/network/plugins.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2014 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/testing/fake_host.go b/pkg/kubelet/dockershim/network/testing/fake_host.go
index c2e3b65cbe7..6b07d0e6ad8 100644
--- a/pkg/kubelet/dockershim/network/testing/fake_host.go
+++ b/pkg/kubelet/dockershim/network/testing/fake_host.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2014 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/testing/mock_network_plugin.go b/pkg/kubelet/dockershim/network/testing/mock_network_plugin.go
index afb0752e1df..59fbb7b027e 100644
--- a/pkg/kubelet/dockershim/network/testing/mock_network_plugin.go
+++ b/pkg/kubelet/dockershim/network/testing/mock_network_plugin.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/network/testing/plugins_test.go b/pkg/kubelet/dockershim/network/testing/plugins_test.go
index 42c6ba9e8e1..8943197afe1 100644
--- a/pkg/kubelet/dockershim/network/testing/plugins_test.go
+++ b/pkg/kubelet/dockershim/network/testing/plugins_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2014 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/remote/docker_server.go b/pkg/kubelet/dockershim/remote/docker_server.go
index 167843dd321..125e203cfcf 100644
--- a/pkg/kubelet/dockershim/remote/docker_server.go
+++ b/pkg/kubelet/dockershim/remote/docker_server.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/security_context.go b/pkg/kubelet/dockershim/security_context.go
index 38fed8daded..571fdd33767 100644
--- a/pkg/kubelet/dockershim/security_context.go
+++ b/pkg/kubelet/dockershim/security_context.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/security_context_test.go b/pkg/kubelet/dockershim/security_context_test.go
index 46fb825adcf..6277f6bd5a3 100644
--- a/pkg/kubelet/dockershim/security_context_test.go
+++ b/pkg/kubelet/dockershim/security_context_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2016 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/selinux_util.go b/pkg/kubelet/dockershim/selinux_util.go
index 1cd05f04642..00565596273 100644
--- a/pkg/kubelet/dockershim/selinux_util.go
+++ b/pkg/kubelet/dockershim/selinux_util.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2017 The Kubernetes Authors.
 
diff --git a/pkg/kubelet/dockershim/selinux_util_test.go b/pkg/kubelet/dockershim/selinux_util_test.go
index 93ef091723e..99eb6a437d1 100644
--- a/pkg/kubelet/dockershim/selinux_util_test.go
+++ b/pkg/kubelet/dockershim/selinux_util_test.go
@@ -1,3 +1,5 @@
+// +build !dockerless
+
 /*
 Copyright 2017 The Kubernetes Authors.