fix bazel issue (kubernetes#8)

* fix bazel issue fix conflict * fix darwin build issue
andyzhangx · Sep 19, 2017 · 16d49c7 · 16d49c7
1 parent 670531d
commit 16d49c7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/pkg/kubelet/dockershim/helpers_unsupported.go b/pkg/kubelet/dockershim/helpers_unsupported.go
@@ -19,6 +19,7 @@ limitations under the License.
 package dockershim
 
 import (
+	"fmt"
 	"github.com/blang/semver"
 	dockertypes "github.com/docker/engine-api/types"
 	"github.com/golang/glog"

diff --git a/pkg/kubelet/dockershim/libdocker/BUILD b/pkg/kubelet/dockershim/libdocker/BUILD
@@ -48,7 +48,6 @@ go_library(
         "//vendor/github.com/docker/engine-api/client:go_default_library",
         "//vendor/github.com/docker/engine-api/types:go_default_library",
         "//vendor/github.com/docker/engine-api/types/container:go_default_library",
-        "//vendor/github.com/docker/engine-api/types/network:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",

diff --git a/pkg/kubelet/winstats/BUILD b/pkg/kubelet/winstats/BUILD
@@ -9,8 +9,26 @@ load(
 
 go_library(
     name = "go_default_library",
-    srcs = ["statstypes.go"],
-    tags = ["automanaged"],
+    srcs = [
+        "statstypes.go",
+    ] + select({
+        "@io_bazel_rules_go//go/platform:windows_amd64": [
+            "winstats.go",
+        ],
+        "//conditions:default": [],
+    }),
+    deps = [
+    ] + select({
+        "@io_bazel_rules_go//go/platform:windows_amd64": [
+            "//pkg/kubelet/network:go_default_library",
+            "//vendor/github.com/docker/docker/api/types:go_default_library",
+            "//vendor/github.com/docker/engine-api/client:go_default_library",
+            "//vendor/github.com/docker/engine-api/types:go_default_library",
+            "//vendor/github.com/google/cadvisor/info/v1:go_default_library",
+            "//vendor/github.com/google/cadvisor/info/v2:go_default_library",
+        ],
+        "//conditions:default": [],
+    }),
 )
 
 filegroup(