Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Hepto
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ACIDES
Hepto
Commits
f663ad38
Commit
f663ad38
authored
2 years ago
by
kaiyou
Browse files
Options
Downloads
Patches
Plain Diff
Make certificates persistent
parent
75c92318
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#22681
failed
2 years ago
Stage: build
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmd/hepto/config.go
+2
-0
2 additions, 0 deletions
cmd/hepto/config.go
pkg/cluster/certs.go
+5
-4
5 additions, 4 deletions
pkg/cluster/certs.go
pkg/cluster/config.go
+2
-0
2 additions, 0 deletions
pkg/cluster/config.go
with
9 additions
and
4 deletions
cmd/hepto/config.go
+
2
−
0
View file @
f663ad38
...
...
@@ -35,12 +35,14 @@ func (c *Config) Complete() error {
c
.
Container
.
Logger
=
c
.
Logger
c
.
Cluster
.
Logger
=
c
.
Logger
c
.
Cluster
.
ZapLogger
=
logger
c
.
Cluster
.
CertsPath
=
"/certs"
// Setup paths and container settings
c
.
Container
.
Data
=
path
.
Join
(
c
.
DataDir
,
c
.
Cluster
.
Name
,
c
.
Node
.
Name
)
err
=
os
.
MkdirAll
(
c
.
Container
.
Data
,
0
o700
)
if
err
!=
nil
{
return
err
}
c
.
Container
.
Mounts
[
c
.
Cluster
.
CertsPath
]
=
path
.
Join
(
c
.
Container
.
Data
,
"certs"
)
c
.
Container
.
Name
=
c
.
Node
.
Name
c
.
Container
.
Capabilities
=
additionalCapabilities
c
.
Container
.
Devices
=
additionalDevices
...
...
This diff is collapsed.
Click to expand it.
pkg/cluster/certs.go
+
5
−
4
View file @
f663ad38
...
...
@@ -2,6 +2,7 @@ package cluster
import
(
"os"
"path"
"forge.tedomum.net/acides/hepto/hepto/pkg/pki"
)
...
...
@@ -9,12 +10,12 @@ import (
func
(
c
*
Cluster
)
initCerts
()
{
// Prepare the cluster PKI
if
c
.
node
.
Role
==
Master
{
ca
,
err
:=
pki
.
NewClusterCA
(
"
/
pki"
)
ca
,
err
:=
pki
.
NewClusterCA
(
path
.
Join
(
c
.
settings
.
CertsPath
,
"pki"
)
)
if
err
!=
nil
{
c
.
settings
.
Logger
.
Error
(
err
,
"could not initialize pki"
)
os
.
Exit
(
1
)
}
masterCerts
,
err
:=
pki
.
NewMasterCerts
(
"
/
master"
,
c
.
networking
.
NodeAddress
.
IP
)
masterCerts
,
err
:=
pki
.
NewMasterCerts
(
path
.
Join
(
c
.
settings
.
CertsPath
,
"master"
)
,
c
.
networking
.
NodeAddress
.
IP
)
if
err
!=
nil
{
c
.
settings
.
Logger
.
Error
(
err
,
"could not initialize master certs"
)
os
.
Exit
(
1
)
...
...
@@ -23,7 +24,7 @@ func (c *Cluster) initCerts() {
c
.
masterCerts
=
masterCerts
c
.
pki
.
SignMasterCerts
(
c
.
masterCerts
)
}
else
{
ca
,
err
:=
pki
.
EmptyClusterCA
(
"
/
pki"
)
ca
,
err
:=
pki
.
EmptyClusterCA
(
path
.
Join
(
c
.
settings
.
CertsPath
,
"pki"
)
)
if
err
!=
nil
{
c
.
settings
.
Logger
.
Error
(
err
,
"could not initialize pki"
)
os
.
Exit
(
1
)
...
...
@@ -32,7 +33,7 @@ func (c *Cluster) initCerts() {
}
c
.
ml
.
State
.
PKI
=
c
.
pki
// Initialize node certificates
certs
,
err
:=
pki
.
NewNodeCerts
(
"/certs"
,
c
.
node
.
Name
)
certs
,
err
:=
pki
.
NewNodeCerts
(
path
.
Join
(
c
.
settings
.
CertsPath
,
"node"
)
,
c
.
node
.
Name
)
if
err
!=
nil
{
c
.
settings
.
Logger
.
Error
(
err
,
"could not initialize node certs"
)
os
.
Exit
(
1
)
...
...
This diff is collapsed.
Click to expand it.
pkg/cluster/config.go
+
2
−
0
View file @
f663ad38
...
...
@@ -13,6 +13,8 @@ type ClusterSettings struct {
Logger
logr
.
Logger
// Concrete zap logger for etcd
ZapLogger
*
zap
.
Logger
// Path to certificate storage
CertsPath
string
// Cluster name, should be locally unique
Name
string
// Cluster key, must be shared across nodes
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment