Merge into Dev (#4797)

Trivy fix

Co-authored-by: Renovate Bot <renovate-bot@alexlebens.net>
Reviewed-on: #4797

clusters/cl01tl/helm/trivy/values.yaml

@@ -46,42 +46,42 @@ trivy-operator:
           cpu: 200m
           memory: 512Mi
       replicas: 1
-nodeCollector:
+  nodeCollector:
-  volumeMounts:
+    volumeMounts:
-    - name: var-lib-etcd
+      - name: var-lib-etcd
-      mountPath: /var/lib/etcd
+        mountPath: /var/lib/etcd
-      readOnly: true
+        readOnly: true
-    - name: var-lib-kubelet
+      - name: var-lib-kubelet
-      mountPath: /var/lib/kubelet
+        mountPath: /var/lib/kubelet
-      readOnly: true
+        readOnly: true
-    - name: var-lib-kube-scheduler
+      - name: var-lib-kube-scheduler
-      mountPath: /var/lib/kube-scheduler
+        mountPath: /var/lib/kube-scheduler
-      readOnly: true
+        readOnly: true
-    - name: var-lib-kube-controller-manager
+      - name: var-lib-kube-controller-manager
-      mountPath: /var/lib/kube-controller-manager
+        mountPath: /var/lib/kube-controller-manager
-      readOnly: true
+        readOnly: true
-    - name: etc-kubernetes
+      - name: etc-kubernetes
-      mountPath: /etc/kubernetes
+        mountPath: /etc/kubernetes
-      readOnly: true
+        readOnly: true
-    - name: etc-cni-netd
+      - name: etc-cni-netd
-      mountPath: /etc/cni/net.d/
+        mountPath: /etc/cni/net.d/
-      readOnly: true
+        readOnly: true
-  volumes:
+    volumes:
-    - name: var-lib-etcd
+      - name: var-lib-etcd
-      hostPath:
+        hostPath:
-        path: /var/lib/etcd
+          path: /var/lib/etcd
-    - name: var-lib-kubelet
+      - name: var-lib-kubelet
-      hostPath:
+        hostPath:
-        path: /var/lib/kubelet
+          path: /var/lib/kubelet
-    - name: var-lib-kube-scheduler
+      - name: var-lib-kube-scheduler
-      hostPath:
+        hostPath:
-        path: /var/lib/kube-scheduler
+          path: /var/lib/kube-scheduler
-    - name: var-lib-kube-controller-manager
+      - name: var-lib-kube-controller-manager
-      hostPath:
+        hostPath:
-        path: /var/lib/kube-controller-manager
+          path: /var/lib/kube-controller-manager
-    - name: etc-kubernetes
+      - name: etc-kubernetes
-      hostPath:
+        hostPath:
-        path: /etc/kubernetes
+          path: /etc/kubernetes
-    - name: etc-cni-netd
+      - name: etc-cni-netd
-      hostPath:
+        hostPath:
-        path: /etc/cni/net.d/
+          path: /etc/cni/net.d/