Update DSCI monitoring namespace in tests (#77)

Signed-off-by: David Kornel <[email protected]>
skodjob · Jan 22, 2024 · 72cafce · 72cafce
1 parent e40181f
commit 72cafce
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/io/odh/test/OdhConstants.java b/src/main/java/io/odh/test/OdhConstants.java
@@ -22,6 +22,8 @@ private OdhConstants() { }
     private static final String ODH_DASHBOARD_CONTROLLER = "odh-dashboard";
 
     private static final String ODH_BUNDLE_OPERATOR_NAME = "opendatahub-operator-system";
+    private static final String ODH_MONITORING_NAMESPACE = "odh-monitoring";
+
 
     // ODH OLM
     private static final String ODH_OLM_OPERATOR_NAME = "opendatahub-operator";
@@ -49,6 +51,7 @@ private OdhConstants() { }
     private static final String RHOAI_OLM_OPERATOR_CHANNEL = "stable";
     private static final String RHOAI_OLM_OPERATOR_VERSION = "2.5.0";
     private static final String RHOAI_OLM_UPGRADE_STARTING_OPERATOR_VERSION = "2.4.0";
+    private static final String RHOAI_MONITORING_NAMESPACE = "redhat-ods-monitoring";
 
     // Public part
     public static final String CODEFLARE_DEPLOYMENT_NAME = "codeflare-operator-manager";
@@ -67,6 +70,7 @@ private OdhConstants() { }
     public static final String DASHBOARD_CONTROLLER = getOdhOrRhoai("DASHBOARD_CONTROLLER", ODH_DASHBOARD_CONTROLLER, RHOAI_DASHBOARD_CONTROLLER);
     public static final String BUNDLE_OPERATOR_NAMESPACE = getOdhOrRhoai("BUNDLE_OPERATOR_NAMESPACE", ODH_BUNDLE_OPERATOR_NAME, RHOAI_OLM_OPERATOR_NAME);
     public static final String DEFAULT_DSCI_NAME = getOdhOrRhoai("DSCI_NAME", ODH_DSCI_NAME, RHOAI_DSCI_NAME);
+    public static final String MONITORING_NAMESPACE = getOdhOrRhoai("MONITORING_NAMESPACE", ODH_MONITORING_NAMESPACE, RHOAI_MONITORING_NAMESPACE);
     // OLM env variables
     public static final String OLM_OPERATOR_NAME = getOdhOrRhoai("OLM_OPERATOR_NAME", ODH_OLM_OPERATOR_NAME, RHOAI_OLM_OPERATOR_NAME);
     public static final String OLM_OPERATOR_NAMESPACE = getOdhOrRhoai("OLM_OPERATOR_NAMESPACE", ODH_OLM_OPERATOR_NAMESPACE, RHOAI_OLM_OPERATOR_NAMESPACE);

diff --git a/src/main/java/io/odh/test/framework/logs/LogCollector.java b/src/main/java/io/odh/test/framework/logs/LogCollector.java
@@ -33,6 +33,7 @@ public static void saveKubernetesState(ExtensionContext extensionContext, Throwa
             ResourceManager.addNamespaceForLogCollect(OdhConstants.BUNDLE_OPERATOR_NAMESPACE);
             ResourceManager.addNamespaceForLogCollect(OdhConstants.OLM_OPERATOR_NAMESPACE);
             ResourceManager.addNamespaceForLogCollect(OdhConstants.CONTROLLERS_NAMESPACE);
+            ResourceManager.addNamespaceForLogCollect(OdhConstants.MONITORING_NAMESPACE);
         } catch (Exception ignored) {
             LOGGER.warn("Cannot label namespaces for collect logs");
         }

diff --git a/src/test/java/io/odh/test/e2e/standard/DataScienceClusterST.java b/src/test/java/io/odh/test/e2e/standard/DataScienceClusterST.java
@@ -46,7 +46,7 @@ void createDataScienceCluster() {
                 .withApplicationsNamespace(OdhConstants.CONTROLLERS_NAMESPACE)
                 .withNewMonitoring()
                 .withManagementState(Monitoring.ManagementState.MANAGED)
-                .withNamespace(OdhConstants.CONTROLLERS_NAMESPACE)
+                .withNamespace(OdhConstants.MONITORING_NAMESPACE)
                 .endMonitoring()
                 .withNewServiceMesh()
                 .withManagementState(ServiceMesh.ManagementState.REMOVED)

diff --git a/src/test/java/io/odh/test/e2e/standard/NotebookST.java b/src/test/java/io/odh/test/e2e/standard/NotebookST.java
@@ -98,7 +98,7 @@ void deployDataScienceCluster() {
                 .withApplicationsNamespace(OdhConstants.CONTROLLERS_NAMESPACE)
                 .withNewMonitoring()
                 .withManagementState(Monitoring.ManagementState.MANAGED)
-                .withNamespace(OdhConstants.CONTROLLERS_NAMESPACE)
+                .withNamespace(OdhConstants.MONITORING_NAMESPACE)
                 .endMonitoring()
                 .withNewServiceMesh()
                 .withManagementState(ServiceMesh.ManagementState.REMOVED)

diff --git a/src/test/java/io/odh/test/e2e/upgrade/UpgradeAbstract.java b/src/test/java/io/odh/test/e2e/upgrade/UpgradeAbstract.java
@@ -60,7 +60,7 @@ protected void deployDsc(String name) {
                 .withApplicationsNamespace(OdhConstants.CONTROLLERS_NAMESPACE)
                 .withNewMonitoring()
                 .withManagementState(Monitoring.ManagementState.MANAGED)
-                .withNamespace(OdhConstants.CONTROLLERS_NAMESPACE)
+                .withNamespace(OdhConstants.MONITORING_NAMESPACE)
                 .endMonitoring()
                 .withNewServiceMesh()
                 .withManagementState(ServiceMesh.ManagementState.REMOVED)

diff --git a/src/test/java/io/odh/test/unit/UnitTests.java b/src/test/java/io/odh/test/unit/UnitTests.java
@@ -10,6 +10,7 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
+import io.odh.test.OdhConstants;
 import io.odh.test.TestSuite;
 import io.odh.test.framework.ExtensionContextParameterResolver;
 import io.odh.test.framework.listeners.TestVisualSeparator;
@@ -54,9 +55,9 @@ void testCreateDSCInitialization() {
                 .withName("default")
                 .endMetadata()
                 .withNewSpec()
-                .withApplicationsNamespace("opendatahub")
+                .withApplicationsNamespace(OdhConstants.CONTROLLERS_NAMESPACE)
                 .withNewMonitoring()
-                .withNamespace("odh")
+                .withNamespace(OdhConstants.MONITORING_NAMESPACE)
                 .withManagementState(Monitoring.ManagementState.MANAGED)
                 .endMonitoring()
                 .withNewServiceMesh()