Skip to content

Commit

Permalink
Merge pull request #48298 from mengqiy/kubectl_crlf
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 48295, 48298, 47339, 44910, 48037)

move crlf to kubectl/util

move crlf from pkg/util/crlf to pkg/kubectl/util/crlf

Ref: #48209

```release-note
NONE
```
/assign @apelisse @monopole 

cc: @pwittrock
  • Loading branch information
Kubernetes Submit Queue committed Jun 30, 2017
2 parents 3dcd308 + 2510a47 commit 903a454
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pkg/kubectl/cmd/util/editor/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/cmd/util/editor/editoptions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 4 additions & 1 deletion pkg/kubectl/util/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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"],
)
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion pkg/util/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,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",
Expand Down

0 comments on commit 903a454

Please sign in to comment.