From 91279aa628faa2520286fea637be3dd1772e1449 Mon Sep 17 00:00:00 2001 From: Andrew Harding Date: Mon, 10 Jun 2024 10:25:06 -0600 Subject: [PATCH] No longer remove deprecated bundle/svid files (#5205) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Co-authored-by: Agustín Martínez Fayó --- pkg/agent/storage/storage.go | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkg/agent/storage/storage.go b/pkg/agent/storage/storage.go index 831f584177..d298acf1bf 100644 --- a/pkg/agent/storage/storage.go +++ b/pkg/agent/storage/storage.go @@ -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, @@ -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") -}