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
1e1fb73e
Unverified
Commit
1e1fb73e
authored
Dec 09, 2021
by
Hussein Galal
Committed by
GitHub
Dec 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add validation to certificate rotation (#4698)
Signed-off-by:
galal-hussein
<
hussein.galal.ahmed.11@gmail.com
>
parent
03f7af01
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
0 deletions
+36
-0
cert.go
pkg/cli/cert/cert.go
+36
-0
No files found.
pkg/cli/cert/cert.go
View file @
1e1fb73e
...
@@ -33,6 +33,20 @@ const (
...
@@ -33,6 +33,20 @@ const (
k3sServerService
=
"-server"
k3sServerService
=
"-server"
)
)
var
services
=
[]
string
{
adminService
,
apiServerService
,
controllerManagerService
,
schedulerService
,
etcdService
,
version
.
Program
+
programControllerService
,
authProxyService
,
cloudControllerService
,
kubeletService
,
kubeProxyService
,
version
.
Program
+
k3sServerService
,
}
func
commandSetup
(
app
*
cli
.
Context
,
cfg
*
cmds
.
Server
,
sc
*
server
.
Config
)
(
string
,
string
,
error
)
{
func
commandSetup
(
app
*
cli
.
Context
,
cfg
*
cmds
.
Server
,
sc
*
server
.
Config
)
(
string
,
string
,
error
)
{
gspt
.
SetProcTitle
(
os
.
Args
[
0
])
gspt
.
SetProcTitle
(
os
.
Args
[
0
])
...
@@ -115,6 +129,10 @@ func rotate(app *cli.Context, cfg *cmds.Server) error {
...
@@ -115,6 +129,10 @@ func rotate(app *cli.Context, cfg *cmds.Server) error {
serverConfig
.
ControlConfig
.
Runtime
.
ClientETCDCert
=
filepath
.
Join
(
serverConfig
.
ControlConfig
.
DataDir
,
"tls"
,
"etcd"
,
"client.crt"
)
serverConfig
.
ControlConfig
.
Runtime
.
ClientETCDCert
=
filepath
.
Join
(
serverConfig
.
ControlConfig
.
DataDir
,
"tls"
,
"etcd"
,
"client.crt"
)
serverConfig
.
ControlConfig
.
Runtime
.
ClientETCDKey
=
filepath
.
Join
(
serverConfig
.
ControlConfig
.
DataDir
,
"tls"
,
"etcd"
,
"client.key"
)
serverConfig
.
ControlConfig
.
Runtime
.
ClientETCDKey
=
filepath
.
Join
(
serverConfig
.
ControlConfig
.
DataDir
,
"tls"
,
"etcd"
,
"client.key"
)
if
err
:=
validateCertConfig
();
err
!=
nil
{
return
err
}
tlsBackupDir
,
err
:=
backupCertificates
(
serverDataDir
,
agentDataDir
)
tlsBackupDir
,
err
:=
backupCertificates
(
serverDataDir
,
agentDataDir
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
...
@@ -269,3 +287,21 @@ func backupCertificates(serverDataDir, agentDataDir string) (string, error) {
...
@@ -269,3 +287,21 @@ func backupCertificates(serverDataDir, agentDataDir string) (string, error) {
}
}
return
tlsBackupDir
,
nil
return
tlsBackupDir
,
nil
}
}
func
validService
(
svc
string
)
bool
{
for
_
,
service
:=
range
services
{
if
svc
==
service
{
return
true
}
}
return
false
}
func
validateCertConfig
()
error
{
for
_
,
s
:=
range
cmds
.
ServicesList
{
if
!
validService
(
s
)
{
return
errors
.
New
(
"Service "
+
s
+
" is not recognized"
)
}
}
return
nil
}
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