*: Minor kyverno-related updates

Update the parser-file for the latest Kyverno release, add/update API-definitions, and, since we added 2 new 3-letter severities, update logparser and logtests. Signed-off-by: David Weinehall <[email protected]>
intel · Dec 7, 2024 · 7272240 · 7272240
1 parent 7a2a9a3
commit 7272240
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 5 deletions.
diff --git a/clustermanagementtoolkit/kubernetes_resources.py b/clustermanagementtoolkit/kubernetes_resources.py
@@ -2869,7 +2869,8 @@
         "api": "backgroundscanreports",
     },
     ("CleanupPolicy", "kyverno.io"): {
-        "api_paths": ["apis/kyverno.io/v2alpha1/"],
+        "api_paths": ["apis/kyverno.io/v2/",
+                      "apis/kyverno.io/v2alpha1/"],
         "api": "cleanuppolicies",
     },
     ("ClusterAdmissionReport", "kyverno.io"): {
@@ -2883,7 +2884,8 @@
         "namespaced": False,
     },
     ("ClusterCleanupPolicy", "kyverno.io"): {
-        "api_paths": ["apis/kyverno.io/v2alpha1/"],
+        "api_paths": ["apis/kyverno.io/v2/",
+                      "apis/kyverno.io/v2alpha1/"],
         "api": "clustercleanuppolicies",
         "namespaced": False,
     },
@@ -2896,16 +2898,22 @@
         "api_paths": ["apis/kyverno.io/v1/"],
         "api": "generaterequests",
     },
+    ("GlobalContextEntry", "kyverno.io"): {
+        "api_paths": ["apis/kyverno.io/v2alpha1/"],
+        "api": "globalcontextentries",
+        "namespaced": False,
+    },
     ("Policy", "kyverno.io"): {
         "api_paths": ["apis/kyverno.io/v1/"],
         "api": "policies",
     },
     ("PolicyException", "kyverno.io"): {
-        "api_paths": ["apis/kyverno.io/v2alpha1/"],
+        "api_paths": ["apis/kyverno.io/v2/",
+                      "apis/kyverno.io/v2alpha1/"],
         "api": "policyexceptions",
     },
     ("UpdateRequest", "kyverno.io"): {
-        "api_paths": ["apis/kyverno.io/v1beta1/"],
+        "api_paths": ["apis/kyverno.io/v2/"],
         "api": "updaterequests",
     },
     # linkerd.io
@@ -4185,6 +4193,16 @@
         "api_paths": ["apis/reporting.kio.kasten.io/v1alpha1/"],
         "api": "reports",
     },
+    # reports.kyverno.io
+    ("ClusterEphemeralReport", "reports.kyverno.io"): {
+        "api_paths": ["apis/reports.kyverno.io/v1/"],
+        "api": "clusterephemeralreports",
+        "namespaced": False,
+    },
+    ("EphemeralReport", "reports.kyverno.io"): {
+        "api_paths": ["apis/reports.kyverno.io/v1/"],
+        "api": "ephemeralreports",
+    },
     # resolution.tekton.dev
     ("ResolutionRequest", "resolution.tekton.dev"): {
         "api_paths": ["apis/resolution.tekton.dev/v1beta1/"],

diff --git a/clustermanagementtoolkit/logparser.py b/clustermanagementtoolkit/logparser.py
@@ -250,6 +250,8 @@ def str_3letter_to_severity(string: str, **kwargs: Any) -> LogLevel:
         "ERR": LogLevel.ERR,
         "WRN": LogLevel.WARNING,
         "INF": LogLevel.INFO,
+        "DBG": LogLevel.DEBUG,
+        "TRC": LogLevel.DEBUG,  # Most likely TRACE; no reason for different loglevel
     }
     return severities.get(string.upper(), default)
 

diff --git a/parsers/kyverno.yaml b/parsers/kyverno.yaml
@@ -10,5 +10,24 @@
     - pod_name: "kyverno-cleanup-controller"
     - pod_name: "kyverno-reports-controller"
   parser_rules:
+    - name: "strip_ansicodes"
+    - name: "ts_8601"
     - name: "glog"
     - name: "key_value_with_leading_message"
+    - name: "custom_splitter"
+      options:
+        # yamllint disable-line rule:line-length
+        regex: '^([A-Z]{3}) (.+?) > (.*)'
+        severity:
+          field: 1
+          transform: "3letter"
+        facility:
+          fields:
+            - 2
+        message:
+          field: 3
+    - name: "override_severity"
+      overrides:
+        - matchtype: "startswith"
+          matchkey: "version "
+          loglevel: "notice"
diff --git a/tests/logtests b/tests/logtests
@@ -256,7 +256,7 @@ def test_letter_to_severity(verbose: bool = False) -> tuple[str, bool]:
 
 # pylint: disable-next=unused-argument
 def test_str_3letter_to_severity(verbose: bool = False) -> tuple[str, bool]:
-    return generic_str_to_severity(valid_indata=("ERR", "WRN", "INF"),
+    return generic_str_to_severity(valid_indata=("ERR", "WRN", "INF", "DBG", "TRC"),
                                    fun=logparsers.str_3letter_to_severity)