scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 18:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87442 from jennybuckley/smd-3

Browse Source 
Update structured-merge-diff dependency to v3
This commit is contained in:
Kubernetes Prow Robot
2020-01-22 20:37:26 -08:00
committed by GitHub
parent bb425a86ee b33fbc84d9
commit 03cb6afc1a
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":{}}}}}}}`),
},
}