From 56c4b6046b0ef0d88798a2ca1bb857da18424a20 Mon Sep 17 00:00:00 2001 From: Mike Beaumont Date: Fri, 20 Sep 2024 13:41:37 +0200 Subject: [PATCH 1/2] fix(federation): set skipCreatingInitialPolicies on exported Meshes Signed-off-by: Mike Beaumont --- app/kumactl/cmd/export/export.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/kumactl/cmd/export/export.go b/app/kumactl/cmd/export/export.go index 5f602c5eeb89..27ac487d8c14 100644 --- a/app/kumactl/cmd/export/export.go +++ b/app/kumactl/cmd/export/export.go @@ -97,7 +97,13 @@ $ kumactl export --profile federation --format universal > policies.yaml if err := rs.List(cmd.Context(), list); err != nil { return errors.Wrapf(err, "could not list %q", resDesc.Name) } - allResources = append(allResources, list.GetItems()...) + for _, res := range list.GetItems() { + if res.Descriptor().Name == core_mesh.MeshType { + mesh := res.(*core_mesh.MeshResource) + mesh.Spec.SkipCreatingInitialPolicies = []string{"*"} + } + allResources = append(allResources, res) + } } else { for _, mesh := range meshes.Items { list := resDesc.NewList() From 893687be00fe2c3450b26ff55fef6bc2e52d7071 Mon Sep 17 00:00:00 2001 From: Mike Beaumont Date: Fri, 20 Sep 2024 13:41:43 +0200 Subject: [PATCH 2/2] test(kumactl): update golden Signed-off-by: Mike Beaumont --- app/kumactl/cmd/export/testdata/export-no-dp.golden.yaml | 2 ++ app/kumactl/cmd/export/testdata/export.golden.yaml | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/app/kumactl/cmd/export/testdata/export-no-dp.golden.yaml b/app/kumactl/cmd/export/testdata/export-no-dp.golden.yaml index 4865a987eafe..dce79d935f24 100644 --- a/app/kumactl/cmd/export/testdata/export-no-dp.golden.yaml +++ b/app/kumactl/cmd/export/testdata/export-no-dp.golden.yaml @@ -4,6 +4,8 @@ creationTime: "0001-01-01T00:00:00Z" modificationTime: "0001-01-01T00:00:00Z" name: default type: Mesh +skipCreatingInitialPolicies: +- '*' --- creationTime: "0001-01-01T00:00:00Z" mesh: default diff --git a/app/kumactl/cmd/export/testdata/export.golden.yaml b/app/kumactl/cmd/export/testdata/export.golden.yaml index 985a5b75540e..f7b04f0d6289 100644 --- a/app/kumactl/cmd/export/testdata/export.golden.yaml +++ b/app/kumactl/cmd/export/testdata/export.golden.yaml @@ -4,11 +4,15 @@ creationTime: "0001-01-01T00:00:00Z" modificationTime: "0001-01-01T00:00:00Z" name: default type: Mesh +skipCreatingInitialPolicies: +- '*' --- creationTime: "0001-01-01T00:00:00Z" modificationTime: "0001-01-01T00:00:00Z" name: another-mesh type: Mesh +skipCreatingInitialPolicies: +- '*' --- creationTime: "0001-01-01T00:00:00Z" mesh: default