Skip to content

Commit

Permalink
No longer remove deprecated bundle/svid files (#5205)
Browse files Browse the repository at this point in the history
These deprecated files were unused since 1.4 but kept up-to-date until
1.9.0, which actively removed them. The removal code is no longer needed
for 1.10 onwards.

Signed-off-by: Andrew Harding <azdagron@gmail.com>
Co-authored-by: Agustín Martínez Fayó <amartinezfayo@gmail.com>
  • Loading branch information
azdagron and amartinezfayo committed Jun 10, 2024
1 parent 61d498e commit 91279aa
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions pkg/agent/storage/storage.go
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")
}

0 comments on commit 91279aa

Please sign in to comment.