Fix fatal error when reconciling bootstrap data

Properly skip restoring bootstrap data for files that don't have a path set because the feature that would set it isn't enabled. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Fix fatal error when reconciling bootstrap data
ab2b0a5a · Brad Davidson · Brad Davidson · 688b1805 · ab2b0a5a · ab2b0a5a
Commit ab2b0a5a authored Jul 07, 2022 by Brad Davidson Committed by Brad Davidson Jul 12, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

bootstrap.go pkg/bootstrap/bootstrap.go +1 -1

bootstrap.go pkg/cluster/bootstrap.go +2 -2

No files found.
--- a/pkg/bootstrap/bootstrap.go
+++ b/pkg/bootstrap/bootstrap.go
@@ -75,7 +75,7 @@ func WriteToDiskFromStorage(files PathsDataformat, bootstrap *config.ControlRunt

 	for pathKey, bsf := range files {
 		path, ok := paths[pathKey]
-		if !ok {
+		if !ok || path == "" {
 			continue
 		}


--- a/pkg/cluster/bootstrap.go
+++ b/pkg/cluster/bootstrap.go
@@ -363,7 +363,7 @@ func (c *Cluster) ReconcileBootstrapData(ctx context.Context, buf io.ReadSeeker,

 				for pk := range files {
 					p, ok := paths[pk]
-					if !ok {
+					if !ok || p == "" {
 						continue
 					}

@@ -393,7 +393,7 @@ func (c *Cluster) ReconcileBootstrapData(ctx context.Context, buf io.ReadSeeker,

 				for pk := range files {
 					p, ok := paths[pk]
-					if !ok {
+					if !ok || p == "" {
 						continue
 					}