Skip to content

Commit f229aa0

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#75044 from errordeveloper/move-cli-runtime-subpackages
Move printers & resources packages
2 parents e318642 + 6d7a904 commit f229aa0

File tree

141 files changed

+210
-212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+210
-212
lines changed

‎hack/.golint_failures‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,8 @@ staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/tokentest
537537
staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
538538
staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook
539539
staging/src/k8s.io/cli-runtime/pkg/genericclioptions
540-
staging/src/k8s.io/cli-runtime/pkg/genericclioptions/printers
541-
staging/src/k8s.io/cli-runtime/pkg/genericclioptions/resource
540+
staging/src/k8s.io/cli-runtime/pkg/printers
541+
staging/src/k8s.io/cli-runtime/pkg/resource
542542
staging/src/k8s.io/client-go/deprecated-dynamic
543543
staging/src/k8s.io/client-go/discovery
544544
staging/src/k8s.io/client-go/discovery/fake

‎pkg/kubectl/cmd/annotate/BUILD‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ go_library(
1717
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
1818
"//staging/src/k8s.io/apimachinery/pkg/util/json:go_default_library",
1919
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
20-
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions/printers:go_default_library",
21-
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions/resource:go_default_library",
20+
"//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library",
21+
"//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library",
2222
"//vendor/github.com/evanphx/json-patch:go_default_library",
2323
"//vendor/github.com/spf13/cobra:go_default_library",
2424
"//vendor/k8s.io/klog:go_default_library",
@@ -40,7 +40,7 @@ go_test(
4040
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
4141
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
4242
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
43-
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions/resource:go_default_library",
43+
"//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library",
4444
"//staging/src/k8s.io/client-go/rest/fake:go_default_library",
4545
],
4646
)

‎pkg/kubectl/cmd/annotate/annotate.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
"k8s.io/apimachinery/pkg/util/json"
3333

3434
"k8s.io/cli-runtime/pkg/genericclioptions"
35-
"k8s.io/cli-runtime/pkg/genericclioptions/printers"
36-
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
35+
"k8s.io/cli-runtime/pkg/printers"
36+
"k8s.io/cli-runtime/pkg/resource"
3737
"k8s.io/kubernetes/pkg/kubectl"
3838
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
3939
"k8s.io/kubernetes/pkg/kubectl/scheme"

‎pkg/kubectl/cmd/annotate/annotate_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"k8s.io/apimachinery/pkg/runtime"
2828
"k8s.io/apimachinery/pkg/runtime/schema"
2929
"k8s.io/cli-runtime/pkg/genericclioptions"
30-
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
30+
"k8s.io/cli-runtime/pkg/resource"
3131
"k8s.io/client-go/rest/fake"
3232
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
3333
"k8s.io/kubernetes/pkg/kubectl/scheme"

‎pkg/kubectl/cmd/apply/BUILD‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ go_library(
3434
"//staging/src/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library",
3535
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
3636
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
37-
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions/printers:go_default_library",
38-
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions/resource:go_default_library",
37+
"//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library",
38+
"//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library",
3939
"//staging/src/k8s.io/client-go/discovery:go_default_library",
4040
"//staging/src/k8s.io/client-go/dynamic:go_default_library",
4141
"//vendor/github.com/jonboulle/clockwork:go_default_library",
@@ -68,7 +68,7 @@ go_test(
6868
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
6969
"//staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testing:go_default_library",
7070
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
71-
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions/resource:go_default_library",
71+
"//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library",
7272
"//staging/src/k8s.io/client-go/dynamic/fake:go_default_library",
7373
"//staging/src/k8s.io/client-go/rest:go_default_library",
7474
"//staging/src/k8s.io/client-go/rest/fake:go_default_library",

‎pkg/kubectl/cmd/apply/apply.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ import (
4040
"k8s.io/apimachinery/pkg/util/strategicpatch"
4141
"k8s.io/apimachinery/pkg/util/wait"
4242
"k8s.io/cli-runtime/pkg/genericclioptions"
43-
"k8s.io/cli-runtime/pkg/genericclioptions/printers"
44-
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
43+
"k8s.io/cli-runtime/pkg/printers"
44+
"k8s.io/cli-runtime/pkg/resource"
4545
"k8s.io/client-go/discovery"
4646
"k8s.io/client-go/dynamic"
4747
"k8s.io/klog"

‎pkg/kubectl/cmd/apply/apply_set_last_applied.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"k8s.io/apimachinery/pkg/runtime"
2828
"k8s.io/apimachinery/pkg/types"
2929
"k8s.io/cli-runtime/pkg/genericclioptions"
30-
"k8s.io/cli-runtime/pkg/genericclioptions/printers"
31-
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
30+
"k8s.io/cli-runtime/pkg/printers"
31+
"k8s.io/cli-runtime/pkg/resource"
3232
"k8s.io/kubernetes/pkg/kubectl"
3333
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
3434
"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"

‎pkg/kubectl/cmd/apply/apply_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
"k8s.io/apimachinery/pkg/runtime/schema"
4242
sptest "k8s.io/apimachinery/pkg/util/strategicpatch/testing"
4343
"k8s.io/cli-runtime/pkg/genericclioptions"
44-
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
44+
"k8s.io/cli-runtime/pkg/resource"
4545
dynamicfakeclient "k8s.io/client-go/dynamic/fake"
4646
restclient "k8s.io/client-go/rest"
4747
"k8s.io/client-go/rest/fake"

‎pkg/kubectl/cmd/apply/apply_view_last_applied.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/spf13/cobra"
2525
"k8s.io/cli-runtime/pkg/genericclioptions"
26-
"k8s.io/cli-runtime/pkg/genericclioptions/resource"
26+
"k8s.io/cli-runtime/pkg/resource"
2727
"k8s.io/kubernetes/pkg/kubectl"
2828
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
2929
"k8s.io/kubernetes/pkg/kubectl/util/i18n"

‎pkg/kubectl/cmd/attach/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ go_library(
1515
"//staging/src/k8s.io/api/core/v1:go_default_library",
1616
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
1717
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
18-
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions/resource:go_default_library",
18+
"//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library",
1919
"//staging/src/k8s.io/client-go/rest:go_default_library",
2020
"//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library",
2121
"//vendor/github.com/spf13/cobra:go_default_library",

0 commit comments

Comments
 (0)