Skip to content

Remove fields that are omitted from applied configurations if there are no other owners #166

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

Merged
merged 5 commits into from
Jul 6, 2020
Merged

Remove fields that are omitted from applied configurations if there are no other owners #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca99bda
Remove fields when unset from applied configuration if there are no o…
jpbetz Jun 22, 2020
1ce4a77
Add field unsetting tests
jpbetz Jun 26, 2020
085f5bf
Apply suggestion
jpbetz Jun 30, 2020
9f09075
Change merge rules so that updaters to share ownership with appliers
jpbetz Jun 30, 2020
5b08b43
Add and fix tests to match improved update merging
jpbetz Jul 1, 2020
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
45 changes: 38 additions & 7 deletions merge/leaf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ func TestUpdateLeaf(t *testing.T) {
),
},
},
"apply_twice_dangling": {
"apply_twice_remove": {
Ops: []Operation{
Apply{
Manager: "default",
Expand All @@ -365,9 +365,7 @@ func TestUpdateLeaf(t *testing.T) {
},
},
Object: `
numeric: 1
string: "new string"
bool: false
`,
APIVersion: "v1",
Managed: fieldpath.ManagedFields{
Expand All @@ -380,7 +378,43 @@ func TestUpdateLeaf(t *testing.T) {
),
},
},
"apply_twice_dangling_different_version": {
"update_apply_omits": {
Ops: []Operation{
Apply{
Manager: "default",
APIVersion: "v1",
Object: `
numeric: 2
`,
},
Update{
Manager: "controller",
APIVersion: "v1",
Object: `
numeric: 1
`,
},
Apply{
Manager: "default",
APIVersion: "v1",
Object: ``,
},
},
Object: `
numeric: 1
`,
APIVersion: "v1",
Managed: fieldpath.ManagedFields{
"controller": fieldpath.NewVersionedSet(
_NS(
_P("numeric"),
),
"v1",
false,
),
},
},
"apply_twice_remove_different_version": {
Ops: []Operation{
Apply{
Manager: "default",
Expand All @@ -400,9 +434,7 @@ func TestUpdateLeaf(t *testing.T) {
},
},
Object: `
numeric: 1
string: "new string"
bool: false
`,
APIVersion: "v1",
Managed: fieldpath.ManagedFields{
Expand Down Expand Up @@ -462,7 +494,6 @@ func TestUpdateLeaf(t *testing.T) {
},
},
Object: `
string: "string"
`,
APIVersion: "v1",
Managed: fieldpath.ManagedFields{},
Expand Down
Loading