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
7511412c
Commit
7511412c
authored
Aug 08, 2016
by
Kris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make kubectl create use dynamic clients
parent
24c441e9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
42 additions
and
13 deletions
+42
-13
create.go
pkg/kubectl/cmd/create.go
+6
-2
create_test.go
pkg/kubectl/cmd/create_test.go
+15
-11
get_test.go
pkg/kubectl/cmd/get_test.go
+21
-0
No files found.
pkg/kubectl/cmd/create.go
View file @
7511412c
...
...
@@ -27,6 +27,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource"
"k8s.io/kubernetes/pkg/runtime"
)
// CreateOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of
...
...
@@ -107,8 +108,11 @@ func RunCreate(f *cmdutil.Factory, cmd *cobra.Command, out io.Writer, options *C
return
err
}
mapper
,
typer
:=
f
.
Object
(
cmdutil
.
GetIncludeThirdPartyAPIs
(
cmd
))
r
:=
resource
.
NewBuilder
(
mapper
,
typer
,
resource
.
ClientMapperFunc
(
f
.
ClientForMapping
),
f
.
Decoder
(
true
))
.
mapper
,
typer
,
err
:=
f
.
UnstructuredObject
()
if
err
!=
nil
{
return
err
}
r
:=
resource
.
NewBuilder
(
mapper
,
typer
,
resource
.
ClientMapperFunc
(
f
.
UnstructuredClientForMapping
),
runtime
.
UnstructuredJSONScheme
)
.
Schema
(
schema
)
.
ContinueOnError
()
.
NamespaceParam
(
cmdNamespace
)
.
DefaultNamespace
()
.
...
...
pkg/kubectl/cmd/create_test.go
View file @
7511412c
...
...
@@ -21,6 +21,7 @@ import (
"net/http"
"testing"
"k8s.io/kubernetes/pkg/client/typed/dynamic"
"k8s.io/kubernetes/pkg/client/unversioned/fake"
)
...
...
@@ -40,14 +41,15 @@ func TestCreateObject(t *testing.T) {
_
,
_
,
rc
:=
testData
()
rc
.
Items
[
0
]
.
Name
=
"redis-master-controller"
f
,
tf
,
codec
,
ns
:=
NewAPIFactory
()
f
,
tf
,
codec
,
_
:=
NewAPIFactory
()
ns
:=
dynamic
.
ContentConfig
()
.
NegotiatedSerializer
tf
.
Printer
=
&
testPrinter
{}
tf
.
Client
=
&
fake
.
RESTClient
{
NegotiatedSerializer
:
ns
,
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
switch
p
,
m
:=
req
.
URL
.
Path
,
req
.
Method
;
{
case
p
==
"/namespaces/test/replicationcontrollers"
&&
m
==
"POST"
:
return
&
http
.
Response
{
StatusCode
:
201
,
Header
:
defaultHeader
(),
Body
:
objBody
(
codec
,
&
rc
.
Items
[
0
])},
nil
case
p
==
"/namespaces/test/replicationcontrollers"
&&
m
==
http
.
MethodPost
:
return
&
http
.
Response
{
StatusCode
:
http
.
StatusCreated
,
Header
:
defaultHeader
(),
Body
:
objBody
(
codec
,
&
rc
.
Items
[
0
])},
nil
default
:
t
.
Fatalf
(
"unexpected request: %#v
\n
%#v"
,
req
.
URL
,
req
)
return
nil
,
nil
...
...
@@ -72,16 +74,17 @@ func TestCreateMultipleObject(t *testing.T) {
initTestErrorHandler
(
t
)
_
,
svc
,
rc
:=
testData
()
f
,
tf
,
codec
,
ns
:=
NewAPIFactory
()
f
,
tf
,
codec
,
_
:=
NewAPIFactory
()
ns
:=
dynamic
.
ContentConfig
()
.
NegotiatedSerializer
tf
.
Printer
=
&
testPrinter
{}
tf
.
Client
=
&
fake
.
RESTClient
{
NegotiatedSerializer
:
ns
,
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
switch
p
,
m
:=
req
.
URL
.
Path
,
req
.
Method
;
{
case
p
==
"/namespaces/test/services"
&&
m
==
"POST"
:
return
&
http
.
Response
{
StatusCode
:
201
,
Header
:
defaultHeader
(),
Body
:
objBody
(
codec
,
&
svc
.
Items
[
0
])},
nil
case
p
==
"/namespaces/test/replicationcontrollers"
&&
m
==
"POST"
:
return
&
http
.
Response
{
StatusCode
:
201
,
Header
:
defaultHeader
(),
Body
:
objBody
(
codec
,
&
rc
.
Items
[
0
])},
nil
case
p
==
"/namespaces/test/services"
&&
m
==
http
.
MethodPost
:
return
&
http
.
Response
{
StatusCode
:
http
.
StatusCreated
,
Header
:
defaultHeader
(),
Body
:
objBody
(
codec
,
&
svc
.
Items
[
0
])},
nil
case
p
==
"/namespaces/test/replicationcontrollers"
&&
m
==
http
.
MethodPost
:
return
&
http
.
Response
{
StatusCode
:
http
.
StatusCreated
,
Header
:
defaultHeader
(),
Body
:
objBody
(
codec
,
&
rc
.
Items
[
0
])},
nil
default
:
t
.
Fatalf
(
"unexpected request: %#v
\n
%#v"
,
req
.
URL
,
req
)
return
nil
,
nil
...
...
@@ -108,14 +111,15 @@ func TestCreateDirectory(t *testing.T) {
_
,
_
,
rc
:=
testData
()
rc
.
Items
[
0
]
.
Name
=
"name"
f
,
tf
,
codec
,
ns
:=
NewAPIFactory
()
f
,
tf
,
codec
,
_
:=
NewAPIFactory
()
ns
:=
dynamic
.
ContentConfig
()
.
NegotiatedSerializer
tf
.
Printer
=
&
testPrinter
{}
tf
.
Client
=
&
fake
.
RESTClient
{
NegotiatedSerializer
:
ns
,
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
switch
p
,
m
:=
req
.
URL
.
Path
,
req
.
Method
;
{
case
p
==
"/namespaces/test/replicationcontrollers"
&&
m
==
"POST"
:
return
&
http
.
Response
{
StatusCode
:
201
,
Header
:
defaultHeader
(),
Body
:
objBody
(
codec
,
&
rc
.
Items
[
0
])},
nil
case
p
==
"/namespaces/test/replicationcontrollers"
&&
m
==
http
.
MethodPost
:
return
&
http
.
Response
{
StatusCode
:
http
.
StatusCreated
,
Header
:
defaultHeader
(),
Body
:
objBody
(
codec
,
&
rc
.
Items
[
0
])},
nil
default
:
t
.
Fatalf
(
"unexpected request: %#v
\n
%#v"
,
req
.
URL
,
req
)
return
nil
,
nil
...
...
pkg/kubectl/cmd/get_test.go
View file @
7511412c
...
...
@@ -33,6 +33,7 @@ import (
apitesting
"k8s.io/kubernetes/pkg/api/testing"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/client/typed/discovery"
"k8s.io/kubernetes/pkg/client/unversioned/fake"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/runtime/serializer"
...
...
@@ -89,6 +90,26 @@ func testData() (*api.PodList, *api.ServiceList, *api.ReplicationControllerList)
return
pods
,
svc
,
rc
}
func
testDynamicResources
()
[]
*
discovery
.
APIGroupResources
{
return
[]
*
discovery
.
APIGroupResources
{
{
Group
:
unversioned
.
APIGroup
{
Versions
:
[]
unversioned
.
GroupVersionForDiscovery
{
{
Version
:
"v1"
},
},
PreferredVersion
:
unversioned
.
GroupVersionForDiscovery
{
Version
:
"v1"
},
},
VersionedResources
:
map
[
string
][]
unversioned
.
APIResource
{
"v1"
:
{
{
Name
:
"pods"
,
Namespaced
:
true
,
Kind
:
"Pod"
},
{
Name
:
"services"
,
Namespaced
:
true
,
Kind
:
"Service"
},
{
Name
:
"replicationcontrollers"
,
Namespaced
:
true
,
Kind
:
"ReplicationController"
},
},
},
},
}
}
func
testComponentStatusData
()
*
api
.
ComponentStatusList
{
good
:=
api
.
ComponentStatus
{
Conditions
:
[]
api
.
ComponentCondition
{
...
...
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