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
e79fda96
Commit
e79fda96
authored
Jul 12, 2019
by
Erik Wilson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enforce explicit read or write for bootstrap
parent
403e73ab
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
7 deletions
+13
-7
bootstrap.go
pkg/daemons/control/bootstrap.go
+13
-7
No files found.
pkg/daemons/control/bootstrap.go
View file @
e79fda96
...
...
@@ -77,7 +77,10 @@ func fetchBootstrapData(cfg *config.Control) error {
return
err
}
if
len
(
gr
.
Kvs
)
==
0
{
return
nil
if
cfg
.
BootstrapType
!=
bootstrapTypeRead
{
return
nil
}
return
errors
.
New
(
"Unable to read bootstrap data from server"
)
}
runtimeJSON
,
err
:=
base64
.
URLEncoding
.
DecodeString
(
string
(
gr
.
Kvs
[
0
]
.
Value
))
...
...
@@ -118,13 +121,16 @@ func storeBootstrapData(cfg *config.Control) error {
}
defer
cli
.
Close
()
gr
,
err
:=
cli
.
Get
(
context
.
TODO
(),
k3sRuntimeEtcdPath
)
if
err
!=
nil
{
return
err
}
if
len
(
gr
.
Kvs
)
>
0
&&
string
(
gr
.
Kvs
[
0
]
.
Value
)
!=
""
{
return
nil
if
cfg
.
BootstrapType
!=
bootstrapTypeWrite
{
gr
,
err
:=
cli
.
Get
(
context
.
TODO
(),
k3sRuntimeEtcdPath
)
if
err
!=
nil
{
return
err
}
if
len
(
gr
.
Kvs
)
>
0
&&
string
(
gr
.
Kvs
[
0
]
.
Value
)
!=
""
{
return
nil
}
}
certData
,
err
:=
readRuntimeBootstrapData
(
cfg
.
Runtime
)
if
err
!=
nil
{
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