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
957c0955
Unverified
Commit
957c0955
authored
Sep 30, 2016
by
Clayton Coleman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Run defaulting on the scheduler startup
parent
3ee591d7
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
3 deletions
+13
-3
options.go
cmd/kube-proxy/app/options/options.go
+3
-1
options.go
cmd/kubelet/app/options/options.go
+3
-1
server.go
cmd/kubelet/app/server.go
+1
-0
hollow_kubelet.go
pkg/kubemark/hollow_kubelet.go
+1
-0
options.go
plugin/cmd/kube-scheduler/app/options/options.go
+3
-1
dynamic_kubelet_configuration_test.go
test/e2e_node/dynamic_kubelet_configuration_test.go
+2
-0
No files found.
cmd/kube-proxy/app/options/options.go
View file @
957c0955
...
@@ -50,8 +50,10 @@ type ProxyServerConfig struct {
...
@@ -50,8 +50,10 @@ type ProxyServerConfig struct {
}
}
func
NewProxyConfig
()
*
ProxyServerConfig
{
func
NewProxyConfig
()
*
ProxyServerConfig
{
versioned
:=
&
v1alpha1
.
KubeProxyConfiguration
{}
api
.
Scheme
.
Default
(
versioned
)
cfg
:=
componentconfig
.
KubeProxyConfiguration
{}
cfg
:=
componentconfig
.
KubeProxyConfiguration
{}
api
.
Scheme
.
Convert
(
&
v1alpha1
.
KubeProxyConfiguration
{}
,
&
cfg
,
nil
)
api
.
Scheme
.
Convert
(
versioned
,
&
cfg
,
nil
)
return
&
ProxyServerConfig
{
return
&
ProxyServerConfig
{
KubeProxyConfiguration
:
cfg
,
KubeProxyConfiguration
:
cfg
,
ContentType
:
"application/vnd.kubernetes.protobuf"
,
ContentType
:
"application/vnd.kubernetes.protobuf"
,
...
...
cmd/kubelet/app/options/options.go
View file @
957c0955
...
@@ -64,8 +64,10 @@ type KubeletServer struct {
...
@@ -64,8 +64,10 @@ type KubeletServer struct {
// NewKubeletServer will create a new KubeletServer with default values.
// NewKubeletServer will create a new KubeletServer with default values.
func
NewKubeletServer
()
*
KubeletServer
{
func
NewKubeletServer
()
*
KubeletServer
{
versioned
:=
&
v1alpha1
.
KubeletConfiguration
{}
api
.
Scheme
.
Default
(
versioned
)
config
:=
componentconfig
.
KubeletConfiguration
{}
config
:=
componentconfig
.
KubeletConfiguration
{}
api
.
Scheme
.
Convert
(
&
v1alpha1
.
KubeletConfiguration
{}
,
&
config
,
nil
)
api
.
Scheme
.
Convert
(
versioned
,
&
config
,
nil
)
return
&
KubeletServer
{
return
&
KubeletServer
{
KubeConfig
:
flag
.
NewStringFlag
(
"/var/lib/kubelet/kubeconfig"
),
KubeConfig
:
flag
.
NewStringFlag
(
"/var/lib/kubelet/kubeconfig"
),
RequireKubeConfig
:
false
,
// in 1.5, default to true
RequireKubeConfig
:
false
,
// in 1.5, default to true
...
...
cmd/kubelet/app/server.go
View file @
957c0955
...
@@ -246,6 +246,7 @@ func initKubeletConfigSync(s *options.KubeletServer) (*componentconfig.KubeletCo
...
@@ -246,6 +246,7 @@ func initKubeletConfigSync(s *options.KubeletServer) (*componentconfig.KubeletCo
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
api
.
Scheme
.
Default
(
&
extKC
)
kc
:=
componentconfig
.
KubeletConfiguration
{}
kc
:=
componentconfig
.
KubeletConfiguration
{}
err
=
api
.
Scheme
.
Convert
(
&
extKC
,
&
kc
,
nil
)
err
=
api
.
Scheme
.
Convert
(
&
extKC
,
&
kc
,
nil
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
pkg/kubemark/hollow_kubelet.go
View file @
957c0955
...
@@ -103,6 +103,7 @@ func GetHollowKubeletConfig(
...
@@ -103,6 +103,7 @@ func GetHollowKubeletConfig(
// Do the external -> internal conversion to make sure that defaults
// Do the external -> internal conversion to make sure that defaults
// are set for fields not overridden in NewHollowKubelet.
// are set for fields not overridden in NewHollowKubelet.
tmp
:=
&
v1alpha1
.
KubeletConfiguration
{}
tmp
:=
&
v1alpha1
.
KubeletConfiguration
{}
api
.
Scheme
.
Default
(
tmp
)
c
:=
&
componentconfig
.
KubeletConfiguration
{}
c
:=
&
componentconfig
.
KubeletConfiguration
{}
api
.
Scheme
.
Convert
(
tmp
,
c
,
nil
)
api
.
Scheme
.
Convert
(
tmp
,
c
,
nil
)
...
...
plugin/cmd/kube-scheduler/app/options/options.go
View file @
957c0955
...
@@ -42,8 +42,10 @@ type SchedulerServer struct {
...
@@ -42,8 +42,10 @@ type SchedulerServer struct {
// NewSchedulerServer creates a new SchedulerServer with default parameters
// NewSchedulerServer creates a new SchedulerServer with default parameters
func
NewSchedulerServer
()
*
SchedulerServer
{
func
NewSchedulerServer
()
*
SchedulerServer
{
versioned
:=
&
v1alpha1
.
KubeSchedulerConfiguration
{}
api
.
Scheme
.
Default
(
versioned
)
cfg
:=
componentconfig
.
KubeSchedulerConfiguration
{}
cfg
:=
componentconfig
.
KubeSchedulerConfiguration
{}
api
.
Scheme
.
Convert
(
&
v1alpha1
.
KubeSchedulerConfiguration
{}
,
&
cfg
,
nil
)
api
.
Scheme
.
Convert
(
versioned
,
&
cfg
,
nil
)
cfg
.
LeaderElection
.
LeaderElect
=
true
cfg
.
LeaderElection
.
LeaderElect
=
true
s
:=
SchedulerServer
{
s
:=
SchedulerServer
{
KubeSchedulerConfiguration
:
cfg
,
KubeSchedulerConfiguration
:
cfg
,
...
...
test/e2e_node/dynamic_kubelet_configuration_test.go
View file @
957c0955
...
@@ -142,6 +142,8 @@ func decodeConfigz(resp *http.Response) (*componentconfig.KubeletConfiguration,
...
@@ -142,6 +142,8 @@ func decodeConfigz(resp *http.Response) (*componentconfig.KubeletConfiguration,
return
nil
,
err
return
nil
,
err
}
}
api
.
Scheme
.
Default
(
&
configz
.
ComponentConfig
)
err
=
api
.
Scheme
.
Convert
(
&
configz
.
ComponentConfig
,
&
kubeCfg
,
nil
)
err
=
api
.
Scheme
.
Convert
(
&
configz
.
ComponentConfig
,
&
kubeCfg
,
nil
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
...
...
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