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
62d56060
Commit
62d56060
authored
Aug 24, 2018
by
Tim Allclair
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused kubelet dependency
parent
3da79f5c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
11 deletions
+2
-11
server.go
cmd/kubelet/app/server.go
+2
-10
kubelet.go
pkg/kubelet/kubelet.go
+0
-1
No files found.
cmd/kubelet/app/server.go
View file @
62d56060
...
@@ -387,7 +387,6 @@ func UnsecuredDependencies(s *options.KubeletServer) (*kubelet.Dependencies, err
...
@@ -387,7 +387,6 @@ func UnsecuredDependencies(s *options.KubeletServer) (*kubelet.Dependencies, err
DockerClientConfig
:
dockerClientConfig
,
DockerClientConfig
:
dockerClientConfig
,
KubeClient
:
nil
,
KubeClient
:
nil
,
HeartbeatClient
:
nil
,
HeartbeatClient
:
nil
,
ExternalKubeClient
:
nil
,
EventClient
:
nil
,
EventClient
:
nil
,
Mounter
:
mounter
,
Mounter
:
mounter
,
OOMAdjuster
:
oom
.
NewOOMAdjuster
(),
OOMAdjuster
:
oom
.
NewOOMAdjuster
(),
...
@@ -545,16 +544,14 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, stopCh <-chan
...
@@ -545,16 +544,14 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, stopCh <-chan
// if in standalone mode, indicate as much by setting all clients to nil
// if in standalone mode, indicate as much by setting all clients to nil
if
standaloneMode
{
if
standaloneMode
{
kubeDeps
.
KubeClient
=
nil
kubeDeps
.
KubeClient
=
nil
kubeDeps
.
ExternalKubeClient
=
nil
kubeDeps
.
EventClient
=
nil
kubeDeps
.
EventClient
=
nil
kubeDeps
.
HeartbeatClient
=
nil
kubeDeps
.
HeartbeatClient
=
nil
glog
.
Warningf
(
"standalone mode, no API client"
)
glog
.
Warningf
(
"standalone mode, no API client"
)
}
else
if
kubeDeps
.
KubeClient
==
nil
||
kubeDeps
.
E
xternalKubeClient
==
nil
||
kubeDeps
.
E
ventClient
==
nil
||
kubeDeps
.
HeartbeatClient
==
nil
{
}
else
if
kubeDeps
.
KubeClient
==
nil
||
kubeDeps
.
EventClient
==
nil
||
kubeDeps
.
HeartbeatClient
==
nil
{
// initialize clients if not standalone mode and any of the clients are not provided
// initialize clients if not standalone mode and any of the clients are not provided
var
kubeClient
clientset
.
Interface
var
kubeClient
clientset
.
Interface
var
eventClient
v1core
.
EventsGetter
var
eventClient
v1core
.
EventsGetter
var
heartbeatClient
clientset
.
Interface
var
heartbeatClient
clientset
.
Interface
var
externalKubeClient
clientset
.
Interface
clientConfig
,
err
:=
createAPIServerClientConfig
(
s
)
clientConfig
,
err
:=
createAPIServerClientConfig
(
s
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -584,10 +581,6 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, stopCh <-chan
...
@@ -584,10 +581,6 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, stopCh <-chan
clientCertificateManager
.
SetCertificateSigningRequestClient
(
kubeClient
.
CertificatesV1beta1
()
.
CertificateSigningRequests
())
clientCertificateManager
.
SetCertificateSigningRequestClient
(
kubeClient
.
CertificatesV1beta1
()
.
CertificateSigningRequests
())
clientCertificateManager
.
Start
()
clientCertificateManager
.
Start
()
}
}
externalKubeClient
,
err
=
clientset
.
NewForConfig
(
clientConfig
)
if
err
!=
nil
{
glog
.
Warningf
(
"New kubeClient from clientConfig error: %v"
,
err
)
}
// make a separate client for events
// make a separate client for events
eventClientConfig
:=
*
clientConfig
eventClientConfig
:=
*
clientConfig
...
@@ -615,7 +608,6 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, stopCh <-chan
...
@@ -615,7 +608,6 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, stopCh <-chan
}
}
kubeDeps
.
KubeClient
=
kubeClient
kubeDeps
.
KubeClient
=
kubeClient
kubeDeps
.
ExternalKubeClient
=
externalKubeClient
if
heartbeatClient
!=
nil
{
if
heartbeatClient
!=
nil
{
kubeDeps
.
HeartbeatClient
=
heartbeatClient
kubeDeps
.
HeartbeatClient
=
heartbeatClient
kubeDeps
.
OnHeartbeatFailure
=
closeAllConns
kubeDeps
.
OnHeartbeatFailure
=
closeAllConns
...
@@ -634,7 +626,7 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, stopCh <-chan
...
@@ -634,7 +626,7 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, stopCh <-chan
}
}
if
kubeDeps
.
Auth
==
nil
{
if
kubeDeps
.
Auth
==
nil
{
auth
,
err
:=
BuildAuth
(
nodeName
,
kubeDeps
.
External
KubeClient
,
s
.
KubeletConfiguration
)
auth
,
err
:=
BuildAuth
(
nodeName
,
kubeDeps
.
KubeClient
,
s
.
KubeletConfiguration
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
...
pkg/kubelet/kubelet.go
View file @
62d56060
...
@@ -243,7 +243,6 @@ type Dependencies struct {
...
@@ -243,7 +243,6 @@ type Dependencies struct {
HeartbeatClient
clientset
.
Interface
HeartbeatClient
clientset
.
Interface
OnHeartbeatFailure
func
()
OnHeartbeatFailure
func
()
KubeClient
clientset
.
Interface
KubeClient
clientset
.
Interface
ExternalKubeClient
clientset
.
Interface
Mounter
mount
.
Interface
Mounter
mount
.
Interface
OOMAdjuster
*
oom
.
OOMAdjuster
OOMAdjuster
*
oom
.
OOMAdjuster
OSInterface
kubecontainer
.
OSInterface
OSInterface
kubecontainer
.
OSInterface
...
...
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