github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Structured Merge Diff to V3

Browse Source
This commit is contained in:
jennybuckley
2020-01-21 15:03:56 -08:00
committed by Jennifer Buckley
parent c9b4cf3d25
commit b33fbc84d9
105 changed files with 2848 additions and 1849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/apiserver/apply/apply_test.go
View File

@@ -993,7 +993,7 @@ func TestApplyConvertsManagedFieldsVersion(t *testing.T) {
Time: actual.Time,
FieldsType: "FieldsV1",
FieldsV1: &metav1.FieldsV1{
Raw: []byte(`{"f:metadata":{"f:labels":{"f:sidecar_version":{}}},"f:spec":{"f:template":{"f:spec":{"f:containers":{"k:{\"name\":\"sidecar\"}":{"f:image":{},"f:name":{},".":{}}}}}}}`),
Raw: []byte(`{"f:metadata":{"f:labels":{"f:sidecar_version":{}}},"f:spec":{"f:template":{"f:spec":{"f:containers":{"k:{\"name\":\"sidecar\"}":{".":{},"f:image":{},"f:name":{}}}}}}}`),
},
}