github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 05:01:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10264 from mikedanese/ca-token

Browse Source 
add ca cert to token controller and all service accounts
This commit is contained in:
Maxwell Forbes
2015-06-25 09:56:35 -07:00
parent fc349fdd47 5760fe1957
commit 655179dcfb
11 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/mesos/pkg/controllermanager/controllermanager.go
View File

@@ -157,9 +157,10 @@ func (s *CMServer) Run(_ []string) error {
} else {
serviceaccount.NewTokensController(
kubeClient,
serviceaccount.DefaultTokenControllerOptions(
serviceaccount.JWTTokenGenerator(privateKey),
),
serviceaccount.TokensControllerOptions{
TokenGenerator: serviceaccount.JWTTokenGenerator(privateKey),
RootCA: kubeconfig.CAData,
},
).Run()
}
}