Skip to content
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

No longer remove deprecated bundle/svid files #5205

Merged
merged 2 commits into from
Jun 10, 2024
Merged

No longer remove deprecated bundle/svid files #5205

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82393ff
No longer remove deprecated bundle/svid files
azdagron Jun 10, 2024
0427616
Merge branch 'main' into no-longer-remove-deprecated-files
amartinezfayo Jun 10, 2024
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
15 changes: 0 additions & 15 deletions pkg/agent/storage/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,6 @@ func Open(dir string) (Storage, error) {
return nil, err
}

// TODO: Can be removed after 1.10 release
// No point in checking for errors here, we're just
// trying to clean up some files that we will no longer
// use.
os.Remove(legacySVIDPath(dir))
os.Remove(legacyBundlePath(dir))

return &storage{
dir: dir,
data: data,
Expand Down Expand Up @@ -234,11 +227,3 @@ func encodeCertificates(certs []*x509.Certificate) ([][]byte, error) {
func dataPath(dir string) string {
return filepath.Join(dir, "agent-data.json")
}

func legacyBundlePath(dir string) string {
return filepath.Join(dir, "bundle.der")
}

func legacySVIDPath(dir string) string {
return filepath.Join(dir, "agent_svid.der")
}
Loading