Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-02-25 09:11:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

cli: create namespaced folders for upgrade backups

Browse Source 
Resource names are only unique per kind+ns. Without this patch it
might happen that there are two resources with the same name
in different namespaces. Upgrade might fail in that case.
This commit is contained in:
Otto Bittner 2023-04-28 10:33:10 +02:00
parent 7ab23c28b8
commit 3770cada91
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/internal/helm/backup.go
View File

@ -63,7 +63,11 @@ func (c *Client) backupCRs(ctx context.Context, crds []apiextensionsv1.CustomRes
} }
for _, cr := range crs { for _, cr := range crs {
path := filepath.Join(backupFolder, cr.GetName()+".yaml") targetFolder := filepath.Join(backupFolder, cr.GetKind(), cr.GetNamespace())
if err := c.fs.MkdirAll(targetFolder); err != nil {
return fmt.Errorf("creating resource dir: %w", err)
}
path := filepath.Join(targetFolder, cr.GetName()+".yaml")
yamlBytes, err := yaml.Marshal(cr.Object) yamlBytes, err := yaml.Marshal(cr.Object)
if err != nil { if err != nil {
return err return err

2
cli/internal/helm/backup_test.go
View File

@ -133,7 +133,7 @@ func TestBackupCRs(t *testing.T) {
} }
assert.NoError(err) assert.NoError(err)
data, err := afero.ReadFile(memFs, filepath.Join(backupFolder, tc.resource.GetName()+".yaml")) data, err := afero.ReadFile(memFs, filepath.Join(backupFolder, tc.resource.GetKind(), tc.resource.GetNamespace(), tc.resource.GetName()+".yaml"))
require.NoError(err) require.NoError(err)
assert.YAMLEq(tc.expectedFile, string(data)) assert.YAMLEq(tc.expectedFile, string(data))
}) })