Skip to content

K
k3s
Commit e79fda96 authored by Erik Wilson's avatar Erik Wilson
Browse files
Options

Enforce explicit read or write for bootstrap

parent 403e73ab
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
pkg/daemons/control/bootstrap.go
View file @ e79fda96
...@@ -77,8 +77,11 @@ func fetchBootstrapData(cfg *config.Control) error { ...@@ -77,8 +77,11 @@ func fetchBootstrapData(cfg *config.Control) error {
return err return err
} }
if len(gr.Kvs) == 0 { if len(gr.Kvs) == 0 {
if cfg.BootstrapType != bootstrapTypeRead {
return nil return nil
} }
return errors.New("Unable to read bootstrap data from server")
}
runtimeJSON, err := base64.URLEncoding.DecodeString(string(gr.Kvs[0].Value)) runtimeJSON, err := base64.URLEncoding.DecodeString(string(gr.Kvs[0].Value))
if err != nil { if err != nil {
...@@ -118,6 +121,7 @@ func storeBootstrapData(cfg *config.Control) error { ...@@ -118,6 +121,7 @@ func storeBootstrapData(cfg *config.Control) error {
} }
defer cli.Close() defer cli.Close()
if cfg.BootstrapType != bootstrapTypeWrite {
gr, err := cli.Get(context.TODO(), k3sRuntimeEtcdPath) gr, err := cli.Get(context.TODO(), k3sRuntimeEtcdPath)
if err != nil { if err != nil {
return err return err
...@@ -125,6 +129,8 @@ func storeBootstrapData(cfg *config.Control) error { ...@@ -125,6 +129,8 @@ func storeBootstrapData(cfg *config.Control) error {
if len(gr.Kvs) > 0 && string(gr.Kvs[0].Value) != "" { if len(gr.Kvs) > 0 && string(gr.Kvs[0].Value) != "" {
return nil return nil
} }
}
certData, err := readRuntimeBootstrapData(cfg.Runtime) certData, err := readRuntimeBootstrapData(cfg.Runtime)
if err != nil { if err != nil {
return err return err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment