Skip to content

[daemon] Cleanup old certificate/CA variable directories after migration #1048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cgalibern merged 1 commit into from
Jun 23, 2026
Merged

[daemon] Cleanup old certificate/CA variable directories after migration #1048

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion daemon/listener/certs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,11 @@ func (t *T) migrateCaPathV2(clusterName string) (ok bool, err error) {
t.log.Infof("migrate ca from %s to %s", caPathV2, caPath)
if err = os.Rename(caPathV2.ConfigFile(), caPath.ConfigFile()); err != nil {
err = fmt.Errorf("migrate ca %s to %s: %w", caPathV2, caPath, err)
return
}
if err := os.RemoveAll(caPathV2.VarDir()); err != nil {
// Ignore errors when deleting the directory; log a warning instead.
t.log.Warnf("migrate previous ca %s can't remove directory %s: %s", caPathV2, caPathV2.VarDir(), err)
}
return
}
Expand Down Expand Up @@ -297,6 +302,12 @@ func (t *T) migrateCertPathV2(clusterName string) (hasV2cert bool, err error) {
}
t.log.Infof("update migrated cert ca keyword to %s", caPath)
op := keyop.New(key.New("DEFAULT", "ca"), keyop.Set, caPath.String(), 0)
err = certSec.Config().Set(*op)
if err = certSec.Config().Set(*op); err != nil {
return
}
if err := os.RemoveAll(certPathV2.VarDir()); err != nil {
// Ignore errors when deleting the directory; log a warning instead.
t.log.Warnf("migrate previous cert %s can't remove directory %s: %s", certPathV2, certPathV2.VarDir(), err)
}
return
}
Loading