From 42f644659a98687560b5749379682c871b902e65 Mon Sep 17 00:00:00 2001
From: Praveen M <m.praveen@ibm.com>
Date: Mon, 24 Feb 2025 11:36:50 +0530
Subject: [PATCH] e2e: hack commit

Signed-off-by: Praveen M <m.praveen@ibm.com>
---
 e2e/e2e_test.go                     | 4 ++++
 scripts/deploy-ceph-csi-operator.sh | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
index 671029be22d..e1171fce7a6 100644
--- a/e2e/e2e_test.go
+++ b/e2e/e2e_test.go
@@ -92,4 +92,8 @@ func handleFlags() {
 		testNFS = testCephFS
 		deployNFS = deployCephFS
 	}
+
+	if operatorDeployment {
+		cephCSINamespace = "ceph-csi-operator-system"
+	}
 }
diff --git a/scripts/deploy-ceph-csi-operator.sh b/scripts/deploy-ceph-csi-operator.sh
index be156a9fa23..1006c4ac30e 100755
--- a/scripts/deploy-ceph-csi-operator.sh
+++ b/scripts/deploy-ceph-csi-operator.sh
@@ -4,14 +4,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 # shellcheck disable=SC1091
 [ ! -e "${SCRIPT_DIR}"/utils.sh ] || source "${SCRIPT_DIR}"/utils.sh
 
-<<<<<<< Updated upstream
-OPERATOR_VERSION=${OPERATOR_VERSION:-"main"}
-=======
-# shellcheck disable=SC1091
-source "${SCRIPT_DIR}/../build.env"
-
 OPERATOR_VERSION="main"
->>>>>>> Stashed changes
 OPERATOR_URL="https://raw.githubusercontent.com/ceph/ceph-csi-operator/${OPERATOR_VERSION}"
 
 # operator deployment files