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
24c441e9
Commit
24c441e9
authored
Aug 08, 2016
by
Kris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kubectl/resource: Remove thirdparty special casing
And also remove some duplicate code while I'm at it.
parent
d1aa3dd0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
22 deletions
+3
-22
mapper.go
pkg/kubectl/resource/mapper.go
+2
-15
visitor.go
pkg/kubectl/resource/visitor.go
+1
-7
No files found.
pkg/kubectl/resource/mapper.go
View file @
24c441e9
...
@@ -22,7 +22,6 @@ import (
...
@@ -22,7 +22,6 @@ import (
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime"
)
)
...
@@ -54,20 +53,8 @@ func (m *Mapper) InfoForData(data []byte, source string) (*Info, error) {
...
@@ -54,20 +53,8 @@ func (m *Mapper) InfoForData(data []byte, source string) (*Info, error) {
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"unable to decode %q: %v"
,
source
,
err
)
return
nil
,
fmt
.
Errorf
(
"unable to decode %q: %v"
,
source
,
err
)
}
}
var
obj
runtime
.
Object
var
versioned
runtime
.
Object
obj
,
versioned
:=
versions
.
Last
(),
versions
.
First
()
if
isThirdParty
,
gvkOut
,
err
:=
thirdpartyresourcedata
.
IsThirdPartyObject
(
data
,
gvk
);
err
!=
nil
{
return
nil
,
err
}
else
if
isThirdParty
{
obj
,
err
=
runtime
.
Decode
(
thirdpartyresourcedata
.
NewDecoder
(
nil
,
gvkOut
.
Kind
),
data
)
versioned
=
obj
gvk
=
gvkOut
}
else
{
obj
,
versioned
=
versions
.
Last
(),
versions
.
First
()
}
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"unable to decode %q: %v [%v]"
,
source
,
err
,
gvk
)
}
mapping
,
err
:=
m
.
RESTMapping
(
gvk
.
GroupKind
(),
gvk
.
Version
)
mapping
,
err
:=
m
.
RESTMapping
(
gvk
.
GroupKind
(),
gvk
.
Version
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"unable to recognize %q: %v"
,
source
,
err
)
return
nil
,
fmt
.
Errorf
(
"unable to recognize %q: %v"
,
source
,
err
)
...
...
pkg/kubectl/resource/visitor.go
View file @
24c441e9
...
@@ -618,13 +618,7 @@ func RetrieveLatest(info *Info, err error) error {
...
@@ -618,13 +618,7 @@ func RetrieveLatest(info *Info, err error) error {
if
info
.
Namespaced
()
&&
len
(
info
.
Namespace
)
==
0
{
if
info
.
Namespaced
()
&&
len
(
info
.
Namespace
)
==
0
{
return
fmt
.
Errorf
(
"no namespace set on resource %s %q"
,
info
.
Mapping
.
Resource
,
info
.
Name
)
return
fmt
.
Errorf
(
"no namespace set on resource %s %q"
,
info
.
Mapping
.
Resource
,
info
.
Name
)
}
}
obj
,
err
:=
NewHelper
(
info
.
Client
,
info
.
Mapping
)
.
Get
(
info
.
Namespace
,
info
.
Name
,
info
.
Export
)
return
info
.
Get
()
if
err
!=
nil
{
return
err
}
info
.
Object
=
obj
info
.
ResourceVersion
,
_
=
info
.
Mapping
.
MetadataAccessor
.
ResourceVersion
(
obj
)
return
nil
}
}
// RetrieveLazy updates the object if it has not been loaded yet.
// RetrieveLazy updates the object if it has not been loaded yet.
...
...
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