Commit e79fda96 authored by Erik Wilson's avatar Erik Wilson

Enforce explicit read or write for bootstrap

parent 403e73ab
...@@ -77,7 +77,10 @@ func fetchBootstrapData(cfg *config.Control) error { ...@@ -77,7 +77,10 @@ func fetchBootstrapData(cfg *config.Control) error {
return err return err
} }
if len(gr.Kvs) == 0 { 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)) runtimeJSON, err := base64.URLEncoding.DecodeString(string(gr.Kvs[0].Value))
...@@ -118,13 +121,16 @@ func storeBootstrapData(cfg *config.Control) error { ...@@ -118,13 +121,16 @@ func storeBootstrapData(cfg *config.Control) error {
} }
defer cli.Close() defer cli.Close()
gr, err := cli.Get(context.TODO(), k3sRuntimeEtcdPath) if cfg.BootstrapType != bootstrapTypeWrite {
if err != nil { gr, err := cli.Get(context.TODO(), k3sRuntimeEtcdPath)
return err if err != nil {
} return err
if len(gr.Kvs) > 0 && string(gr.Kvs[0].Value) != "" { }
return nil if len(gr.Kvs) > 0 && string(gr.Kvs[0].Value) != "" {
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