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

convert type boolean to string in /metadata/annotation

Browse source
This commit is contained in:
Shuting Zhao 2019-12-13 18:04:19 -08:00
parent dd97cdd95f
commit 35adbbe0df
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkg/engine/overlay.go
View file

@ -347,13 +347,24 @@ func processSubtree(overlay interface{}, path string, op string) ([]byte, error)
path = preparePath(path)
value := prepareJSONValue(overlay)
patchStr := fmt.Sprintf(`{ "op": "%s", "path": "%s", "value": %s }`, op, path, value)
patchStr := fmt.Sprintf(`{ "op": "%s", "path": "%s", "value":%s }`, op, path, value)
// explicitly handle boolean type in annotation
// keep the type boolean as it is in any other fields
if strings.Contains(path, "/metadata/annotations") {
if i := strings.Index(patchStr, ":true"); i > 0 {
patchStr = fmt.Sprintf("%s:\"true\"%s", patchStr[:i], patchStr[i+len("true")+1:])
}
if i := strings.Index(patchStr, ":false"); i > 0 {
patchStr = fmt.Sprintf("%s:\"false\"%s", patchStr[:i], patchStr[i+len("false")+1:])
}
}
// check the patch
_, err := jsonpatch.DecodePatch([]byte("[" + patchStr + "]"))
if err != nil {
glog.V(3).Info(err)
return nil, fmt.Errorf("Failed to make '%s' patch from an overlay '%s' for path %s", op, value, path)
return nil, fmt.Errorf("Failed to make '%s' patch from an overlay '%s' for path %s, err: %v", op, value, path, err)
}
return []byte(patchStr), nil
@ -376,13 +387,14 @@ func preparePath(path string) string {
// converts overlay to JSON string to be inserted into the JSON Patch
func prepareJSONValue(overlay interface{}) string {
var err error
// Need to remove anchors from the overlay struct
overlayWithoutAnchors := removeAnchorFromSubTree(overlay)
jsonOverlay, err := json.Marshal(overlayWithoutAnchors)
if err != nil || hasOnlyAnchors(overlay) {
glog.V(3).Info(err)
return ""
}
// Need to remove anchors from the overlay struct
overlayWithoutAnchors := removeAnchorFromSubTree(overlay)
jsonOverlay, err := json.Marshal(overlayWithoutAnchors)
return string(jsonOverlay)
}

2
pkg/engine/overlay_test.go
View file

@ -1013,7 +1013,7 @@ func TestProcessOverlayPatches_InsertIfNotPresentWithConditions(t *testing.T) {
"metadata": {
"name": "pod-with-emptydir",
"annotations": {
"cluster-autoscaler.kubernetes.io/safe-to-evict": true
"cluster-autoscaler.kubernetes.io/safe-to-evict": "true"
}
},
"spec": {