mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

Fixed: Overlay overwrites all items in the list

Browse source
This commit is contained in:
kacejot 2019-05-23 16:31:00 +03:00
parent f57cce907a
commit 18fc6d630f
2 changed files with 46 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkg/engine/overlay.go
View file

@ -145,10 +145,10 @@ func applyOverlayToArray(resource, overlay []interface{}, path string) ([]PatchB
for _, overlayElement := range overlay {
typedOverlay := overlayElement.(map[string]interface{})
anchors := GetAnchorsFromMap(typedOverlay)
if len(anchors) > 0 {
for i, resourceElement := range resource {
typedResource := resourceElement.(map[string]interface{})
for i, resourceElement := range resource {
typedResource := resourceElement.(map[string]interface{})
if len(anchors) > 0 {
currentPath := path + strconv.Itoa(i) + "/"
if !skipArrayObject(typedResource, anchors) {
patches, err := applyOverlay(resourceElement, overlayElement, currentPath)
@ -158,22 +158,24 @@ func applyOverlayToArray(resource, overlay []interface{}, path string) ([]PatchB
appliedPatches = append(appliedPatches, patches...)
}
} else {
currentPath := path + "0/"
if hasNestedAnchors(overlayElement) {
patches, err := applyOverlay(resourceElement, overlayElement, currentPath)
if err != nil {
return nil, err
}
appliedPatches = append(appliedPatches, patches...)
} else {
patch, err := insertSubtree(overlayElement, currentPath)
if err != nil {
return nil, err
}
appliedPatches = append(appliedPatches, patch)
}
}
} else if hasNestedAnchors(overlayElement) {
for i, resourceElement := range resource {
currentPath := path + strconv.Itoa(i) + "/"
patches, err := applyOverlay(resourceElement, overlayElement, currentPath)
if err != nil {
return nil, err
}
appliedPatches = append(appliedPatches, patches...)
}
} else {
currentPath := path + "0/"
patch, err := insertSubtree(overlayElement, currentPath)
if err != nil {
return nil, err
}
appliedPatches = append(appliedPatches, patch)
}
}
default:

26
pkg/engine/overlay_test.go
View file

@ -2,6 +2,7 @@ package engine
import (
"encoding/json"
"log"
"testing"
jsonpatch "github.com/evanphx/json-patch"
@ -60,3 +61,28 @@ func TestApplyOverlay_InsertIntoArray(t *testing.T) {
expectedResult := []byte(`{"apiVersion":"v1","kind":"Endpoints","metadata":{"name":"test-endpoint","labels":{"label":"test"}},"subsets":[{"addresses":[{"ip":"192.168.10.172"},{"ip":"192.168.10.173"}],"ports":[{"name":"insecure-connection","port":80.000000,"protocol":"UDP"}]},{"addresses":[{"ip":"192.168.10.171"}],"ports":[{"name":"secure-connection","port":443,"protocol":"TCP"}]}]}`)
assert.Equal(t, string(expectedResult), string(patched))
}
func TestApplyOverlay_TestInsertToArray(t *testing.T) {
overlayRaw := []byte(`{ "spec": { "template": { "spec": { "containers": [ { "name": "pi1", "image": "vasylev.perl" } ] } } } }`)
resourceRaw := []byte(`{ "apiVersion": "batch/v1", "kind": "Job", "metadata": { "name": "pi" }, "spec": { "template": { "spec": { "containers": [ { "name": "piv0", "image": "perl", "command": [ "perl" ] }, { "name": "pi", "image": "perl", "command": [ "perl" ] }, { "name": "piv1", "image": "perl", "command": [ "perl" ] } ], "restartPolicy": "Never" } }, "backoffLimit": 4 } }`)
var resource, overlay interface{}
json.Unmarshal(resourceRaw, &resource)
json.Unmarshal(overlayRaw, &overlay)
patches, err := applyOverlay(resource, overlay, "/")
assert.NilError(t, err)
assert.Assert(t, patches != nil)
patch := JoinPatches(patches)
decoded, err := jsonpatch.DecodePatch(patch)
assert.NilError(t, err)
assert.Assert(t, decoded != nil)
patched, err := decoded.Apply(resourceRaw)
log.Fatalf("%s", patched)
assert.NilError(t, err)
assert.Assert(t, patched != nil)
}