From 2510a4737467818e501c7aeb66deb46aa5acef11 Mon Sep 17 00:00:00 2001
From: ymqytw <mengqiy@google.com>
Date: Thu, 29 Jun 2017 14:57:06 -0700
Subject: [PATCH] move crlf to kubectl/util

---
 pkg/kubectl/cmd/util/editor/BUILD          | 2 +-
 pkg/kubectl/cmd/util/editor/editoptions.go | 2 +-
 pkg/kubectl/util/BUILD                     | 5 ++++-
 pkg/{ => kubectl}/util/crlf/BUILD          | 0
 pkg/{ => kubectl}/util/crlf/crlf.go        | 0
 pkg/util/BUILD                             | 1 -
 6 files changed, 6 insertions(+), 4 deletions(-)
 rename pkg/{ => kubectl}/util/crlf/BUILD (100%)
 rename pkg/{ => kubectl}/util/crlf/crlf.go (100%)

diff --git a/pkg/kubectl/cmd/util/editor/BUILD b/pkg/kubectl/cmd/util/editor/BUILD
index 68e18edf45..63544fd287 100644
--- a/pkg/kubectl/cmd/util/editor/BUILD
+++ b/pkg/kubectl/cmd/util/editor/BUILD
@@ -21,8 +21,8 @@ go_library(
         "//pkg/kubectl:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",
         "//pkg/kubectl/resource:go_default_library",
+        "//pkg/kubectl/util/crlf:go_default_library",
         "//pkg/printers:go_default_library",
-        "//pkg/util/crlf:go_default_library",
         "//pkg/util/term:go_default_library",
         "//vendor/github.com/evanphx/json-patch:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
diff --git a/pkg/kubectl/cmd/util/editor/editoptions.go b/pkg/kubectl/cmd/util/editor/editoptions.go
index df4b88b631..9353314b78 100644
--- a/pkg/kubectl/cmd/util/editor/editoptions.go
+++ b/pkg/kubectl/cmd/util/editor/editoptions.go
@@ -44,8 +44,8 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
+	"k8s.io/kubernetes/pkg/kubectl/util/crlf"
 	"k8s.io/kubernetes/pkg/printers"
-	"k8s.io/kubernetes/pkg/util/crlf"
 )
 
 // EditOptions contains all the options for running edit cli command.
diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD
index f4113db90f..3104905669 100644
--- a/pkg/kubectl/util/BUILD
+++ b/pkg/kubectl/util/BUILD
@@ -25,7 +25,10 @@ filegroup(
 
 filegroup(
     name = "all-srcs",
-    srcs = [":package-srcs"],
+    srcs = [
+        ":package-srcs",
+        "//pkg/kubectl/util/crlf:all-srcs",
+    ],
     tags = ["automanaged"],
     visibility = ["//build/visible_to:pkg_kubectl_util_CONSUMERS"],
 )
diff --git a/pkg/util/crlf/BUILD b/pkg/kubectl/util/crlf/BUILD
similarity index 100%
rename from pkg/util/crlf/BUILD
rename to pkg/kubectl/util/crlf/BUILD
diff --git a/pkg/util/crlf/crlf.go b/pkg/kubectl/util/crlf/crlf.go
similarity index 100%
rename from pkg/util/crlf/crlf.go
rename to pkg/kubectl/util/crlf/crlf.go
diff --git a/pkg/util/BUILD b/pkg/util/BUILD
index 6dcbb4086b..e7899341bd 100644
--- a/pkg/util/BUILD
+++ b/pkg/util/BUILD
@@ -48,7 +48,6 @@ filegroup(
         "//pkg/util/bandwidth:all-srcs",
         "//pkg/util/config:all-srcs",
         "//pkg/util/configz:all-srcs",
-        "//pkg/util/crlf:all-srcs",
         "//pkg/util/dbus:all-srcs",
         "//pkg/util/ebtables:all-srcs",
         "//pkg/util/env:all-srcs",