From 1f26616dc80e3e105a544f7be2497aa8f776d2c0 Mon Sep 17 00:00:00 2001
From: Micah Nagel <micah.nagel@gmail.com>
Date: Tue, 17 Sep 2024 16:44:57 -0600
Subject: [PATCH] chore: remove unused neuvector exporter

---
 src/neuvector/common/zarf.yaml                     | 14 +++++++-------
 src/neuvector/values/registry1-monitor-values.yaml |  9 ---------
 src/neuvector/values/unicorn-monitor-values.yaml   |  5 -----
 src/neuvector/values/upstream-monitor-values.yaml  |  5 -----
 src/neuvector/zarf.yaml                            | 12 ------------
 5 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 src/neuvector/values/registry1-monitor-values.yaml
 delete mode 100644 src/neuvector/values/unicorn-monitor-values.yaml
 delete mode 100644 src/neuvector/values/upstream-monitor-values.yaml

diff --git a/src/neuvector/common/zarf.yaml b/src/neuvector/common/zarf.yaml
index 03c0984e4..9453253b0 100644
--- a/src/neuvector/common/zarf.yaml
+++ b/src/neuvector/common/zarf.yaml
@@ -25,13 +25,13 @@ components:
         gitPath: charts/core
         valuesFiles:
           - ../values/values.yaml
-      - name: monitor
-        url: https://neuvector.github.io/neuvector-helm/
-        version: 2.7.9
-        namespace: neuvector
-        gitPath: charts/monitor
-        valuesFiles:
-          - ../values/monitor-values.yaml
+      # - name: monitor
+      #   url: https://neuvector.github.io/neuvector-helm/
+      #   version: 2.7.9
+      #   namespace: neuvector
+      #   gitPath: charts/monitor
+      #   valuesFiles:
+      #     - ../values/monitor-values.yaml
     actions:
       onDeploy:
         after:
diff --git a/src/neuvector/values/registry1-monitor-values.yaml b/src/neuvector/values/registry1-monitor-values.yaml
deleted file mode 100644
index f3f01b662..000000000
--- a/src/neuvector/values/registry1-monitor-values.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-registry: registry1.dso.mil
-exporter:
-  image:
-    repository: ironbank/neuvector/neuvector/prometheus-exporter
-    tag: 5.3.2
-
-  containerSecurityContext:
-    runAsUser: 1001
-    runAsGroup: 1001
diff --git a/src/neuvector/values/unicorn-monitor-values.yaml b/src/neuvector/values/unicorn-monitor-values.yaml
deleted file mode 100644
index 51f216b67..000000000
--- a/src/neuvector/values/unicorn-monitor-values.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-registry: cgr.dev
-exporter:
-  image:
-    repository: du-uds-defenseunicorns/neuvector-prometheus-exporter-fips
-    tag: 5.3.0
diff --git a/src/neuvector/values/upstream-monitor-values.yaml b/src/neuvector/values/upstream-monitor-values.yaml
deleted file mode 100644
index 58148a492..000000000
--- a/src/neuvector/values/upstream-monitor-values.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-registry: docker.io
-exporter:
-  image:
-    repository: neuvector/prometheus-exporter
-    tag: 5.3.2
diff --git a/src/neuvector/zarf.yaml b/src/neuvector/zarf.yaml
index f90420d85..81136263b 100644
--- a/src/neuvector/zarf.yaml
+++ b/src/neuvector/zarf.yaml
@@ -16,16 +16,12 @@ components:
       - name: core
         valuesFiles:
           - values/upstream-values.yaml
-      - name: monitor
-        valuesFiles:
-          - values/upstream-monitor-values.yaml
     images:
       - docker.io/neuvector/controller:5.3.4
       - docker.io/neuvector/manager:5.3.4
       - docker.io/neuvector/updater:latest
       - docker.io/neuvector/scanner:latest
       - docker.io/neuvector/enforcer:5.3.4
-      - docker.io/neuvector/prometheus-exporter:5.3.2
 
   - name: neuvector
     description: "Deploy Neuvector"
@@ -38,16 +34,12 @@ components:
       - name: core
         valuesFiles:
           - values/registry1-values.yaml
-      - name: monitor
-        valuesFiles:
-          - values/registry1-monitor-values.yaml
     images:
       - registry1.dso.mil/ironbank/neuvector/neuvector/controller:5.3.4
       - registry1.dso.mil/ironbank/neuvector/neuvector/manager:5.3.4
       - registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal:9.4
       - registry1.dso.mil/ironbank/neuvector/neuvector/scanner:5
       - registry1.dso.mil/ironbank/neuvector/neuvector/enforcer:5.3.4
-      - registry1.dso.mil/ironbank/neuvector/neuvector/prometheus-exporter:5.3.2
 
   - name: neuvector
     description: "Deploy Neuvector"
@@ -63,13 +55,9 @@ components:
       - name: core
         valuesFiles:
           - values/unicorn-values.yaml
-      - name: monitor
-        valuesFiles:
-          - values/unicorn-monitor-values.yaml
     images:
       - cgr.dev/du-uds-defenseunicorns/neuvector-manager:5.3.4
       - cgr.dev/du-uds-defenseunicorns/neuvector-enforcer-fips:5.3.4
       - cgr.dev/du-uds-defenseunicorns/neuvector-controller-fips:5.3.4
       - docker.io/neuvector/scanner:latest
       - cgr.dev/du-uds-defenseunicorns/neuvector-updater-fips:8.10.0-dev
-      - cgr.dev/du-uds-defenseunicorns/neuvector-prometheus-exporter-fips:5.3.0