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
dd6d4548
Unverified
Commit
dd6d4548
authored
Jan 21, 2017
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kubectl: remove ThirdPartyResourceData behavior for unregistered objects
parent
a82c4481
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
22 deletions
+1
-22
factory.go
pkg/kubectl/cmd/util/factory.go
+0
-16
factory_client_access.go
pkg/kubectl/cmd/util/factory_client_access.go
+1
-2
factory_object_mapping.go
pkg/kubectl/cmd/util/factory_object_mapping.go
+0
-4
No files found.
pkg/kubectl/cmd/util/factory.go
View file @
dd6d4548
...
@@ -51,7 +51,6 @@ import (
...
@@ -51,7 +51,6 @@ import (
coreclient
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
coreclient
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata"
)
)
const
(
const
(
...
@@ -241,21 +240,6 @@ func getGroupVersionKinds(gvks []schema.GroupVersionKind, group string) []schema
...
@@ -241,21 +240,6 @@ func getGroupVersionKinds(gvks []schema.GroupVersionKind, group string) []schema
return
result
return
result
}
}
func
makeInterfacesFor
(
versionList
[]
schema
.
GroupVersion
)
func
(
version
schema
.
GroupVersion
)
(
*
meta
.
VersionInterfaces
,
error
)
{
accessor
:=
meta
.
NewAccessor
()
return
func
(
version
schema
.
GroupVersion
)
(
*
meta
.
VersionInterfaces
,
error
)
{
for
ix
:=
range
versionList
{
if
versionList
[
ix
]
.
String
()
==
version
.
String
()
{
return
&
meta
.
VersionInterfaces
{
ObjectConvertor
:
thirdpartyresourcedata
.
NewThirdPartyObjectConverter
(
api
.
Scheme
),
MetadataAccessor
:
accessor
,
},
nil
}
}
return
nil
,
fmt
.
Errorf
(
"unsupported storage version: %s (valid: %v)"
,
version
,
versionList
)
}
}
type
factory
struct
{
type
factory
struct
{
ClientAccessFactory
ClientAccessFactory
ObjectMappingFactory
ObjectMappingFactory
...
...
pkg/kubectl/cmd/util/factory_client_access.go
View file @
dd6d4548
...
@@ -49,7 +49,6 @@ import (
...
@@ -49,7 +49,6 @@ import (
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata"
)
)
type
ring0Factory
struct
{
type
ring0Factory
struct
{
...
@@ -209,7 +208,7 @@ func (f *ring0Factory) Decoder(toInternal bool) runtime.Decoder {
...
@@ -209,7 +208,7 @@ func (f *ring0Factory) Decoder(toInternal bool) runtime.Decoder {
}
else
{
}
else
{
decoder
=
api
.
Codecs
.
UniversalDeserializer
()
decoder
=
api
.
Codecs
.
UniversalDeserializer
()
}
}
return
thirdpartyresourcedata
.
NewDecoder
(
decoder
,
""
)
return
decoder
}
}
func
(
f
*
ring0Factory
)
JSONEncoder
()
runtime
.
Encoder
{
func
(
f
*
ring0Factory
)
JSONEncoder
()
runtime
.
Encoder
{
...
...
pkg/kubectl/cmd/util/factory_object_mapping.go
View file @
dd6d4548
...
@@ -47,7 +47,6 @@ import (
...
@@ -47,7 +47,6 @@ import (
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata"
)
)
type
ring1Factory
struct
{
type
ring1Factory
struct
{
...
@@ -127,9 +126,6 @@ func (f *ring1Factory) ClientForMapping(mapping *meta.RESTMapping) (resource.RES
...
@@ -127,9 +126,6 @@ func (f *ring1Factory) ClientForMapping(mapping *meta.RESTMapping) (resource.RES
}
}
gv
:=
gvk
.
GroupVersion
()
gv
:=
gvk
.
GroupVersion
()
cfg
.
GroupVersion
=
&
gv
cfg
.
GroupVersion
=
&
gv
if
api
.
Registry
.
IsThirdPartyAPIGroupVersion
(
gvk
.
GroupVersion
())
{
cfg
.
NegotiatedSerializer
=
thirdpartyresourcedata
.
NewNegotiatedSerializer
(
api
.
Codecs
,
gvk
.
Kind
,
gv
,
gv
)
}
return
restclient
.
RESTClientFor
(
cfg
)
return
restclient
.
RESTClientFor
(
cfg
)
}
}
...
...
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