Merge pull request #633 from DavidRajnoha/cypress-configurable-namespace-and-idempotent-cleanups

openshift-merge-bot[bot] · web-flow · commit 5cdc38c32046 · 2025-11-24T21:54:36.000Z
OBSINTA-858: configurable Cypress COO namespace and idempotent cleanup
diff --git a/package-lock.json b/package-lock.json
diff --git a/web/cypress.config.ts b/web/cypress.config.ts
@@ -23,6 +23,7 @@ export default defineConfig({
     LOGIN_PASSWORD: process.env.CYPRESS_LOGIN_USERS.split(',')[0].split(':')[1],
     TIMEZONE: process.env.CYPRESS_TIMEZONE || 'UTC',
     MOCK_NEW_METRICS: process.env.CYPRESS_MOCK_NEW_METRICS || 'false',
+    COO_NAMESPACE: process.env.CYPRESS_COO_NAMESPACE || 'openshift-cluster-observability-operator',
     typeDelay: 200,
   },
   fixturesFolder: 'cypress/fixtures',
diff --git a/web/cypress/README.md b/web/cypress/README.md
@@ -173,7 +173,14 @@ export CYPRESS_KUBECONFIG_PATH=~/Downloads/kubeconfig
 export CYPRESS_SKIP_ALL_INSTALL=true
 ```
 
-### Example 5: Debug Mode
+### Example 5: Configurable COO Namespace
+
+Set the following var to specify the Cluster Observability Operator namespace. Defaults to `openshift-cluster-observability-operator` if not set. This is useful when testing with different namespace configurations (e.g., using `coo` instead of the default).
+```bash
+export CYPRESS_COO_NAMESPACE=openshift-cluster-observability-operator
+```
+
+### Example 6: Debug Mode
 
 ```bash
 # Required variables + debug
diff --git a/web/cypress/configure-env.sh b/web/cypress/configure-env.sh
@@ -169,6 +169,7 @@ print_current_config() {
 
   # Optional vars
   print_var "CYPRESS_MP_IMAGE" "${CYPRESS_MP_IMAGE-}"
+  print_var "CYPRESS_COO_NAMESPACE" "${CYPRESS_COO_NAMESPACE-}"
   print_var "CYPRESS_SKIP_COO_INSTALL" "${CYPRESS_SKIP_COO_INSTALL-}"
   print_var "CYPRESS_COO_UI_INSTALL" "${CYPRESS_COO_UI_INSTALL-}"
   print_var "CYPRESS_KONFLUX_COO_BUNDLE_IMAGE" "${CYPRESS_KONFLUX_COO_BUNDLE_IMAGE-}"
@@ -219,6 +220,7 @@ main() {
   local def_login_users=${CYPRESS_LOGIN_USERS-}
   local def_kubeconfig=${CYPRESS_KUBECONFIG_PATH-${KUBECONFIG-}}
   local def_mp_image=${CYPRESS_MP_IMAGE-}
+  local def_coo_namespace=${CYPRESS_COO_NAMESPACE-}
   local def_skip_coo=${CYPRESS_SKIP_COO_INSTALL-}
   local def_coo_ui_install=${CYPRESS_COO_UI_INSTALL-}
   local def_konflux_bundle=${CYPRESS_KONFLUX_COO_BUNDLE_IMAGE-}
@@ -402,6 +404,9 @@ main() {
   local mp_image
   mp_image=$(ask "Custom Monitoring Plugin image (CYPRESS_MP_IMAGE)" "$def_mp_image")
 
+  local coo_namespace
+  coo_namespace=$(ask "Cluster Observability Operator namespace (CYPRESS_COO_NAMESPACE)" "${def_coo_namespace:-openshift-cluster-observability-operator}")
+
   local skip_coo_install_ans
   skip_coo_install_ans=$(ask_yes_no "Skip Cluster Observability installation? (sets CYPRESS_SKIP_COO_INSTALL)" "$(bool_to_default_yn "$def_skip_coo")")
   local skip_coo_install="false"
@@ -473,6 +478,9 @@ main() {
   if [[ -n "$mp_image" ]]; then
     export_lines+=("export CYPRESS_MP_IMAGE='$(printf %s "$mp_image" | escape_for_single_quotes)'" )
   fi
+  if [[ -n "$coo_namespace" ]]; then
+    export_lines+=("export CYPRESS_COO_NAMESPACE='$(printf %s "$coo_namespace" | escape_for_single_quotes)'" )
+  fi
   export_lines+=("export CYPRESS_SKIP_COO_INSTALL='$(printf %s "$skip_coo_install" | escape_for_single_quotes)'" )
   export_lines+=("export CYPRESS_COO_UI_INSTALL='$(printf %s "$coo_ui_install" | escape_for_single_quotes)'" )
   if [[ -n "$konflux_bundle" ]]; then
@@ -531,6 +539,7 @@ main() {
   echo "  CYPRESS_LOGIN_USERS=${CYPRESS_LOGIN_USERS:-$login_users}"
   echo "  CYPRESS_KUBECONFIG_PATH=${CYPRESS_KUBECONFIG_PATH:-$kubeconfig}"
   [[ -n "${CYPRESS_MP_IMAGE-}$mp_image" ]] && echo "  CYPRESS_MP_IMAGE=${CYPRESS_MP_IMAGE:-$mp_image}"
+  [[ -n "${CYPRESS_COO_NAMESPACE-}$coo_namespace" ]] && echo "  CYPRESS_COO_NAMESPACE=${CYPRESS_COO_NAMESPACE:-$coo_namespace}"
   echo "  CYPRESS_SKIP_COO_INSTALL=${CYPRESS_SKIP_COO_INSTALL:-$skip_coo_install}"
   echo "  CYPRESS_COO_UI_INSTALL=${CYPRESS_COO_UI_INSTALL:-$coo_ui_install}"
   [[ -n "${CYPRESS_KONFLUX_COO_BUNDLE_IMAGE-}$konflux_bundle" ]] && echo "  CYPRESS_KONFLUX_COO_BUNDLE_IMAGE=${CYPRESS_KONFLUX_COO_BUNDLE_IMAGE:-$konflux_bundle}"
diff --git a/web/cypress/e2e/coo/01.coo_bvt.cy.ts b/web/cypress/e2e/coo/01.coo_bvt.cy.ts
@@ -4,7 +4,7 @@ import { nav } from '../../views/nav';
 
 // Set constants for the operators that need to be installed for tests.
 const MCP = {
-  namespace: 'openshift-cluster-observability-operator',
+  namespace: Cypress.env('COO_NAMESPACE'),
   packageName: 'cluster-observability-operator',
   operatorName: 'Cluster Observability Operator',
   config: {
diff --git a/web/cypress/e2e/incidents/00.coo_incidents_e2e.cy.ts b/web/cypress/e2e/incidents/00.coo_incidents_e2e.cy.ts
@@ -7,7 +7,7 @@ import { incidentsPage } from '../../views/incidents-page';
 
 // Set constants for the operators that need to be installed for tests.
 const MCP = {
-  namespace: 'openshift-cluster-observability-operator',
+  namespace: Cypress.env('COO_NAMESPACE'),
   packageName: 'cluster-observability-operator',
   operatorName: 'Cluster Observability Operator',
   config: {
@@ -17,7 +17,7 @@ const MCP = {
 };
 
 const MP = {
-  namespace: 'openshift-monitoring',
+  namespace: Cypress.env('COO_NAMESPACE'),
   operatorName: 'Cluster Monitoring Operator',
 };
 
diff --git a/web/cypress/e2e/incidents/01.incidents.cy.ts b/web/cypress/e2e/incidents/01.incidents.cy.ts
@@ -12,7 +12,7 @@ import { commonPages } from '../../views/common';
 import { incidentsPage } from '../../views/incidents-page';
 
 const MCP = {
-  namespace: 'openshift-cluster-observability-operator',
+  namespace: Cypress.env('COO_NAMESPACE'),
   packageName: 'cluster-observability-operator',
   operatorName: 'Cluster Observability Operator',
   config: {
@@ -22,7 +22,7 @@ const MCP = {
 };
 
 const MP = {
-  namespace: 'openshift-monitoring',
+  namespace: Cypress.env('COO_NAMESPACE'),
   operatorName: 'Cluster Monitoring Operator',
 };
 
diff --git a/web/cypress/e2e/incidents/02.incidents-mocking-example.cy.ts b/web/cypress/e2e/incidents/02.incidents-mocking-example.cy.ts
@@ -12,7 +12,7 @@ import { incidentsPage } from '../../views/incidents-page';
 import { IncidentDefinition } from '../../support/incidents_prometheus_query_mocks';
 
 const MCP = {
-  namespace: 'openshift-cluster-observability-operator',
+  namespace: Cypress.env('COO_NAMESPACE'),
   packageName: 'cluster-observability-operator',
   operatorName: 'Cluster Observability Operator',
   config: {
@@ -22,7 +22,7 @@ const MCP = {
 };
 
 const MP = {
-  namespace: 'openshift-monitoring',
+  namespace: Cypress.env('COO_NAMESPACE'),
   operatorName: 'Cluster Monitoring Operator',
 };
 
diff --git a/web/cypress/e2e/incidents/regression/01.reg_filtering.cy.ts b/web/cypress/e2e/incidents/regression/01.reg_filtering.cy.ts
@@ -11,7 +11,7 @@ Verifies: OU-727
 import { incidentsPage } from '../../../views/incidents-page';
 
 const MCP = {
-  namespace: 'openshift-cluster-observability-operator',
+  namespace: Cypress.env('COO_NAMESPACE'),
   packageName: 'cluster-observability-operator',
   operatorName: 'Cluster Observability Operator',
   config: {
@@ -21,7 +21,7 @@ const MCP = {
 };
 
 const MP = {
-  namespace: 'openshift-monitoring',
+  namespace: Cypress.env('COO_NAMESPACE'),
   operatorName: 'Cluster Monitoring Operator',
 };
 
diff --git a/web/cypress/e2e/incidents/regression/02.reg_ui_charts_comprehensive.cy.ts b/web/cypress/e2e/incidents/regression/02.reg_ui_charts_comprehensive.cy.ts
@@ -70,7 +70,7 @@ function verifyIncidentBarIsVisible(index: number, context: string) {
   verifyIncidentBarHasVisiblePaths(index, context);
 }
 const MCP = {
-  namespace: 'openshift-cluster-observability-operator',
+  namespace: Cypress.env('COO_NAMESPACE'),
   packageName: 'cluster-observability-operator',
   operatorName: 'Cluster Observability Operator',
   config: {
@@ -80,7 +80,7 @@ const MCP = {
 };
 
 const MP = {
-  namespace: 'openshift-monitoring',
+  namespace: Cypress.env('COO_NAMESPACE'),
   operatorName: 'Cluster Monitoring Operator',
 };
 
diff --git a/web/cypress/e2e/incidents/regression/03.reg_api_calls.cy.ts b/web/cypress/e2e/incidents/regression/03.reg_api_calls.cy.ts
@@ -12,7 +12,7 @@ Verifies: OU-1020, OU-706
 import { incidentsPage } from '../../../views/incidents-page';
 
 const MCP = {
-  namespace: 'openshift-cluster-observability-operator',
+  namespace: Cypress.env('COO_NAMESPACE'),
   packageName: 'cluster-observability-operator',
   operatorName: 'Cluster Observability Operator',
   config: {
@@ -22,7 +22,7 @@ const MCP = {
 };
 
 const MP = {
-  namespace: 'openshift-monitoring',
+  namespace: Cypress.env('COO_NAMESPACE'),
   operatorName: 'Cluster Monitoring Operator',
 };
 
diff --git a/web/cypress/e2e/incidents/regression/04.reg_redux_effects.cy.ts b/web/cypress/e2e/incidents/regression/04.reg_redux_effects.cy.ts
@@ -16,7 +16,7 @@ Test cases:
 import { incidentsPage } from '../../../views/incidents-page';
 
 const MCP = {
-  namespace: 'openshift-cluster-observability-operator',
+  namespace: Cypress.env('COO_NAMESPACE'),
   packageName: 'cluster-observability-operator',
   operatorName: 'Cluster Observability Operator',
   config: {
@@ -26,7 +26,7 @@ const MCP = {
 };
 
 const MP = {
-  namespace: 'openshift-monitoring',
+  namespace: Cypress.env('COO_NAMESPACE'),
   operatorName: 'Cluster Monitoring Operator',
 };
 
diff --git a/web/cypress/fixtures/coo/coo_stage.sh b/web/cypress/fixtures/coo/coo_stage.sh
@@ -1,23 +1,25 @@
 #!/bin/bash
 echo COO install through FBC
 
+COO_NAMESPACE="${CYPRESS_COO_NAMESPACE:-openshift-cluster-observability-operator}"
+
 oc apply -f - <<EOF
 apiVersion: v1
 kind: Namespace
 metadata:
   labels:
     openshift.io/cluster-monitoring: "true"
-  name: openshift-cluster-observability-operator
+  name: ${COO_NAMESPACE}
 EOF
 
 oc apply -f - <<EOF
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
-  namespace: openshift-cluster-observability-operator
+  namespace: ${COO_NAMESPACE}
   name: og-global
   labels:
-    og_label: openshift-cluster-observability-operator
+    og_label: ${COO_NAMESPACE}
 spec:
   upgradeStrategy: Default
 EOF
@@ -65,7 +67,7 @@ metadata:
   labels:
     operators.coreos.com/observability-operator.openshift-operators: ""
   name: cluster-observability-operator
-  namespace: openshift-cluster-observability-operator
+  namespace: ${COO_NAMESPACE}
 spec:
   channel: stable
   installPlanApproval: Automatic
diff --git a/web/cypress/fixtures/export.sh b/web/cypress/fixtures/export.sh
@@ -15,6 +15,9 @@ export CYPRESS_KUBECONFIG_PATH=~/Downloads/kubeconfig
 # Set the following var to use custom Monitoring Plugin image (that goes on Cluster Monitoring Operator). The image will be patched in CMO CSV.
 export CYPRESS_MP_IMAGE=<Monitoring Plugin image>
 
+# Set the following var to specify the Cluster Observability Operator namespace (defaults to openshift-cluster-observability-operator if not set)
+export CYPRESS_COO_NAMESPACE=openshift-cluster-observability-operator
+
 # Set the var to skip Cluster Observability and all the required operators installation.
 export CYPRESS_SKIP_COO_INSTALL=false
 
diff --git a/web/cypress/support/commands/operator-commands.ts b/web/cypress/support/commands/operator-commands.ts
@@ -192,7 +192,7 @@ const operatorUtils = {
         'Operator installed successfully',
       );
       cy.exec(
-        `oc label namespaces ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
+        `oc label namespace ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
       );
     } else if (Cypress.env('KONFLUX_COO_BUNDLE_IMAGE')) {
       cy.log('KONFLUX_COO_BUNDLE_IMAGE is set. COO operator will be installed from Konflux bundle.');
@@ -204,7 +204,7 @@ const operatorUtils = {
         `oc create namespace ${MCP.namespace} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
       );
       cy.exec(
-        `oc label namespaces ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
+        `oc label namespace ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
       );
       cy.exec(
         `operator-sdk run bundle --timeout=10m --namespace ${MCP.namespace} ${Cypress.env('KONFLUX_COO_BUNDLE_IMAGE')} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')} --verbose `,
@@ -220,7 +220,7 @@ const operatorUtils = {
         `oc create namespace ${MCP.namespace} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
       );
       cy.exec(
-        `oc label namespaces ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
+        `oc label namespace ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
       );
       cy.exec(
         `operator-sdk run bundle --timeout=10m --namespace ${MCP.namespace} ${Cypress.env('CUSTOM_COO_BUNDLE_IMAGE')} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')} --verbose `,
@@ -308,7 +308,7 @@ const operatorUtils = {
     cy.exec(`oc new-project perses-dev --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
 
     cy.log('Create openshift-cluster-sample-dashboard instance.');
-    cy.exec(`oc apply -f ./cypress/fixtures/coo/openshift-cluster-sample-dashboard.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+    cy.exec(`sed 's/namespace: openshift-cluster-observability-operator/namespace: ${MCP.namespace}/g' ./cypress/fixtures/coo/openshift-cluster-sample-dashboard.yaml | oc apply -f - --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
 
     cy.log('Create perses-dashboard-sample instance.');
     cy.exec(`oc apply -f ./cypress/fixtures/coo/perses-dashboard-sample.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
@@ -323,7 +323,7 @@ const operatorUtils = {
     cy.exec(`oc apply -f ./cypress/fixtures/coo/thanos-querier-datasource.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
 
     cy.exec(
-      `oc label namespaces ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
+      `oc label namespace ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
     );
 
     cy.log('Create Monitoring UI Plugin instance.');
@@ -351,7 +351,7 @@ const operatorUtils = {
     });
 
     cy.exec(
-      `sleep 15 && oc wait --for=jsonpath='{.metadata.name}'=health-analyzer --timeout=60s servicemonitor/health-analyzer --namespace=openshift-cluster-observability-operator -n ${MCP.namespace} --timeout=60s --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
+      `sleep 15 && oc wait --for=jsonpath='{.metadata.name}'=health-analyzer --timeout=60s servicemonitor/health-analyzer -n ${MCP.namespace} --timeout=60s --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
       {
         timeout: readyTimeoutMilliseconds,
         failOnNonZeroExit: true
@@ -416,35 +416,34 @@ const operatorUtils = {
 
     cy.log('Delete Monitoring UI Plugin instance.');
     cy.executeAndDelete(
-      `oc delete ${config.kind} ${config.name} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
+      `oc delete ${config.kind} ${config.name} --ignore-not-found --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
     );
   
-    // Common cleanup steps
     cy.log('Remove openshift-cluster-sample-dashboard instance.');
-    cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/openshift-cluster-sample-dashboard.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+    cy.executeAndDelete(`sed 's/namespace: openshift-cluster-observability-operator/namespace: ${MCP.namespace}/g' ./cypress/fixtures/coo/openshift-cluster-sample-dashboard.yaml | oc delete -f - --ignore-not-found --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
 
     cy.log('Remove perses-dashboard-sample instance.');
-    cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/perses-dashboard-sample.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+    cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/perses-dashboard-sample.yaml --ignore-not-found --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
 
     cy.log('Remove prometheus-overview-variables instance.');
-    cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/prometheus-overview-variables.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+    cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/prometheus-overview-variables.yaml --ignore-not-found --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
 
     cy.log('Remove thanos-compact-overview-1var instance.');
-    cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/thanos-compact-overview-1var.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+    cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/thanos-compact-overview-1var.yaml --ignore-not-found --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
 
     cy.log('Remove Thanos Querier instance.');
-    cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/thanos-querier-datasource.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+    cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/thanos-querier-datasource.yaml --ignore-not-found --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
 
     cy.log('Remove perses-dev namespace');
-    cy.executeAndDelete(`oc delete namespace perses-dev --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+    cy.executeAndDelete(`oc delete namespace perses-dev --ignore-not-found --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
 
     // Additional cleanup only when COO is installed
     if (!Cypress.env('SKIP_COO_INSTALL')) {
       cy.log('Remove Cluster Observability Operator namespace');
       
       // First check if the namespace exists
       cy.exec(
-        `oc get namespace openshift-cluster-observability-operator --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
+        `oc get namespace ${MCP.namespace} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
         {
           timeout: readyTimeoutMilliseconds,
           failOnNonZeroExit: false
@@ -454,7 +453,7 @@ const operatorUtils = {
           // Namespace exists, proceed with deletion
           cy.log('Namespace exists, proceeding with deletion');
           cy.exec(
-            `oc delete namespace openshift-cluster-observability-operator --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
+            `oc delete namespace ${MCP.namespace} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
             {
               timeout: readyTimeoutMilliseconds,
               failOnNonZeroExit: false
@@ -467,7 +466,7 @@ const operatorUtils = {
               cy.log(`Attempting force delete...`);
               
               cy.exec(
-                `./cypress/fixtures/coo/force_delete_ns.sh openshift-cluster-observability-operator --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
+                `./cypress/fixtures/coo/force_delete_ns.sh ${MCP.namespace} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
                 { 
                   failOnNonZeroExit: false, 
                   timeout: readyTimeoutMilliseconds 
diff --git a/web/cypress/support/commands/virtualization-commands.ts b/web/cypress/support/commands/virtualization-commands.ts
diff --git a/web/cypress/support/incidents_prometheus_query_mocks/mock-generators.ts b/web/cypress/support/incidents_prometheus_query_mocks/mock-generators.ts
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
