Merge pull request #64 from apelisse/add-tests

Add a few cross-version tests

Author: k8s-ci-robot

merge/leaf_test.go

@@ -81,6 +81,40 @@ func TestUpdateLeaf(t *testing.T) {
 				},
 			},
 		},
+		"apply_twice_different_versions": {
+			Ops: []Operation{
+				Apply{
+					Manager: "default",
+					Object: `
+						numeric: 1
+						string: "string"
+					`,
+					APIVersion: "v1",
+				},
+				Apply{
+					Manager: "default",
+					Object: `
+						numeric: 2
+						string: "string"
+						bool: false
+					`,
+					APIVersion: "v2",
+				},
+			},
+			Object: `
+				numeric: 2
+				string: "string"
+				bool: false
+			`,
+			Managed: fieldpath.ManagedFields{
+				"default": &fieldpath.VersionedSet{
+					Set: _NS(
+						_P("numeric"), _P("string"), _P("bool"),
+					),
+					APIVersion: "v2",
+				},
+			},
+		},
 		"apply_update_apply_no_conflict": {
 			Ops: []Operation{
 				Apply{
@@ -129,6 +163,54 @@ func TestUpdateLeaf(t *testing.T) {
 				},
 			},
 		},
+		"apply_update_apply_no_conflict_different_version": {
+			Ops: []Operation{
+				Apply{
+					Manager:    "default",
+					APIVersion: "v1",
+					Object: `
+						numeric: 1
+						string: "string"
+					`,
+				},
+				Update{
+					Manager:    "controller",
+					APIVersion: "v2",
+					Object: `
+						numeric: 1
+						string: "string"
+						bool: true
+					`,
+				},
+				Apply{
+					Manager:    "default",
+					APIVersion: "v1",
+					Object: `
+						numeric: 2
+						string: "string"
+					`,
+				},
+			},
+			Object: `
+				numeric: 2
+				string: "string"
+				bool: true
+			`,
+			Managed: fieldpath.ManagedFields{
+				"default": &fieldpath.VersionedSet{
+					Set: _NS(
+						_P("numeric"), _P("string"),
+					),
+					APIVersion: "v1",
+				},
+				"controller": &fieldpath.VersionedSet{
+					Set: _NS(
+						_P("bool"),
+					),
+					APIVersion: "v2",
+				},
+			},
+		},
 		"apply_update_apply_with_conflict": {
 			Ops: []Operation{
 				Apply{
@@ -188,6 +270,65 @@ func TestUpdateLeaf(t *testing.T) {
 				},
 			},
 		},
+		"apply_update_apply_with_conflict_across_version": {
+			Ops: []Operation{
+				Apply{
+					Manager:    "default",
+					APIVersion: "v1",
+					Object: `
+						numeric: 1
+						string: "string"
+					`,
+				},
+				Update{
+					Manager:    "controller",
+					APIVersion: "v2",
+					Object: `
+						numeric: 1
+						string: "controller string"
+						bool: true
+					`,
+				},
+				Apply{
+					Manager:    "default",
+					APIVersion: "v1",
+					Object: `
+						numeric: 2
+						string: "user string"
+					`,
+					Conflicts: merge.Conflicts{
+						merge.Conflict{Manager: "controller", Path: _P("string")},
+					},
+				},
+				ForceApply{
+					Manager:    "default",
+					APIVersion: "v1",
+					Object: `
+						numeric: 2
+						string: "user string"
+					`,
+				},
+			},
+			Object: `
+				numeric: 2
+				string: "user string"
+				bool: true
+			`,
+			Managed: fieldpath.ManagedFields{
+				"default": &fieldpath.VersionedSet{
+					Set: _NS(
+						_P("numeric"), _P("string"),
+					),
+					APIVersion: "v1",
+				},
+				"controller": &fieldpath.VersionedSet{
+					Set: _NS(
+						_P("bool"),
+					),
+					APIVersion: "v2",
+				},
+			},
+		},
 		"apply_twice_dangling": {
 			Ops: []Operation{
 				Apply{
@@ -221,6 +362,39 @@ func TestUpdateLeaf(t *testing.T) {
 				},
 			},
 		},
+		"apply_twice_dangling_different_version": {
+			Ops: []Operation{
+				Apply{
+					Manager:    "default",
+					APIVersion: "v1",
+					Object: `
+						numeric: 1
+						string: "string"
+						bool: false
+					`,
+				},
+				Apply{
+					Manager:    "default",
+					APIVersion: "v2",
+					Object: `
+						string: "new string"
+					`,
+				},
+			},
+			Object: `
+				numeric: 1
+				string: "new string"
+				bool: false
+			`,
+			Managed: fieldpath.ManagedFields{
+				"default": &fieldpath.VersionedSet{
+					Set: _NS(
+						_P("string"),
+					),
+					APIVersion: "v2",
+				},
+			},
+		},
 		"update_remove_empty_set": {
 			Ops: []Operation{
 				Apply{