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 issue: The first element of array was always replaced

Browse source
This commit is contained in:
Maxim Goncharenko 2019-05-23 12:42:58 +03:00 • committed by kacejot
parent 101870fb5e
commit 8735ee7741
1 changed files with 4 additions and 3 deletions

7
pkg/engine/overlay.go
View file

@ -5,6 +5,7 @@ import (
"fmt"
"log"
"reflect"
"strconv"
jsonpatch "github.com/evanphx/json-patch"
@ -140,10 +141,10 @@ func applyOverlayToArray(resource, overlay []interface{}, path string) ([]PatchB
typedOverlay := overlayElement.(map[string]interface{})
anchors := GetAnchorsFromMap(typedOverlay)
currentPath := path + "0/"
for _, resourceElement := range resource {
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)
if err != nil {
@ -153,6 +154,7 @@ 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 {
@ -168,7 +170,6 @@ func applyOverlayToArray(resource, overlay []interface{}, path string) ([]PatchB
}
}
}
}
default:
path += "0/"