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
93f6690f
Commit
93f6690f
authored
Jun 21, 2019
by
Erik Wilson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Graceful upgrade token to server CA
parent
1e035820
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
1 deletion
+18
-1
server.go
pkg/daemons/control/server.go
+18
-1
No files found.
pkg/daemons/control/server.go
View file @
93f6690f
...
@@ -524,8 +524,25 @@ func genClientCerts(config *config.Control, runtime *config.ControlRuntime) erro
...
@@ -524,8 +524,25 @@ func genClientCerts(config *config.Control, runtime *config.ControlRuntime) erro
return
nil
return
nil
}
}
func
createServerSigningCertKey
(
config
*
config
.
Control
,
runtime
*
config
.
ControlRuntime
)
(
bool
,
error
)
{
TokenCA
:=
path
.
Join
(
config
.
DataDir
,
"tls"
,
"token-ca.crt"
)
TokenCAKey
:=
path
.
Join
(
config
.
DataDir
,
"tls"
,
"token-ca.key"
)
if
exists
(
TokenCA
,
TokenCAKey
)
&&
!
exists
(
runtime
.
ServerCA
)
&&
!
exists
(
runtime
.
ServerCAKey
)
{
logrus
.
Infof
(
"Upgrading token-ca files to server-ca"
)
if
err
:=
os
.
Link
(
TokenCA
,
runtime
.
ServerCA
);
err
!=
nil
{
return
false
,
err
}
if
err
:=
os
.
Link
(
TokenCAKey
,
runtime
.
ServerCAKey
);
err
!=
nil
{
return
false
,
err
}
return
true
,
nil
}
return
createSigningCertKey
(
"k3s-server"
,
runtime
.
ServerCA
,
runtime
.
ServerCAKey
)
}
func
genServerCerts
(
config
*
config
.
Control
,
runtime
*
config
.
ControlRuntime
)
error
{
func
genServerCerts
(
config
*
config
.
Control
,
runtime
*
config
.
ControlRuntime
)
error
{
regen
,
err
:=
createS
igningCertKey
(
"k3s-server"
,
runtime
.
ServerCA
,
runtime
.
ServerCAKey
)
regen
,
err
:=
createS
erverSigningCertKey
(
config
,
runtime
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
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