kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 10:30:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

add inline patch support for Strategic Merge Patch and JSON patch

Browse Source
This commit is contained in:
jingfangliu
2019-07-26 17:00:41 -07:00
parent a9848f2738
commit 35481ec6d9
6 changed files with 273 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go
View File

@@ -78,7 +78,9 @@ paths:
t.Fatalf("expected error")
}
if !strings.Contains(err.Error(),
"cannot read file \"/app/patch.yaml\"") {
"cannot read file \"/app/patch.yaml\"") &&
!strings.Contains(err.Error(),
"cannot unmarshal string") {
t.Fatalf("unexpected err: %v", err)
}
}
@@ -1278,4 +1280,4 @@ paths:
`, target)
th.AssertActualEqualsExpected(rm, ``)
}
}