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
8d979d67
Commit
8d979d67
authored
Jun 30, 2019
by
Erik Wilson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tls support for etcd cert storage backend
parent
9ccf3cbc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
42 additions
and
0 deletions
+42
-0
ha.go
pkg/daemons/control/ha.go
+42
-0
No files found.
pkg/daemons/control/ha.go
View file @
8d979d67
...
...
@@ -2,6 +2,8 @@ package control
import
(
"context"
"crypto/tls"
"crypto/x509"
"encoding/json"
"io/ioutil"
"os"
...
...
@@ -34,11 +36,16 @@ func setHAData(cfg *config.Control) error {
if
cfg
.
StorageBackend
!=
"etcd3"
||
cfg
.
CertStorageBackend
!=
"etcd3"
{
return
nil
}
tlsConfig
,
err
:=
genTLSConfig
(
cfg
)
if
err
!=
nil
{
return
err
}
endpoints
:=
strings
.
Split
(
cfg
.
StorageEndpoint
,
","
)
cli
,
err
:=
clientv3
.
New
(
clientv3
.
Config
{
Endpoints
:
endpoints
,
DialTimeout
:
etcdDialTimeout
,
TLS
:
tlsConfig
,
})
if
err
!=
nil
{
return
err
...
...
@@ -71,10 +78,16 @@ func getHAData(cfg *config.Control) error {
if
cfg
.
StorageBackend
!=
"etcd3"
||
cfg
.
CertStorageBackend
!=
"etcd3"
{
return
nil
}
tlsConfig
,
err
:=
genTLSConfig
(
cfg
)
if
err
!=
nil
{
return
err
}
endpoints
:=
strings
.
Split
(
cfg
.
StorageEndpoint
,
","
)
cli
,
err
:=
clientv3
.
New
(
clientv3
.
Config
{
Endpoints
:
endpoints
,
DialTimeout
:
etcdDialTimeout
,
TLS
:
tlsConfig
,
})
if
err
!=
nil
{
return
err
...
...
@@ -99,6 +112,35 @@ func getHAData(cfg *config.Control) error {
return
writeRuntimeCertData
(
cfg
.
Runtime
,
serverRuntime
)
}
func
genTLSConfig
(
cfg
*
config
.
Control
)
(
*
tls
.
Config
,
error
)
{
tlsConfig
:=
&
tls
.
Config
{}
if
cfg
.
StorageCertFile
!=
""
&&
cfg
.
StorageKeyFile
!=
""
{
certPem
,
err
:=
ioutil
.
ReadFile
(
cfg
.
StorageCertFile
)
if
err
!=
nil
{
return
nil
,
err
}
keyPem
,
err
:=
ioutil
.
ReadFile
(
cfg
.
StorageKeyFile
)
if
err
!=
nil
{
return
nil
,
err
}
tlsCert
,
err
:=
tls
.
X509KeyPair
(
certPem
,
keyPem
)
if
err
!=
nil
{
return
nil
,
err
}
tlsConfig
.
Certificates
=
[]
tls
.
Certificate
{
tlsCert
}
}
if
cfg
.
StorageCAFile
!=
""
{
caData
,
err
:=
ioutil
.
ReadFile
(
cfg
.
StorageCAFile
)
if
err
!=
nil
{
return
nil
,
err
}
certPool
:=
x509
.
NewCertPool
()
certPool
.
AppendCertsFromPEM
(
caData
)
tlsConfig
.
RootCAs
=
certPool
}
return
tlsConfig
,
nil
}
func
readRuntimeCertData
(
runtime
*
config
.
ControlRuntime
)
([]
byte
,
error
)
{
serverHACerts
:=
map
[
string
]
string
{
runtime
.
ServerCA
:
""
,
...
...
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