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

Merge pull request #96 from nirmata/refactoring

Browse source 
Refactoring
This commit is contained in:
Jim Bugwadia 2019-05-23 14:31:22 -07:00 • committed by GitHub
commit cfeca33c16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 152 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkg/engine/overlay.go
View file

@ -44,6 +44,7 @@ func ProcessOverlay(policy kubepolicy.Policy, rawResource []byte, gvk metav1.Gro
return appliedPatches, nil
}
// goes down through overlay and resource trees and applies overlay
func applyOverlay(resource, overlay interface{}, path string) ([]PatchBytes, error) {
var appliedPatches []PatchBytes
@ -95,32 +96,21 @@ func applyOverlay(resource, overlay interface{}, path string) ([]PatchBytes, err
}
appliedPatches = append(appliedPatches, patches...)
case string:
patch, err := replaceSubtree(overlay, path)
if err != nil {
return nil, err
}
appliedPatches = append(appliedPatches, patch)
case float64:
patch, err := replaceSubtree(overlay, path)
if err != nil {
return nil, err
}
appliedPatches = append(appliedPatches, patch)
case int64:
case string, float64, int64:
patch, err := replaceSubtree(overlay, path)
if err != nil {
return nil, err
}
appliedPatches = append(appliedPatches, patch)
default:
return nil, fmt.Errorf("Overlay has unsupported type: %T", overlay)
}
return appliedPatches, nil
}
// for each overlay and resource array elements and applies overlay
func applyOverlayToArray(resource, overlay []interface{}, path string) ([]PatchBytes, error) {
var appliedPatches []PatchBytes
if len(overlay) == 0 {
@ -231,6 +221,7 @@ func fillEmptyArray(overlay []interface{}, path string) ([]PatchBytes, error) {
return appliedPatches, nil
}
// Checks if array object matches anchors. If not - skip - return true
func skipArrayObject(object, anchors map[string]interface{}) bool {
for key, pattern := range anchors {
key = key[1 : len(key)-1]
@ -277,6 +268,8 @@ func processSubtree(overlay interface{}, path string, op string) ([]byte, error)
return []byte(patchStr), nil
}
// TODO: Overlay is already in JSON, remove this code
// converts overlay to JSON string to be inserted into the JSON Patch
func prepareJSONValue(overlay interface{}) string {
switch typed := overlay.(type) {
case map[string]interface{}:
@ -350,12 +343,6 @@ func hasOnlyAnchors(overlay interface{}) bool {
}
return true
case string:
return false
case float64:
return false
case int64:
return false
default:
return false
}
@ -381,12 +368,6 @@ func hasNestedAnchors(overlay interface{}) bool {
}
}
return false
case string:
return false
case float64:
return false
case int64:
return false
default:
return false
}

150
pkg/engine/overlay_test.go
View file

@ -10,8 +10,48 @@ import (
)
func TestApplyOverlay_NestedListWithAnchor(t *testing.T) {
resourceRaw := []byte(`{ "apiVersion": "v1", "kind": "Endpoints", "metadata": { "name": "test-endpoint", "labels": { "label": "test" } }, "subsets": [ { "addresses": [ { "ip": "192.168.10.171" } ], "ports": [ { "name": "secure-connection", "port": 443, "protocol": "TCP" } ] } ] }`)
overlayRaw := []byte(`{ "subsets": [ { "ports": [ { "(name)": "secure-connection", "port": 444, "protocol": "UDP" } ] } ] }`)
resourceRaw := []byte(`
{
"apiVersion":"v1",
"kind":"Endpoints",
"metadata":{
"name":"test-endpoint",
"labels":{
"label":"test"
}
},
"subsets":[
{
"addresses":[
{
"ip":"192.168.10.171"
}
],
"ports":[
{
"name":"secure-connection",
"port":443,
"protocol":"TCP"
}
]
}
]
}`)
overlayRaw := []byte(`
{
"subsets":[
{
"ports":[
{
"(name)":"secure-connection",
"port":444,
"protocol":"UDP"
}
]
}
]
}`)
var resource, overlay interface{}
@ -36,8 +76,55 @@ func TestApplyOverlay_NestedListWithAnchor(t *testing.T) {
}
func TestApplyOverlay_InsertIntoArray(t *testing.T) {
resourceRaw := []byte(`{ "apiVersion": "v1", "kind": "Endpoints", "metadata": { "name": "test-endpoint", "labels": { "label": "test" } }, "subsets": [ { "addresses": [ { "ip": "192.168.10.171" } ], "ports": [ { "name": "secure-connection", "port": 443, "protocol": "TCP" } ] } ] }`)
overlayRaw := []byte(`{ "subsets": [ { "addresses": [ { "ip": "192.168.10.172" }, { "ip": "192.168.10.173" } ], "ports": [ { "name": "insecure-connection", "port": 80, "protocol": "UDP" } ] } ] }`)
resourceRaw := []byte(`
{
"apiVersion":"v1",
"kind":"Endpoints",
"metadata":{
"name":"test-endpoint",
"labels":{
"label":"test"
}
},
"subsets":[
{
"addresses":[
{
"ip":"192.168.10.171"
}
],
"ports":[
{
"name":"secure-connection",
"port":443,
"protocol":"TCP"
}
]
}
]
}`)
overlayRaw := []byte(`
{
"subsets":[
{
"addresses":[
{
"ip":"192.168.10.172"
},
{
"ip":"192.168.10.173"
}
],
"ports":[
{
"name":"insecure-connection",
"port":80,
"protocol":"UDP"
}
]
}
]
}`)
var resource, overlay interface{}
@ -63,8 +150,59 @@ func TestApplyOverlay_InsertIntoArray(t *testing.T) {
}
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 } }`)
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{}