fixes

Signed-off-by: Charles-Edouard Brétéché <[email protected]>

karpenter/add-karpenter-daemonset-priority-class/kyverno-test.yaml

@@ -9,8 +9,8 @@ resources:
 results:
 - kind: DaemonSet
   patchedResource: daemonset-patched.yaml
-  policy: test/add-karpenter-daemonset-priority-class
+  policy: add-karpenter-daemonset-priority-class
   resources:
-  - test
+  - test/test
   result: pass
   rule: add-karpenter-daemonset-priority-class

karpenter/set-karpenter-non-cpu-limits/kyverno-test.yaml

@@ -9,57 +9,57 @@ resources:
 results:
 - kind: Pod
   patchedResource: pod-ephemeral-storage-patched1.yaml
-  policy: test/set-karpenter-non-cpu-limits
+  policy: set-karpenter-non-cpu-limits
   resources:
-  - test1
+  - test/test1
   result: pass
   rule: set-ephemeral-storage
 - kind: Pod
   patchedResource: pod-ephemeral-storage-patched2.yaml
-  policy: test/set-karpenter-non-cpu-limits
+  policy: set-karpenter-non-cpu-limits
   resources:
-  - test2
+  - test/test2
   result: pass
   rule: set-ephemeral-storage
 - kind: Pod
   patchedResource: pod-ephemeral-storage-patched3.yaml
-  policy: test/set-karpenter-non-cpu-limits
+  policy: set-karpenter-non-cpu-limits
   resources:
-  - test3
+  - test/test3
   result: pass
   rule: set-ephemeral-storage
 - kind: Pod
   patchedResource: pod-ephemeral-storage-patched4.yaml
-  policy: test/set-karpenter-non-cpu-limits
+  policy: set-karpenter-non-cpu-limits
   resources:
-  - test4
+  - test/test4
   result: pass
   rule: set-ephemeral-storage
 - kind: Pod
   patchedResource: pod-memory-patched1.yaml
-  policy: test/set-karpenter-non-cpu-limits
+  policy: set-karpenter-non-cpu-limits
   resources:
-  - test1
+  - test/test1
   result: pass
   rule: set-memory
 - kind: Pod
   patchedResource: pod-memory-patched2.yaml
-  policy: test/set-karpenter-non-cpu-limits
+  policy: set-karpenter-non-cpu-limits
   resources:
-  - test2
+  - test/test2
   result: pass
   rule: set-memory
 - kind: Pod
   patchedResource: pod-memory-patched3.yaml
-  policy: test/set-karpenter-non-cpu-limits
+  policy: set-karpenter-non-cpu-limits
   resources:
-  - test3
+  - test/test3
   result: pass
   rule: set-memory
 - kind: Pod
   patchedResource: pod-memory-patched4.yaml
-  policy: test/set-karpenter-non-cpu-limits
+  policy: set-karpenter-non-cpu-limits
   resources:
-  - test4
+  - test/test4
   result: skip
   rule: set-memory

other/a/add-labels/kyverno-test.yaml

@@ -9,15 +9,15 @@ resources:
 results:
 - kind: Pod
   patchedResource: patchedResource.yaml
-  policy: default/add-labels
+  policy: add-labels
   resources:
-  - myapp-pod
+  - default/myapp-pod
   result: pass
   rule: add-labels
 - kind: Service
   patchedResource: patchedResource1.yaml
-  policy: default/add-labels
+  policy: add-labels
   resources:
-  - my-service
+  - default/my-service
   result: pass
   rule: add-labels

other/a/add-ndots/kyverno-test.yaml

@@ -9,8 +9,8 @@ resources:
 results:
 - kind: Pod
   patchedResource: patchedResource.yaml
-  policy: default/add-ndots
+  policy: add-ndots
   resources:
-  - myapp-pod
+  - default/myapp-pod
   result: pass
   rule: add-ndots

other/a/add-nodeSelector/kyverno-test.yaml

@@ -9,8 +9,8 @@ resources:
 results:
 - kind: Pod
   patchedResource: patchedResource.yaml
-  policy: default/add-nodeselector
+  policy: add-nodeselector
   resources:
-  - myapp-pod
+  - default/myapp-pod
   result: pass
   rule: add-nodeselector

other/a/add-pod-priorityclassname/kyverno-test.yaml

@@ -9,9 +9,9 @@ resources:
 results:
 - kind: Pod
   patchedResource: patchedResource.yaml
-  policy: foo/add-pod-priorityclassname
+  policy: add-pod-priorityclassname
   resources:
-  - blank
+  - foo/blank
   result: pass
   rule: add-priorityclass-pods
 variables: values.yaml

other/b-d/create-default-pdb/kyverno-test.yaml

@@ -9,8 +9,8 @@ resources:
 results:
 - generatedResource: generatedResource.yaml
   kind: Deployment
-  policy: hello-world/create-default-pdb
+  policy: create-default-pdb
   resources:
-  - nginx-deployment
+  - hello-world/nginx-deployment
   result: pass
   rule: create-default-pdb

other/b-d/disallow-all-secrets/kyverno-test.yaml

@@ -8,41 +8,41 @@ resources:
 - resource.yaml
 results:
 - kind: Pod
-  policy: default/no-secrets
+  policy: no-secrets
   resources:
-  - secret-env-pod
+  - default/secret-env-pod
   result: fail
   rule: secrets-not-from-env
 - kind: Pod
-  policy: default/no-secrets
+  policy: no-secrets
   resources:
-  - secret-ref-pod
-  - secret-vol-pod
+  - default/secret-ref-pod
+  - default/secret-vol-pod
   result: pass
   rule: secrets-not-from-env
 - kind: Pod
-  policy: default/no-secrets
+  policy: no-secrets
   resources:
-  - secret-ref-pod
+  - default/secret-ref-pod
   result: fail
   rule: secrets-not-from-envfrom
 - kind: Pod
-  policy: default/no-secrets
+  policy: no-secrets
   resources:
-  - secret-env-pod
-  - secret-vol-pod
+  - default/secret-env-pod
+  - default/secret-vol-pod
   result: pass
   rule: secrets-not-from-envfrom
 - kind: Pod
-  policy: default/no-secrets
+  policy: no-secrets
   resources:
-  - secret-vol-pod
+  - default/secret-vol-pod
   result: fail
   rule: secrets-not-from-volumes
 - kind: Pod
-  policy: default/no-secrets
+  policy: no-secrets
   resources:
-  - secret-env-pod
-  - secret-ref-pod
+  - default/secret-env-pod
+  - default/secret-ref-pod
   result: pass
   rule: secrets-not-from-volumes

other/b-d/disallow-secrets-from-env-vars/kyverno-test.yaml

@@ -8,26 +8,26 @@ resources:
 - resource.yaml
 results:
 - kind: Pod
-  policy: default/secrets-not-from-env-vars
+  policy: secrets-not-from-env-vars
   resources:
-  - secret-env-pod
+  - default/secret-env-pod
   result: fail
   rule: secrets-not-from-env-vars
 - kind: Pod
-  policy: default/secrets-not-from-env-vars
+  policy: secrets-not-from-env-vars
   resources:
-  - secret-ref-pod
+  - default/secret-ref-pod
   result: pass
   rule: secrets-not-from-env-vars
 - kind: Pod
-  policy: default/secrets-not-from-env-vars
+  policy: secrets-not-from-env-vars
   resources:
-  - secret-ref-pod
+  - default/secret-ref-pod
   result: fail
   rule: secrets-not-from-envfrom
 - kind: Pod
-  policy: default/secrets-not-from-env-vars
+  policy: secrets-not-from-env-vars
   resources:
-  - secret-env-pod
+  - default/secret-env-pod
   result: pass
   rule: secrets-not-from-envfrom

other/b-d/dns-policy-and-dns-config/kyverno-test.yaml

@@ -9,9 +9,9 @@ resources:
 results:
 - kind: Pod
   patchedResource: patchedResource.yaml
-  policy: default/change-dns-config-policy
+  policy: change-dns-config-policy
   resources:
-  - myapp-pod
+  - default/myapp-pod
   result: pass
   rule: dns-policy
 variables: variables.yaml

other/m-q/pdb-maxunavailable/kyverno-test.yaml

@@ -8,16 +8,16 @@ resources:
 - resource.yaml
 results:
 - kind: PodDisruptionBudget
-  policy: kube-system/pdb-maxunavailable
+  policy: pdb-maxunavailable
   resources:
-  - bad-pdb-zero
-  - bad-pdb-negative-one
+  - kube-system/bad-pdb-zero
+  - kube-system/bad-pdb-negative-one
   result: fail
   rule: pdb-maxunavailable
 - kind: PodDisruptionBudget
-  policy: kube-system/pdb-maxunavailable
+  policy: pdb-maxunavailable
   resources:
-  - good-pdb
-  - good-pdb-none
+  - kube-system/good-pdb
+  - kube-system/good-pdb-none
   result: pass
   rule: pdb-maxunavailable

other/m-q/pdb-minavailable/kyverno-test.yaml

@@ -8,15 +8,15 @@ resources:
 - resource.yaml
 results:
 - kind: StatefulSet
-  policy: nginx/pdb-minavailable-check
+  policy: pdb-minavailable-check
   resources:
-  - bad-pdb
+  - nginx/bad-pdb
   result: fail
   rule: pdb-minavailable
 - kind: StatefulSet
-  policy: nginx/pdb-minavailable-check
+  policy: pdb-minavailable-check
   resources:
-  - good-pdb
+  - nginx/good-pdb
   result: pass
   rule: pdb-minavailable
 variables: values.yaml

other/res/restrict-controlplane-scheduling/kyverno-test.yaml

@@ -8,26 +8,26 @@ resources:
 - resource.yaml
 results:
 - kind: Pod
-  policy: default/restrict-controlplane-scheduling
+  policy: restrict-controlplane-scheduling
   resources:
-  - myapp-pod-2
+  - default/myapp-pod-2
   result: fail
   rule: restrict-controlplane-scheduling-control-plane
 - kind: Pod
-  policy: default/restrict-controlplane-scheduling
+  policy: restrict-controlplane-scheduling
   resources:
-  - myapp-pod-1
+  - default/myapp-pod-1
   result: pass
   rule: restrict-controlplane-scheduling-control-plane
 - kind: Pod
-  policy: default/restrict-controlplane-scheduling
+  policy: restrict-controlplane-scheduling
   resources:
-  - myapp-pod-1
+  - default/myapp-pod-1
   result: fail
   rule: restrict-controlplane-scheduling-master
 - kind: Pod
-  policy: default/restrict-controlplane-scheduling
+  policy: restrict-controlplane-scheduling
   resources:
-  - myapp-pod-2
+  - default/myapp-pod-2
   result: pass
   rule: restrict-controlplane-scheduling-master

other/res/restrict-deprecated-registry/kyverno-test.yaml

@@ -8,14 +8,14 @@ resources:
 - resource.yaml
 results:
 - kind: Pod
-  policy: policy-test/restrict-deprecated-registry
+  policy: restrict-deprecated-registry
   resources:
-  - test-pod-bad
+  - policy-test/test-pod-bad
   result: fail
   rule: restrict-deprecated-registry
 - kind: Pod
-  policy: policy-test/restrict-deprecated-registry
+  policy: restrict-deprecated-registry
   resources:
-  - test-pod-good
+  - policy-test/test-pod-good
   result: pass
   rule: restrict-deprecated-registry

other/res/restrict-ingress-classes/kyverno-test.yaml

@@ -8,14 +8,14 @@ resources:
 - resource.yaml
 results:
 - kind: Ingress
-  policy: default/restrict-ingress-classes
+  policy: restrict-ingress-classes
   resources:
-  - minimal-ingress-2
+  - default/minimal-ingress-2
   result: fail
   rule: validate-ingress
 - kind: Ingress
-  policy: default/restrict-ingress-classes
+  policy: restrict-ingress-classes
   resources:
-  - minimal-ingress-1
+  - default/minimal-ingress-1
   result: pass
   rule: validate-ingress

other/res/restrict-ingress-defaultbackend/kyverno-test.yaml

@@ -8,14 +8,14 @@ resources:
 - resource.yaml
 results:
 - kind: Ingress
-  policy: default/restrict-ingress-defaultbackend
+  policy: restrict-ingress-defaultbackend
   resources:
-  - sample-app-1
+  - default/sample-app-1
   result: fail
   rule: restrict-ingress-defaultbackend
 - kind: Ingress
-  policy: default/restrict-ingress-defaultbackend
+  policy: restrict-ingress-defaultbackend
   resources:
-  - sample-app-2
+  - default/sample-app-2
   result: pass
   rule: restrict-ingress-defaultbackend