From ee4ceed87719381457879fe5085a8d585cd6a19c Mon Sep 17 00:00:00 2001
From: Vishesh Tanksale <vtanksale@nvidia.com>
Date: Tue, 25 Feb 2025 00:39:03 +0000
Subject: [PATCH 1/2] Remove mongodb from evaluator ansible install

Signed-off-by: Vishesh Tanksale <vtanksale@nvidia.com>
---
 .../evaluator/defaults/main.yml               | 13 +---
 .../evaluator/tasks/main.yml                  |  4 +-
 .../evaluator/tasks/milvus.yaml               |  2 +-
 .../evaluator/tasks/mongodb.yaml              | 67 -------------------
 .../evaluator/tasks/uninstall.yaml            |  6 +-
 .../evaluator/templates/mongo-values.yaml.j2  | 15 -----
 test/e2e/nemo-dependencies/install.yaml       |  5 +-
 test/e2e/nemo-dependencies/values.yaml        |  4 +-
 8 files changed, 9 insertions(+), 107 deletions(-)
 delete mode 100644 test/e2e/nemo-dependencies/evaluator/tasks/mongodb.yaml
 delete mode 100644 test/e2e/nemo-dependencies/evaluator/templates/mongo-values.yaml.j2

diff --git a/test/e2e/nemo-dependencies/evaluator/defaults/main.yml b/test/e2e/nemo-dependencies/evaluator/defaults/main.yml
index d93392235..3adb2b101 100644
--- a/test/e2e/nemo-dependencies/evaluator/defaults/main.yml
+++ b/test/e2e/nemo-dependencies/evaluator/defaults/main.yml
@@ -12,17 +12,6 @@ argo:
   helm_repo_url: "https://argoproj.github.io/argo-helm"
   chart_name: "argo/argo-workflows"
 
-# MongoDB Helm chart details
-mongodb:
-  enabled: true
-  helm_repo_name: "mongodb"
-  helm_repo_url: "https://charts.bitnami.com/bitnami"
-  chart_name: "mongodb/mongodb"
-  chart_version: "14.8.2"
-  username: "root"
-  password: "examplepassword"
-  database: "evaluations"
-
 # Milvus Helm chart details
 milvus:
   enabled: true
@@ -59,4 +48,4 @@ postgresql:
 
 localPathProvisioner:
   enabled: true
-  version: v0.0.31
\ No newline at end of file
+  version: v0.0.31
diff --git a/test/e2e/nemo-dependencies/evaluator/tasks/main.yml b/test/e2e/nemo-dependencies/evaluator/tasks/main.yml
index 3aa548ebb..a664b1baf 100644
--- a/test/e2e/nemo-dependencies/evaluator/tasks/main.yml
+++ b/test/e2e/nemo-dependencies/evaluator/tasks/main.yml
@@ -6,8 +6,6 @@
   when: localPathProvisioner.enabled
 - include_tasks: argo-workflow.yaml
   when: argo.enabled
-- include_tasks: mongodb.yaml
-  when: mongodb.enabled
 - include_tasks: milvus.yaml
   when: milvus.enabled
 - include_tasks: opentelemetry.yaml
@@ -15,4 +13,4 @@
 - include_tasks: zipkin.yaml
   when: zipkin.enabled
 - include_tasks: postgresql.yaml
-  when: postgresql.enabled
\ No newline at end of file
+  when: postgresql.enabled
diff --git a/test/e2e/nemo-dependencies/evaluator/tasks/milvus.yaml b/test/e2e/nemo-dependencies/evaluator/tasks/milvus.yaml
index e153bede5..dae072ac4 100644
--- a/test/e2e/nemo-dependencies/evaluator/tasks/milvus.yaml
+++ b/test/e2e/nemo-dependencies/evaluator/tasks/milvus.yaml
@@ -27,7 +27,7 @@
 - name: Wait for Milvus pod to be ready
   command: kubectl wait --for=condition=Ready pod -n {{ namespace }} -l app.kubernetes.io/instance={{ milvus.helm_repo_name }} --timeout=120s
 
-- name: Get MongoDB pod details
+- name: Get Milvus pod details
   shell: |
     kubectl get pods -n {{ namespace }} -l app.kubernetes.io/instance={{ milvus.helm_repo_name }} -o json
   register: milvus_pods
diff --git a/test/e2e/nemo-dependencies/evaluator/tasks/mongodb.yaml b/test/e2e/nemo-dependencies/evaluator/tasks/mongodb.yaml
deleted file mode 100644
index 22b561079..000000000
--- a/test/e2e/nemo-dependencies/evaluator/tasks/mongodb.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-- name: Add MongoDB Helm repository
-  ansible.builtin.command:
-    cmd: helm repo add {{ mongodb.helm_repo_name }} {{ mongodb.helm_repo_url }}
-
-- name: Update Helm repositories cache
-  command: helm repo update
-
-- name: Template values file
-  ansible.builtin.template:
-    src: mongo-values.yaml.j2
-    dest: mongodb-values.yaml
-
-- name: Install mongodb Helm chart
-  shell: >
-    helm upgrade --install {{ mongodb.helm_repo_name }}
-    {{ mongodb.chart_name }} 
-    --namespace {{ namespace }}
-    --version {{ mongodb.chart_version }}
-    --values mongodb-values.yaml
-  register: helm_install_result
-  changed_when: "'STATUS: deployed' in helm_install_result.stdout"
-
-- name: Verify MongoDB installation
-  command: kubectl get pods -n {{ namespace }}
-  register: pods
-  changed_when: false
-
-- name: Wait for MongoDB pod to be ready
-  command: kubectl wait --for=condition=Ready pod -n {{ namespace }} -l app.kubernetes.io/instance={{ mongodb.helm_repo_name }} --timeout=120s
-
-- name: Get MongoDB pod details
-  shell: |
-    kubectl get pods -n {{ namespace }} -l app.kubernetes.io/instance={{ mongodb.helm_repo_name }} -o json
-  register: mongodb_pods
-  changed_when: false
-
-- name: Get MongoDB pod name
-  shell: |
-    kubectl get pods -n {{ namespace }} -l app.kubernetes.io/instance={{ mongodb.helm_repo_name }} -o jsonpath='{.items[0].metadata.name}'
-  register: mongodb_pod_name
-  failed_when: mongodb_pod_name.stdout == ""
-  changed_when: false
-
-- name: Debug MongoDB pod name
-  debug:
-    msg: "MongoDB pod name is {{ mongodb_pod_name.stdout }}"
-
-- name: Get the IP of the running MongoDB pod
-  shell: |
-    kubectl get pod -n {{ namespace }} {{ mongodb_pod_name.stdout }} -o jsonpath='{.status.podIP}'
-  register: mongodb_pod_ip
-  failed_when: mongodb_pod_ip.stdout == ""
-  changed_when: false
-
-- name: Debug MongoDB Pod IP
-  debug:
-    msg: "MongoDB Pod IP is {{ mongodb_pod_ip.stdout }}"
-  when: mongodb_pod_ip | length > 0
-
-- name: Check MongoDB service is responding
-  command: "nc -zv {{ mongodb_pod_ip.stdout }} 27017"
-  register: mongodb_status
-
-- name: Display Milvus connectivity status
-  debug:
-    msg: "{{ '✅ MongoDB is accessible!' if mongodb_status.rc == 0 else '❌ MongoDB is not reachable!' }}"
\ No newline at end of file
diff --git a/test/e2e/nemo-dependencies/evaluator/tasks/uninstall.yaml b/test/e2e/nemo-dependencies/evaluator/tasks/uninstall.yaml
index fa4a6b8b7..c5c726e95 100644
--- a/test/e2e/nemo-dependencies/evaluator/tasks/uninstall.yaml
+++ b/test/e2e/nemo-dependencies/evaluator/tasks/uninstall.yaml
@@ -4,15 +4,15 @@
   ignore_errors: true
 
 - name: Uninstall Evaluator helm charts
-  shell: helm list -n {{ namespace }} | awk '{print $1}' | grep -v NAME | egrep 'evaluator|argo|milvus|mongodb' | xargs helm del -n {{ namespace }}
+  shell: helm list -n {{ namespace }} | awk '{print $1}' | grep -v NAME | egrep 'evaluator|argo|milvus' | xargs helm del -n {{ namespace }}
   ignore_errors: true
 
 - name: Delete Evaluator PVCs
-  shell: kubectl get pvc -n {{ namespace }} | egrep 'evaluator|volcano|milvus|mongodb' | awk '{print $1}' | xargs kubectl delete pvc -n {{ namespace }}
+  shell: kubectl get pvc -n {{ namespace }} | egrep 'evaluator|volcano|milvus' | awk '{print $1}' | xargs kubectl delete pvc -n {{ namespace }}
   ignore_errors: true
 
 - name: Delete Argo Kubernetes resources
   shell: kubectl get {{ item }} | grep argoproj | awk '{print $1}' | xargs kubectl delete {{ item }}
   loop:
     - crd
-  ignore_errors: true
\ No newline at end of file
+  ignore_errors: true
diff --git a/test/e2e/nemo-dependencies/evaluator/templates/mongo-values.yaml.j2 b/test/e2e/nemo-dependencies/evaluator/templates/mongo-values.yaml.j2
deleted file mode 100644
index f370681d7..000000000
--- a/test/e2e/nemo-dependencies/evaluator/templates/mongo-values.yaml.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-architecture: standalone
-port: 27017
-database: "{{ mongodb.database }}"
-username: "{{ mongodb.username }}"
-auth:
-  enabled: true
-  rootPassword: "{{ mongodb.password }}"
-persistence:
-  enabled: true
-  resourcePolicy: keep
-  accessModes:
-    - "ReadWriteOnce"
-  size: 5Gi
-  storageClass: {{ '"local-path"' if localPathProvisioner.enabled else '""' }}
-
diff --git a/test/e2e/nemo-dependencies/install.yaml b/test/e2e/nemo-dependencies/install.yaml
index 337e047ec..aeff1dad9 100644
--- a/test/e2e/nemo-dependencies/install.yaml
+++ b/test/e2e/nemo-dependencies/install.yaml
@@ -89,7 +89,4 @@
         - "Evaluator DB Name: {{ postgresql.database }}"      
         - "Evaluator Milvus Password: {{ milvus.password }}"
         - "Evaluator Milvus Username: {{ milvus.username }}"
-        - "Evaluator MongoDB Password: {{ mongodb.password }}"
-        - "Evaluator MongoDB Username: {{ mongodb.username }}"
-        - "Evaluator MongoDB Name: {{ mongodb.database }}"
-    when: install.evaluator == true
\ No newline at end of file
+    when: install.evaluator == true
diff --git a/test/e2e/nemo-dependencies/values.yaml b/test/e2e/nemo-dependencies/values.yaml
index b0d1f5f54..a2cf895b2 100644
--- a/test/e2e/nemo-dependencies/values.yaml
+++ b/test/e2e/nemo-dependencies/values.yaml
@@ -4,7 +4,7 @@ install:
   embedding: no
   ranking: no
   entity_store: no
-  evaluator: no
+  evaluator: yes
 
 uninstall:
   customizer: no
@@ -14,4 +14,4 @@ uninstall:
   entity_store: no
   evaluator: no
 
-installation_namespace: nemo
\ No newline at end of file
+installation_namespace: nemo

From 0872ce1fbd543a767aba17ad9f7b4a333626a26e Mon Sep 17 00:00:00 2001
From: Vishesh Tanksale <vtanksale@nvidia.com>
Date: Tue, 25 Feb 2025 19:16:29 +0000
Subject: [PATCH 2/2] Remove mongodb from evaluator ansible install

Signed-off-by: Vishesh Tanksale <vtanksale@nvidia.com>
---
 test/e2e/nemo-dependencies/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/nemo-dependencies/values.yaml b/test/e2e/nemo-dependencies/values.yaml
index a2cf895b2..9ea66e034 100644
--- a/test/e2e/nemo-dependencies/values.yaml
+++ b/test/e2e/nemo-dependencies/values.yaml
@@ -4,7 +4,7 @@ install:
   embedding: no
   ranking: no
   entity_store: no
-  evaluator: yes
+  evaluator: no
 
 uninstall:
   customizer: no