From e48283fc43bb8e9c45f911df1364675bb9463b89 Mon Sep 17 00:00:00 2001
From: Nikholas Pcenicni <82239765+nikpcenicni@users.noreply.github.com>
Date: Thu, 14 May 2026 17:21:49 -0400
Subject: [PATCH] Update Trivy configuration paths in Ansible tasks and Argo CD
 application manifests to reflect new directory structure. Adjust references
 in values.yaml and dashboard-values.yaml for consistency and clarity in
 deployment processes.

---
 ansible/roles/noble_trivy/tasks/main.yml                      | 4 ++--
 clusters/noble/apps/trivy/dashboard-values.yaml               | 2 +-
 clusters/noble/apps/trivy/values.yaml                         | 4 ++--
 .../argocd/app-of-apps/trivy-dashboard-application.yaml       | 2 +-
 .../argocd/app-of-apps/trivy-operator-application.yaml        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ansible/roles/noble_trivy/tasks/main.yml b/ansible/roles/noble_trivy/tasks/main.yml
index 1ace8be..677a937 100644
--- a/ansible/roles/noble_trivy/tasks/main.yml
+++ b/ansible/roles/noble_trivy/tasks/main.yml
@@ -56,7 +56,7 @@
       - kubectl
       - apply
       - -f
-      - "{{ noble_repo_root }}/clusters/noble/bootstrap/trivy/namespace.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/apps/trivy/namespace.yaml"
   environment:
     KUBECONFIG: "{{ noble_kubeconfig }}"
   changed_when: true
@@ -74,7 +74,7 @@
       - --version
       - "{{ noble_trivy_chart_version }}"
       - -f
-      - "{{ noble_repo_root }}/clusters/noble/bootstrap/trivy/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/apps/trivy/values.yaml"
       - --force-conflicts
       - --wait
       - --timeout
diff --git a/clusters/noble/apps/trivy/dashboard-values.yaml b/clusters/noble/apps/trivy/dashboard-values.yaml
index 54c043d..81f70d6 100644
--- a/clusters/noble/apps/trivy/dashboard-values.yaml
+++ b/clusters/noble/apps/trivy/dashboard-values.yaml
@@ -5,7 +5,7 @@
 # Sync **noble-trivy-operator** first so CRDs and reports exist. DNS: host below → Traefik LB.
 
 kubernetes:
-  # Match **clusters/noble/bootstrap/trivy/values.yaml** operator feature flags (no SBOM / cluster compliance cache).
+  # Match **clusters/noble/apps/trivy/values.yaml** operator feature flags (no SBOM / cluster compliance cache).
   trivyUseClusterComplianceReport: false
   trivyUseClusterSbomReport: false
   trivyUseClusterVulnerabilityReport: false
diff --git a/clusters/noble/apps/trivy/values.yaml b/clusters/noble/apps/trivy/values.yaml
index 28321e1..312c43e 100644
--- a/clusters/noble/apps/trivy/values.yaml
+++ b/clusters/noble/apps/trivy/values.yaml
@@ -6,9 +6,9 @@
 #
 # Manual Helm (if not using Argo):
 #   helm repo add aqua https://aquasecurity.github.io/helm-charts/ && helm repo update
-#   kubectl apply -f clusters/noble/bootstrap/trivy/namespace.yaml
+#   kubectl apply -f clusters/noble/apps/trivy/namespace.yaml
 #   helm upgrade --install trivy-operator aqua/trivy-operator -n trivy-system \
-#     --version 0.32.1 -f clusters/noble/bootstrap/trivy/values.yaml --wait --timeout 15m
+#     --version 0.32.1 -f clusters/noble/apps/trivy/values.yaml --wait --timeout 15m
 #
 # Inspect: kubectl get vulnerabilityreports,configauditreports -A
 # Docs: https://aquasecurity.github.io/trivy-operator/
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/trivy-dashboard-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/trivy-dashboard-application.yaml
index 8cca113..4a439dd 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/trivy-dashboard-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/trivy-dashboard-application.yaml
@@ -15,7 +15,7 @@ spec:
       helm:
         releaseName: trivy-operator-dashboard
         valueFiles:
-          - $values/clusters/noble/bootstrap/trivy/dashboard-values.yaml
+          - $values/clusters/noble/apps/trivy/dashboard-values.yaml
     - repoURL: https://gitea.pcenicni.ca/gsdavidp/home-server.git
       targetRevision: HEAD
       ref: values
diff --git a/clusters/noble/bootstrap/argocd/app-of-apps/trivy-operator-application.yaml b/clusters/noble/bootstrap/argocd/app-of-apps/trivy-operator-application.yaml
index bce2639..a8fc766 100644
--- a/clusters/noble/bootstrap/argocd/app-of-apps/trivy-operator-application.yaml
+++ b/clusters/noble/bootstrap/argocd/app-of-apps/trivy-operator-application.yaml
@@ -15,7 +15,7 @@ spec:
       helm:
         releaseName: trivy-operator
         valueFiles:
-          - $values/clusters/noble/bootstrap/trivy/values.yaml
+          - $values/clusters/noble/apps/trivy/values.yaml
     - repoURL: https://gitea.pcenicni.ca/gsdavidp/home-server.git
       targetRevision: HEAD
       ref: values