ensure path exists when adding mutations (#789)

FairwindsOps · Jul 7, 2022 · f713d43 · f713d43
1 parent e896eec
commit f713d43
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 19 deletions.
diff --git a/checks/cpuLimitsMissing.yaml b/checks/cpuLimitsMissing.yaml
@@ -26,12 +26,9 @@ schema:
               not:
                 const: ''
 mutations:
-  - op: add
-    path: /resources/limits
-    value: {}
   - op: add
     path: /resources/limits/cpu
     value: 100m
 comments:
   - find: "cpu: 100m"
-    comment: "TODO: Set this to the amount of CPU you want to reserve for your workload"
+    comment: "TODO: Set this to the maximum amount of CPU you want your workload to use"
diff --git a/checks/cpuRequestsMissing.yaml b/checks/cpuRequestsMissing.yaml
@@ -26,12 +26,9 @@ schema:
               not:
                 const: ''
 mutations:
-  - op: add
-    path: /resources/requests
-    value: {}
   - op: add
     path: /resources/requests/cpu
     value: 100m
 comments:
   - find: "cpu: 100m"
-    comment: "TODO: Set this to the amount of CPU you want to reserve for your workload"
+    comment: "TODO: Set this to the amount of CPU you want to reserve for your workload"
diff --git a/checks/memoryLimitsMissing.yaml b/checks/memoryLimitsMissing.yaml
@@ -26,12 +26,9 @@ schema:
               not:
                 const: ''
 mutations:
-  - op: add
-    path: /resources/limits
-    value: {}
   - op: add
     path: /resources/limits/memory
     value: "512Mi"
 comments:
   - find: "memory: 512Mi"
-    comment: "TODO: Set this to the amount of Memory you want to reserve for your workload"
+    comment: "TODO: Set this to the maximum amount of memory you want your workload to use"
diff --git a/checks/memoryRequestsMissing.yaml b/checks/memoryRequestsMissing.yaml
@@ -26,12 +26,9 @@ schema:
               not:
                 const: ''
 mutations:
-  - op: add
-    path: /resources/requests
-    value: {}
   - op: add
     path: /resources/requests/memory
     value: "512Mi"
 comments:
   - find: "memory: 512Mi"
-    comment: "TODO: Set this to the amount of Memory you want to reserve for your workload"
+    comment: "TODO: Set this to the amount of Memory you want to reserve for your workload"
diff --git a/checks/runAsRootAllowed.yaml b/checks/runAsRootAllowed.yaml
@@ -51,6 +51,6 @@ schema:
             securityContext:
               $ref: "#/definitions/goodSecurityContext"
 mutations:
-  - op: replace
+  - op: add
     path: /securityContext/runAsNonRoot
-    value: true
+    value: true
diff --git a/pkg/mutation/mutate.go b/pkg/mutation/mutate.go
@@ -27,7 +27,10 @@ func ApplyAllSchemaMutations(conf *config.Configuration, resourceProvider *kube.
 	if err != nil {
 		return resource, err
 	}
-	jsonByte, err = patch.Apply(resByte)
+	jsonByte, err = patch.ApplyWithOptions(resByte, &jsonpatchV5.ApplyOptions{
+		AllowMissingPathOnRemove: true,
+		EnsurePathExistsOnAdd: true,
+	})
 	if err != nil {
 		return resource, err
 	}