github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update bootstrap logic to output all changed files on disk (#4800) (#4810) 

Signed-off-by: Brian Downs <brian.downs@gmail.com>
pull/4825/head
Brian Downs 2021-12-21 16:22:23 -07:00 committed by GitHub
parent bcd63e54dd
commit 5b0c1661f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/cluster/bootstrap.go
View File

@ -555,6 +555,7 @@ func (c *Cluster) ReconcileBootstrapData(ctx context.Context, buf io.ReadSeeker,
} }
} }
var newerOnDisk []string
for path, res := range results { for path, res := range results {
switch { switch {
case res.disk: case res.disk:
@ -566,12 +567,16 @@ func (c *Cluster) ReconcileBootstrapData(ctx context.Context, buf io.ReadSeeker,
updateDisk = true updateDisk = true
continue continue
} }
logrus.Fatal(path + " newer than datastore and could cause cluster outage. Remove the file from disk and restart to be recreated from datastore.") newerOnDisk = append(newerOnDisk, path)
case res.conflict: case res.conflict:
logrus.Warnf("datastore / disk conflict: %s newer than in the datastore", path) logrus.Warnf("datastore / disk conflict: %s newer than in the datastore", path)
} }
} }
if len(newerOnDisk) > 0 {
logrus.Fatal(strings.Join(newerOnDisk, ", ") + " newer than datastore and could cause a cluster outage. Remove the file(s) from disk and restart to be recreated from datastore.")
}
if updateDisk { if updateDisk {
logrus.Warn("updating bootstrap data on disk from datastore") logrus.Warn("updating bootstrap data on disk from datastore")
return bootstrap.WriteToDiskFromStorage(files, crb) return bootstrap.WriteToDiskFromStorage(files, crb)