mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-05-17 10:15:22 +00:00
updated patch delete test
This commit is contained in:
@@ -60,11 +60,10 @@ func (p *PatchStrategicMergeTransformerPlugin) Config(
|
||||
"patch appears to be empty; files=%v, Patch=%s", p.Paths, p.Patches)
|
||||
}
|
||||
// Merge the patches, looking for conflicts.
|
||||
m, err := h.ResmapFactory().ConflatePatches(p.loadedPatches)
|
||||
_, err = h.ResmapFactory().ConflatePatches(p.loadedPatches)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
p.loadedPatches = m.Resources()
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -69,28 +69,6 @@ spec:
|
||||
image: helloworld
|
||||
name: whatever
|
||||
`
|
||||
// Allow expected variable to be unused
|
||||
_ = expected
|
||||
|
||||
// Currently, kustomize inserts $patch: delete elements into the resulting resources
|
||||
erroneousActual := `
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: whatever
|
||||
spec:
|
||||
template:
|
||||
spec:
|
||||
containers:
|
||||
- env:
|
||||
- $patch: delete
|
||||
name: NOT_EXISTING_FOR_REMOVAL
|
||||
- name: EXISTING
|
||||
value: EXISTING_VALUE
|
||||
image: helloworld
|
||||
name: whatever
|
||||
`
|
||||
|
||||
m := th.Run(".", th.MakeDefaultOptions())
|
||||
th.AssertActualEqualsExpected(m, erroneousActual)
|
||||
th.AssertActualEqualsExpected(m, expected)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user