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
7412be44
Commit
7412be44
authored
Oct 14, 2016
by
deads2k
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
default serializer
parent
c3742a8f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
1 addition
and
7 deletions
+1
-7
server.go
cmd/kube-apiserver/app/server.go
+0
-1
apiserver.go
examples/apiserver/apiserver.go
+0
-1
server.go
federation/cmd/federation-apiserver/app/server.go
+0
-1
config.go
pkg/genericapiserver/config.go
+1
-0
genericapiserver_test.go
pkg/genericapiserver/genericapiserver_test.go
+0
-2
master_test.go
pkg/master/master_test.go
+0
-1
master_utils.go
test/integration/framework/master_utils.go
+0
-1
No files found.
cmd/kube-apiserver/app/server.go
View file @
7412be44
...
@@ -303,7 +303,6 @@ func Run(s *options.APIServer) error {
...
@@ -303,7 +303,6 @@ func Run(s *options.APIServer) error {
genericConfig
.
MasterServiceNamespace
=
s
.
MasterServiceNamespace
genericConfig
.
MasterServiceNamespace
=
s
.
MasterServiceNamespace
genericConfig
.
ProxyDialer
=
proxyDialerFn
genericConfig
.
ProxyDialer
=
proxyDialerFn
genericConfig
.
ProxyTLSClientConfig
=
proxyTLSClientConfig
genericConfig
.
ProxyTLSClientConfig
=
proxyTLSClientConfig
genericConfig
.
Serializer
=
api
.
Codecs
genericConfig
.
OpenAPIConfig
.
Info
.
Title
=
"Kubernetes"
genericConfig
.
OpenAPIConfig
.
Info
.
Title
=
"Kubernetes"
genericConfig
.
OpenAPIConfig
.
Definitions
=
generatedopenapi
.
OpenAPIDefinitions
genericConfig
.
OpenAPIConfig
.
Definitions
=
generatedopenapi
.
OpenAPIDefinitions
genericConfig
.
OpenAPIConfig
.
GetOperationID
=
openapi
.
GetOperationID
genericConfig
.
OpenAPIConfig
.
GetOperationID
=
openapi
.
GetOperationID
...
...
examples/apiserver/apiserver.go
View file @
7412be44
...
@@ -74,7 +74,6 @@ func Run(serverOptions *genericoptions.ServerRunOptions) error {
...
@@ -74,7 +74,6 @@ func Run(serverOptions *genericoptions.ServerRunOptions) error {
}
}
config
.
Authorizer
=
authorizer
.
NewAlwaysAllowAuthorizer
()
config
.
Authorizer
=
authorizer
.
NewAlwaysAllowAuthorizer
()
config
.
Serializer
=
api
.
Codecs
s
,
err
:=
config
.
New
()
s
,
err
:=
config
.
New
()
if
err
!=
nil
{
if
err
!=
nil
{
return
fmt
.
Errorf
(
"Error in bringing up the server: %v"
,
err
)
return
fmt
.
Errorf
(
"Error in bringing up the server: %v"
,
err
)
...
...
federation/cmd/federation-apiserver/app/server.go
View file @
7412be44
...
@@ -191,7 +191,6 @@ func Run(s *options.ServerRunOptions) error {
...
@@ -191,7 +191,6 @@ func Run(s *options.ServerRunOptions) error {
genericConfig
.
AdmissionControl
=
admissionController
genericConfig
.
AdmissionControl
=
admissionController
genericConfig
.
APIResourceConfigSource
=
storageFactory
.
APIResourceConfigSource
genericConfig
.
APIResourceConfigSource
=
storageFactory
.
APIResourceConfigSource
genericConfig
.
MasterServiceNamespace
=
s
.
MasterServiceNamespace
genericConfig
.
MasterServiceNamespace
=
s
.
MasterServiceNamespace
genericConfig
.
Serializer
=
api
.
Codecs
genericConfig
.
OpenAPIConfig
.
Definitions
=
openapi
.
OpenAPIDefinitions
genericConfig
.
OpenAPIConfig
.
Definitions
=
openapi
.
OpenAPIDefinitions
// Reusing api-server's GetOperationID function. if federation and api-server spec diverge and
// Reusing api-server's GetOperationID function. if federation and api-server spec diverge and
// this method does not provide good operation IDs for federation, we should create federation's own GetOperationID.
// this method does not provide good operation IDs for federation, we should create federation's own GetOperationID.
...
...
pkg/genericapiserver/config.go
View file @
7412be44
...
@@ -202,6 +202,7 @@ func NewConfig() *Config {
...
@@ -202,6 +202,7 @@ func NewConfig() *Config {
longRunningRE
:=
regexp
.
MustCompile
(
options
.
DefaultLongRunningRequestRE
)
longRunningRE
:=
regexp
.
MustCompile
(
options
.
DefaultLongRunningRequestRE
)
config
:=
&
Config
{
config
:=
&
Config
{
Serializer
:
api
.
Codecs
,
MasterCount
:
1
,
MasterCount
:
1
,
ReadWritePort
:
6443
,
ReadWritePort
:
6443
,
ServiceReadWritePort
:
443
,
ServiceReadWritePort
:
443
,
...
...
pkg/genericapiserver/genericapiserver_test.go
View file @
7412be44
...
@@ -55,7 +55,6 @@ func setUp(t *testing.T) (*etcdtesting.EtcdTestServer, Config, *assert.Assertion
...
@@ -55,7 +55,6 @@ func setUp(t *testing.T) (*etcdtesting.EtcdTestServer, Config, *assert.Assertion
config
.
RequestContextMapper
=
api
.
NewRequestContextMapper
()
config
.
RequestContextMapper
=
api
.
NewRequestContextMapper
()
config
.
ProxyDialer
=
func
(
network
,
addr
string
)
(
net
.
Conn
,
error
)
{
return
nil
,
nil
}
config
.
ProxyDialer
=
func
(
network
,
addr
string
)
(
net
.
Conn
,
error
)
{
return
nil
,
nil
}
config
.
ProxyTLSClientConfig
=
&
tls
.
Config
{}
config
.
ProxyTLSClientConfig
=
&
tls
.
Config
{}
config
.
Serializer
=
api
.
Codecs
config
.
LegacyAPIGroupPrefixes
=
sets
.
NewString
(
"/api"
)
config
.
LegacyAPIGroupPrefixes
=
sets
.
NewString
(
"/api"
)
config
.
APIGroupPrefix
=
"/apis"
config
.
APIGroupPrefix
=
"/apis"
...
@@ -164,7 +163,6 @@ func TestCustomHandlerChain(t *testing.T) {
...
@@ -164,7 +163,6 @@ func TestCustomHandlerChain(t *testing.T) {
var
protected
,
called
bool
var
protected
,
called
bool
config
.
Serializer
=
api
.
Codecs
config
.
BuildHandlerChainsFunc
=
func
(
apiHandler
http
.
Handler
,
c
*
Config
)
(
secure
,
insecure
http
.
Handler
)
{
config
.
BuildHandlerChainsFunc
=
func
(
apiHandler
http
.
Handler
,
c
*
Config
)
(
secure
,
insecure
http
.
Handler
)
{
return
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
return
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
protected
=
true
protected
=
true
...
...
pkg/master/master_test.go
View file @
7412be44
...
@@ -87,7 +87,6 @@ func setUp(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *assert.
...
@@ -87,7 +87,6 @@ func setUp(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *assert.
config
.
GenericConfig
.
LoopbackClientConfig
=
&
restclient
.
Config
{
APIPath
:
"/api"
,
ContentConfig
:
restclient
.
ContentConfig
{
NegotiatedSerializer
:
api
.
Codecs
}}
config
.
GenericConfig
.
LoopbackClientConfig
=
&
restclient
.
Config
{
APIPath
:
"/api"
,
ContentConfig
:
restclient
.
ContentConfig
{
NegotiatedSerializer
:
api
.
Codecs
}}
config
.
GenericConfig
.
APIResourceConfigSource
=
DefaultAPIResourceConfigSource
()
config
.
GenericConfig
.
APIResourceConfigSource
=
DefaultAPIResourceConfigSource
()
config
.
GenericConfig
.
PublicAddress
=
net
.
ParseIP
(
"192.168.10.4"
)
config
.
GenericConfig
.
PublicAddress
=
net
.
ParseIP
(
"192.168.10.4"
)
config
.
GenericConfig
.
Serializer
=
api
.
Codecs
config
.
KubeletClient
=
client
.
FakeKubeletClient
{}
config
.
KubeletClient
=
client
.
FakeKubeletClient
{}
config
.
GenericConfig
.
LegacyAPIGroupPrefixes
=
sets
.
NewString
(
"/api"
)
config
.
GenericConfig
.
LegacyAPIGroupPrefixes
=
sets
.
NewString
(
"/api"
)
config
.
GenericConfig
.
APIGroupPrefix
=
"/apis"
config
.
GenericConfig
.
APIGroupPrefix
=
"/apis"
...
...
test/integration/framework/master_utils.go
View file @
7412be44
...
@@ -347,7 +347,6 @@ func NewMasterConfig() *master.Config {
...
@@ -347,7 +347,6 @@ func NewMasterConfig() *master.Config {
genericConfig
.
APIResourceConfigSource
=
master
.
DefaultAPIResourceConfigSource
()
genericConfig
.
APIResourceConfigSource
=
master
.
DefaultAPIResourceConfigSource
()
genericConfig
.
Authorizer
=
authorizer
.
NewAlwaysAllowAuthorizer
()
genericConfig
.
Authorizer
=
authorizer
.
NewAlwaysAllowAuthorizer
()
genericConfig
.
AdmissionControl
=
admit
.
NewAlwaysAdmit
()
genericConfig
.
AdmissionControl
=
admit
.
NewAlwaysAdmit
()
genericConfig
.
Serializer
=
api
.
Codecs
genericConfig
.
EnableOpenAPISupport
=
true
genericConfig
.
EnableOpenAPISupport
=
true
return
&
master
.
Config
{
return
&
master
.
Config
{
...
...
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