Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
3bcbc5da
Unverified
Commit
3bcbc5da
authored
Nov 12, 2018
by
k8s-ci-robot
Committed by
GitHub
Nov 12, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #70887 from seans3/kubectl-get-fix
kubectl get: remove internal resource dependency
parents
08784ad9
c814f615
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
BUILD
pkg/kubectl/cmd/get/BUILD
+1
-1
get.go
pkg/kubectl/cmd/get/get.go
+4
-4
No files found.
pkg/kubectl/cmd/get/BUILD
View file @
3bcbc5da
...
@@ -25,7 +25,6 @@ go_library(
...
@@ -25,7 +25,6 @@ go_library(
visibility = ["//visibility:public"],
visibility = ["//visibility:public"],
deps = [
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/kubectl:go_default_library",
"//pkg/kubectl:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/cmd/util/openapi:go_default_library",
"//pkg/kubectl/cmd/util/openapi:go_default_library",
...
@@ -35,6 +34,7 @@ go_library(
...
@@ -35,6 +34,7 @@ go_library(
"//pkg/printers:go_default_library",
"//pkg/printers:go_default_library",
"//pkg/printers/internalversion:go_default_library",
"//pkg/printers/internalversion:go_default_library",
"//pkg/util/interrupt:go_default_library",
"//pkg/util/interrupt:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
...
...
pkg/kubectl/cmd/get/get.go
View file @
3bcbc5da
...
@@ -26,6 +26,7 @@ import (
...
@@ -26,6 +26,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/cobra"
"k8s.io/klog"
"k8s.io/klog"
corev1
"k8s.io/api/core/v1"
kapierrors
"k8s.io/apimachinery/pkg/api/errors"
kapierrors
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/api/meta"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
...
@@ -41,7 +42,6 @@ import (
...
@@ -41,7 +42,6 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/rest"
watchtools
"k8s.io/client-go/tools/watch"
watchtools
"k8s.io/client-go/tools/watch"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api
"k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
...
@@ -768,8 +768,8 @@ func (o *GetOptions) printGeneric(r *resource.Result) error {
...
@@ -768,8 +768,8 @@ func (o *GetOptions) printGeneric(r *resource.Result) error {
// we have more than one item, so coerce all items into a list.
// we have more than one item, so coerce all items into a list.
// we don't want an *unstructured.Unstructured list yet, as we
// we don't want an *unstructured.Unstructured list yet, as we
// may be dealing with non-unstructured objects. Compose all items
// may be dealing with non-unstructured objects. Compose all items
// into an
api
.List, and then decode using an unstructured scheme.
// into an
corev1
.List, and then decode using an unstructured scheme.
list
:=
api
.
List
{
list
:=
corev1
.
List
{
TypeMeta
:
metav1
.
TypeMeta
{
TypeMeta
:
metav1
.
TypeMeta
{
Kind
:
"List"
,
Kind
:
"List"
,
APIVersion
:
"v1"
,
APIVersion
:
"v1"
,
...
@@ -777,7 +777,7 @@ func (o *GetOptions) printGeneric(r *resource.Result) error {
...
@@ -777,7 +777,7 @@ func (o *GetOptions) printGeneric(r *resource.Result) error {
ListMeta
:
metav1
.
ListMeta
{},
ListMeta
:
metav1
.
ListMeta
{},
}
}
for
_
,
info
:=
range
infos
{
for
_
,
info
:=
range
infos
{
list
.
Items
=
append
(
list
.
Items
,
info
.
Object
)
list
.
Items
=
append
(
list
.
Items
,
runtime
.
RawExtension
{
Object
:
info
.
Object
}
)
}
}
listData
,
err
:=
json
.
Marshal
(
list
)
listData
,
err
:=
json
.
Marshal
(
list
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment