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
b1f67e93
Commit
b1f67e93
authored
Feb 01, 2019
by
David Eads
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
catch some unhandled errors
parent
27d49584
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
5 deletions
+16
-5
aggregator.go
cmd/kube-apiserver/app/aggregator.go
+12
-4
apiextensions.go
cmd/kube-apiserver/app/apiextensions.go
+4
-1
No files found.
cmd/kube-apiserver/app/aggregator.go
View file @
b1f67e93
...
...
@@ -66,12 +66,15 @@ func createAggregatorConfig(
// override genericConfig.AdmissionControl with kube-aggregator's scheme,
// because aggregator apiserver should use its own scheme to convert its own resources.
commandOptions
.
Admission
.
ApplyTo
(
err
:=
commandOptions
.
Admission
.
ApplyTo
(
&
genericConfig
,
externalInformers
,
genericConfig
.
LoopbackClientConfig
,
aggregatorscheme
.
Scheme
,
pluginInitializers
...
)
if
err
!=
nil
{
return
nil
,
err
}
// copy the etcd options so we don't mutate originals.
etcdOptions
:=
*
commandOptions
.
Etcd
...
...
@@ -87,7 +90,6 @@ func createAggregatorConfig(
return
nil
,
err
}
var
err
error
var
certBytes
,
keyBytes
[]
byte
if
len
(
commandOptions
.
ProxyClientCertFile
)
>
0
&&
len
(
commandOptions
.
ProxyClientKeyFile
)
>
0
{
certBytes
,
err
=
ioutil
.
ReadFile
(
commandOptions
.
ProxyClientCertFile
)
...
...
@@ -133,7 +135,7 @@ func createAggregatorServer(aggregatorConfig *aggregatorapiserver.Config, delega
apiExtensionInformers
.
Apiextensions
()
.
InternalVersion
()
.
CustomResourceDefinitions
(),
autoRegistrationController
)
aggregatorServer
.
GenericAPIServer
.
AddPostStartHook
(
"kube-apiserver-autoregistration"
,
func
(
context
genericapiserver
.
PostStartHookContext
)
error
{
err
=
aggregatorServer
.
GenericAPIServer
.
AddPostStartHook
(
"kube-apiserver-autoregistration"
,
func
(
context
genericapiserver
.
PostStartHookContext
)
error
{
go
crdRegistrationController
.
Run
(
5
,
context
.
StopCh
)
go
func
()
{
// let the CRD controller process the initial set of CRDs before starting the autoregistration controller.
...
...
@@ -146,14 +148,20 @@ func createAggregatorServer(aggregatorConfig *aggregatorapiserver.Config, delega
}()
return
nil
})
if
err
!=
nil
{
return
nil
,
err
}
aggregatorServer
.
GenericAPIServer
.
AddHealthzChecks
(
err
=
aggregatorServer
.
GenericAPIServer
.
AddHealthzChecks
(
makeAPIServiceAvailableHealthzCheck
(
"autoregister-completion"
,
apiServices
,
aggregatorServer
.
APIRegistrationInformers
.
Apiregistration
()
.
InternalVersion
()
.
APIServices
(),
),
)
if
err
!=
nil
{
return
nil
,
err
}
return
aggregatorServer
,
nil
}
...
...
cmd/kube-apiserver/app/apiextensions.go
View file @
b1f67e93
...
...
@@ -48,12 +48,15 @@ func createAPIExtensionsConfig(
// override genericConfig.AdmissionControl with apiextensions' scheme,
// because apiextentions apiserver should use its own scheme to convert resources.
commandOptions
.
Admission
.
ApplyTo
(
err
:=
commandOptions
.
Admission
.
ApplyTo
(
&
genericConfig
,
externalInformers
,
genericConfig
.
LoopbackClientConfig
,
apiextensionsapiserver
.
Scheme
,
pluginInitializers
...
)
if
err
!=
nil
{
return
nil
,
err
}
// copy the etcd options so we don't mutate originals.
etcdOptions
:=
*
commandOptions
.
Etcd
...
...
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