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
90ba15ee
Commit
90ba15ee
authored
Jun 05, 2018
by
Mike Danese
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
auth: standalone kubelets shouldn't start a token manager
parent
f1bfde49
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
6 deletions
+10
-6
kubelet.go
pkg/kubelet/kubelet.go
+1
-1
kubelet_test.go
pkg/kubelet/kubelet_test.go
+1
-1
BUILD
pkg/kubelet/token/BUILD
+1
-1
token_manager.go
pkg/kubelet/token/token_manager.go
+7
-3
No files found.
pkg/kubelet/kubelet.go
View file @
90ba15ee
...
@@ -780,7 +780,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
...
@@ -780,7 +780,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
containerRefManager
,
containerRefManager
,
kubeDeps
.
Recorder
)
kubeDeps
.
Recorder
)
tokenManager
:=
token
.
NewManager
(
kubeDeps
.
KubeClient
.
CoreV1
()
)
tokenManager
:=
token
.
NewManager
(
kubeDeps
.
KubeClient
)
klet
.
volumePluginMgr
,
err
=
klet
.
volumePluginMgr
,
err
=
NewInitializedVolumePluginMgr
(
klet
,
secretManager
,
configMapManager
,
tokenManager
,
kubeDeps
.
VolumePlugins
,
kubeDeps
.
DynamicPluginProber
)
NewInitializedVolumePluginMgr
(
klet
,
secretManager
,
configMapManager
,
tokenManager
,
kubeDeps
.
VolumePlugins
,
kubeDeps
.
DynamicPluginProber
)
...
...
pkg/kubelet/kubelet_test.go
View file @
90ba15ee
...
@@ -326,7 +326,7 @@ func newTestKubeletWithImageList(
...
@@ -326,7 +326,7 @@ func newTestKubeletWithImageList(
var
prober
volume
.
DynamicPluginProber
=
nil
// TODO (#51147) inject mock
var
prober
volume
.
DynamicPluginProber
=
nil
// TODO (#51147) inject mock
kubelet
.
volumePluginMgr
,
err
=
kubelet
.
volumePluginMgr
,
err
=
NewInitializedVolumePluginMgr
(
kubelet
,
kubelet
.
secretManager
,
kubelet
.
configMapManager
,
token
.
NewManager
(
kubelet
.
kubeClient
.
CoreV1
()
),
allPlugins
,
prober
)
NewInitializedVolumePluginMgr
(
kubelet
,
kubelet
.
secretManager
,
kubelet
.
configMapManager
,
token
.
NewManager
(
kubelet
.
kubeClient
),
allPlugins
,
prober
)
require
.
NoError
(
t
,
err
,
"Failed to initialize VolumePluginMgr"
)
require
.
NoError
(
t
,
err
,
"Failed to initialize VolumePluginMgr"
)
kubelet
.
mounter
=
&
mount
.
FakeMounter
{}
kubelet
.
mounter
=
&
mount
.
FakeMounter
{}
...
...
pkg/kubelet/token/BUILD
View file @
90ba15ee
...
@@ -24,7 +24,7 @@ go_library(
...
@@ -24,7 +24,7 @@ go_library(
"//vendor/k8s.io/api/authentication/v1:go_default_library",
"//vendor/k8s.io/api/authentication/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//vendor/k8s.io/client-go/kubernetes
/typed/core/v1
:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
],
],
)
)
...
...
pkg/kubelet/token/token_manager.go
View file @
90ba15ee
...
@@ -19,6 +19,7 @@ limitations under the License.
...
@@ -19,6 +19,7 @@ limitations under the License.
package
token
package
token
import
(
import
(
"errors"
"fmt"
"fmt"
"sync"
"sync"
"time"
"time"
...
@@ -27,7 +28,7 @@ import (
...
@@ -27,7 +28,7 @@ import (
authenticationv1
"k8s.io/api/authentication/v1"
authenticationv1
"k8s.io/api/authentication/v1"
"k8s.io/apimachinery/pkg/util/clock"
"k8s.io/apimachinery/pkg/util/clock"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/util/wait"
c
orev1
"k8s.io/client-go/kubernetes/typed/core/v1
"
c
lientset
"k8s.io/client-go/kubernetes
"
)
)
const
(
const
(
...
@@ -36,10 +37,13 @@ const (
...
@@ -36,10 +37,13 @@ const (
)
)
// NewManager returns a new token manager.
// NewManager returns a new token manager.
func
NewManager
(
c
c
orev1
.
CoreV1
Interface
)
*
Manager
{
func
NewManager
(
c
c
lientset
.
Interface
)
*
Manager
{
m
:=
&
Manager
{
m
:=
&
Manager
{
getToken
:
func
(
name
,
namespace
string
,
tr
*
authenticationv1
.
TokenRequest
)
(
*
authenticationv1
.
TokenRequest
,
error
)
{
getToken
:
func
(
name
,
namespace
string
,
tr
*
authenticationv1
.
TokenRequest
)
(
*
authenticationv1
.
TokenRequest
,
error
)
{
return
c
.
ServiceAccounts
(
namespace
)
.
CreateToken
(
name
,
tr
)
if
c
==
nil
{
return
nil
,
errors
.
New
(
"cannot use TokenManager when kubelet is in standalone mode"
)
}
return
c
.
CoreV1
()
.
ServiceAccounts
(
namespace
)
.
CreateToken
(
name
,
tr
)
},
},
cache
:
make
(
map
[
string
]
*
authenticationv1
.
TokenRequest
),
cache
:
make
(
map
[
string
]
*
authenticationv1
.
TokenRequest
),
clock
:
clock
.
RealClock
{},
clock
:
clock
.
RealClock
{},
...
...
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