[WIP] [Test Automation] Automate E2E scenario with use of Operator for installation

.ibm/images/Dockerfile

@@ -56,5 +56,19 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
     apt-get install google-cloud-cli google-cloud-sdk-gke-gcloud-auth-plugin -y && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Set working directory
+# Install skopeo
+RUN apt-get update -y && \
+    apt-get install -y skopeo
+
+# Install umoci
+RUN curl -LO "https://github.com/opencontainers/umoci/releases/download/v0.4.7/umoci.amd64" && \ 
+    chmod +x umoci.amd64 && \
+    mv umoci.amd64 /usr/local/bin/umoci
+
+# Install opm
+RUN curl -LO "https://github.com/operator-framework/operator-registry/releases/download/v1.23.0/linux-amd64-opm" && \ 
+    chmod +x linux-amd64-opm && \
+    mv linux-amd64-opm /usr/local/bin/opm
+
+# Set working directory    
 WORKDIR /tmp/

.ibm/pipelines/auth/secrets-rhdh-secrets.yaml

@@ -32,4 +32,5 @@ data:
   DH_TARGET_URL: aHR0cDovL3Rlc3QtYmFja3N0YWdlLWN1c3RvbWl6YXRpb24tcHJvdmlkZXItc2hvd2Nhc2UtY2kucmhkaC1wci1vcy1hOTgwNTY1MDgzMGIyMmMzYWVlMjQzZTUxZDc5NTY1ZC0wMDAwLnVzLWVhc3QuY29udGFpbmVycy5hcHBkb21haW4uY2xvdWQ=
   GOOGLE_CLIENT_ID: dGVtcA==
   GOOGLE_CLIENT_SECRET: dGVtcA==
+  BASE_URL: dGVtcA==
 type: Opaque

.ibm/pipelines/env_variables.sh

@@ -23,6 +23,7 @@ NAME_SPACE_RBAC="${NAME_SPACE_RBAC:-showcase-rbac}"
 NAME_SPACE_RUNTIME="${NAME_SPACE_RUNTIME:-showcase-runtime}"
 NAME_SPACE_POSTGRES_DB="${NAME_SPACE_POSTGRES_DB:-postgress-external-db}"
 NAME_SPACE_RDS="showcase-rds-nightly"
+OPERATOR_MANAGER='rhdh-operator'
 CHART_VERSION="2.15.2"
 GITHUB_APP_APP_ID=$(cat /tmp/secrets/GITHUB_APP_APP_ID)
 GITHUB_APP_CLIENT_ID=$(cat /tmp/secrets/GITHUB_APP_CLIENT_ID)
@@ -52,7 +53,6 @@ GH_USER2_ID=$(cat /tmp/secrets/GH_USER2_ID)
 GH_USER2_PASS=$(cat /tmp/secrets/GH_USER2_PASS)
 GH_USER2_2FA_SECRET=$(cat /tmp/secrets/GH_USER2_2FA_SECRET)
 GH_RHDH_QE_USER_TOKEN=$(cat /tmp/secrets/GH_RHDH_QE_USER_TOKEN)
-
 GITLAB_TOKEN=$(cat /tmp/secrets/GITLAB_TOKEN)
 
 RHDH_PR_OS_CLUSTER_URL=$(cat /tmp/secrets/RHDH_PR_OS_CLUSTER_URL)

.ibm/pipelines/openshift-ci-tests.sh

@@ -182,6 +182,14 @@ configure_external_postgres_db() {
 apply_yaml_files() {
   local dir=$1
   local project=$2
+  local release_name=$3
+  local base_url="https://${release_name}-backstage-${project}.${K8S_CLUSTER_ROUTER_BASE}"
+  if [[ "$JOB_NAME" == *aks* ]]; then
+    base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
+  elif [[ "$JOB_NAME" == *operator* ]]; then
+    base_url="https://backstage-${release_name}-${project}.${K8S_CLUSTER_ROUTER_BASE}"
+  fi
+  local encoded_base_url="$(echo -n $base_url | base64 -w 0)"
   echo "Applying YAML files to namespace ${project}"
 
   oc config set-context --current --namespace="${project}"
@@ -230,6 +238,7 @@ apply_yaml_files() {
   if [[ "$JOB_NAME" != *aks* ]]; then # Skip for AKS, because of strange `sed: -e expression #1, char 136: unterminated `s' command`
     sed -i "s/K8S_CLUSTER_API_SERVER_URL:.*/K8S_CLUSTER_API_SERVER_URL: ${ENCODED_API_SERVER_URL}/g" "$dir/auth/secrets-rhdh-secrets.yaml"
   fi
+  sed -i "s/BASE_URL:.*/BASE_URL: ${encoded_base_url}/g" "$dir/auth/secrets-rhdh-secrets.yaml"
   sed -i "s/K8S_CLUSTER_NAME:.*/K8S_CLUSTER_NAME: ${ENCODED_CLUSTER_NAME}/g" "$dir/auth/secrets-rhdh-secrets.yaml"
 
   set +x
@@ -306,6 +315,8 @@ check_backstage_running() {
   local namespace=$2
   if [[ "$JOB_NAME" == *aks* || "$JOB_NAME" == *gke*  ]]; then
     local url="https://${K8S_CLUSTER_ROUTER_BASE}"
+  elif [[ "$JOB_NAME" == *operator* ]]; then
+    local url="https://backstage-${release_name}-${namespace}.${K8S_CLUSTER_ROUTER_BASE}"
   else
     local url="https://${release_name}-backstage-${namespace}.${K8S_CLUSTER_ROUTER_BASE}"
   fi
@@ -359,6 +370,34 @@ install_pipelines_operator() {
   fi
 }
 
+install_rhdh_operator() {
+  local dir=$1
+  local namespace=$2
+
+  configure_namespace $namespace
+
+  # Make sure script is up to date
+  rm -f /tmp/install-rhdh-catalog-source.sh
+  curl -L https://raw.githubusercontent.com/redhat-developer/rhdh-operator/refs/heads/main/.rhdh/scripts/install-rhdh-catalog-source.sh > /tmp/install-rhdh-catalog-source.sh
+  chmod +x /tmp/install-rhdh-catalog-source.sh
+  bash -x /tmp/install-rhdh-catalog-source.sh --next --install-operator rhdh
+}
+
+deploy_rhdh_operator() {
+  local dir=$1
+  local namespace=$2
+
+  if [[ "${namespace}" == "showcase-op-rbac-nightly" ]]; then
+    oc apply -f "${dir}/resources/rhdh-operator/deployment/dynamic-plugins-root.yaml" -n "${namespace}"
+    oc apply -f "${dir}/resources/rhdh-operator/deployment/rhdh-start-rbac.yaml" -n "${namespace}"
+    # oc apply -f "${dir}/resources/rhdh-operator/patch/rhdh-patch-rbac.yaml" -n "${namespace}"
+  else 
+    oc apply -f "${dir}/resources/rhdh-operator/deployment/dynamic-plugins-root.yaml" -n "${namespace}"
+    oc apply -f "${dir}/resources/rhdh-operator/deployment/rhdh-start.yaml" -n "${namespace}"
+    # oc apply -f "${dir}/resources/rhdh-operator/patch/rhdh-patch.yaml" -n "${namespace}"
+  fi
+}
+
 initiate_deployments() {
 
   #install_pipelines_operator
@@ -373,7 +412,7 @@ initiate_deployments() {
   oc apply -f "$DIR/resources/redis-cache/redis-deployment.yaml" --namespace="${NAME_SPACE}"
 
   cd "${DIR}"
-  apply_yaml_files "${DIR}" "${NAME_SPACE}"
+  apply_yaml_files "${DIR}" "${NAME_SPACE}" "${RELEASE_NAME}"
   echo "Deploying image from repository: ${QUAY_REPO}, TAG_NAME: ${TAG_NAME}, in NAME_SPACE: ${NAME_SPACE}"
   helm upgrade -i "${RELEASE_NAME}" -n "${NAME_SPACE}" "${HELM_REPO_NAME}/${HELM_IMAGE_NAME}" --version "${CHART_VERSION}" -f "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" --set global.clusterRouterBase="${K8S_CLUSTER_ROUTER_BASE}" --set upstream.backstage.image.repository="${QUAY_REPO}" --set upstream.backstage.image.tag="${TAG_NAME}"
 
@@ -382,7 +421,7 @@ initiate_deployments() {
   configure_external_postgres_db "${NAME_SPACE_RBAC}"
 
   uninstall_helmchart "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"
-  apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}"
+  apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"
   echo "Deploying image from repository: ${QUAY_REPO}, TAG_NAME: ${TAG_NAME}, in NAME_SPACE: ${RELEASE_NAME_RBAC}"
   helm upgrade -i "${RELEASE_NAME_RBAC}" -n "${NAME_SPACE_RBAC}" "${HELM_REPO_NAME}/${HELM_IMAGE_NAME}" --version "${CHART_VERSION}" -f "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" --set global.clusterRouterBase="${K8S_CLUSTER_ROUTER_BASE}" --set upstream.backstage.image.repository="${QUAY_REPO}" --set upstream.backstage.image.tag="${TAG_NAME}"
 }
@@ -401,6 +440,24 @@ initiate_rds_deployment() {
   helm upgrade -i "${release_name}" -n "${namespace}" "${HELM_REPO_NAME}/${HELM_IMAGE_NAME}" --version "${CHART_VERSION}" -f "$DIR/resources/postgres-db/values-showcase-postgres.yaml" --set global.clusterRouterBase="${K8S_CLUSTER_ROUTER_BASE}" --set upstream.backstage.image.repository="${QUAY_REPO}" --set upstream.backstage.image.tag="${TAG_NAME}"
 }
 
+initiate_deployments_operator() {
+  configure_namespace "${OPERATOR_MANAGER}"
+  install_rhdh_operator "${DIR}" "${OPERATOR_MANAGER}"
+
+  configure_namespace "${NAME_SPACE}"
+  apply_yaml_files "${DIR}" "${NAME_SPACE}" "${RELEASE_NAME}"
+  create_dynamic_plugins_config "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins.yaml"
+  oc apply -f /tmp/configmap-dynamic-plugins.yaml -n "${NAME_SPACE}"
+  oc apply -f "$DIR/resources/redis-cache/redis-deployment.yaml" --namespace="${NAME_SPACE}"
+  deploy_rhdh_operator "${DIR}" "${NAME_SPACE}"
+
+  configure_namespace "${NAME_SPACE_RBAC}"
+  apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"
+  create_dynamic_plugins_config "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
+  oc apply -f /tmp/configmap-dynamic-plugins-rbac.yaml -n "${NAME_SPACE_RBAC}"
+  deploy_rhdh_operator "${DIR}" "${NAME_SPACE_RBAC}"
+}
+
 check_and_test() {
   local release_name=$1
   local namespace=$2
@@ -446,7 +503,11 @@ main() {
   echo "Log file: ${LOGFILE}"
   set_cluster_info
   source "${DIR}/env_variables.sh"
-
+  ############# REMOVE ONCE PR IS READY ############################
+  NAME_SPACE="showcase-operator-nightly"
+  NAME_SPACE_RBAC="showcase-op-rbac-nightly"
+  JOB_NAME=e2e-tests-operator-nightly
+  ##################################################################
   install_oc
   if [[ "$JOB_NAME" == *aks* ]]; then
     az_login
@@ -494,7 +555,11 @@ main() {
   elif [[ "$JOB_NAME" == *auth-providers* ]]; then
     run_tests "${AUTH_PROVIDERS_RELEASE}" "${AUTH_PROVIDERS_NAMESPACE}"
   else
-    initiate_deployments
+    if [[ "$JOB_NAME" == *operator* ]]; then
+      initiate_deployments_operator
+    else
+      initiate_deployments
+    fi
     check_and_test "${RELEASE_NAME}" "${NAME_SPACE}"
     check_and_test "${RELEASE_NAME_RBAC}" "${NAME_SPACE_RBAC}"
     # Only test TLS config with RDS and Change configuration at runtime in nightly jobs

.ibm/pipelines/resources/cluster_role_binding/cluster-role-binding-ocm.yaml

@@ -40,4 +40,10 @@ subjects:
   - kind: ServiceAccount
     name: rhdh-k8s-plugin
     namespace: showcase-pr-3
+  - kind: ServiceAccount
+    name: rhdh-k8s-plugin
+    namespace: showcase-operator-nightly
+  - kind: ServiceAccount
+    name: rhdh-k8s-plugin
+    namespace: showcase-op-rbac-nightly
 

.ibm/pipelines/resources/config_map/app-config-rhdh-rbac.yaml

@@ -1,6 +1,10 @@
 app:
+  baseUrl: ${BASE_URL}
   title: Red Hat Developer Hub
 backend:
+  baseUrl: ${BASE_URL}
+  cors:
+    origin: ${BASE_URL}
   auth:
     keys:
       - secret: temp

.ibm/pipelines/resources/config_map/app-config-rhdh.yaml

@@ -1,4 +1,5 @@
 app:
+  baseUrl: ${BASE_URL}
   title: Red Hat Developer Hub
   branding:
     fullLogo: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RSLzIwMDEvUkVDLVNWRy0yMDAxMDkwNC9EVEQvc3ZnMTAuZHRkIj4KPCEtLSBDcmVhdGVkIHVzaW5nIEtyaXRhOiBodHRwczovL2tyaXRhLm9yZyAtLT4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIAogICAgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiCiAgICB4bWxuczprcml0YT0iaHR0cDovL2tyaXRhLm9yZy9uYW1lc3BhY2VzL3N2Zy9rcml0YSIKICAgIHhtbG5zOnNvZGlwb2RpPSJodHRwOi8vc29kaXBvZGkuc291cmNlZm9yZ2UubmV0L0RURC9zb2RpcG9kaS0wLmR0ZCIKICAgIHdpZHRoPSIxNjBwdCIKICAgIGhlaWdodD0iODBwdCIKICAgIHZpZXdCb3g9IjAgMCAxNjAgODAiPgo8ZGVmcy8+Cjx0ZXh0IGlkPSJzaGFwZTAiIGtyaXRhOnVzZVJpY2hUZXh0PSJ0cnVlIiB0ZXh0LXJlbmRlcmluZz0iYXV0byIga3JpdGE6dGV4dFZlcnNpb249IjMiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0wLjE3NzMyMDYxNTAzNDE1NSwgNTQuMjYyNSkiIGZpbGw9IiNmZmZmZmYiIHN0cm9rZS1vcGFjaXR5PSIwIiBzdHJva2U9IiMwMDAwMDAiIHN0cm9rZS13aWR0aD0iMCIgc3Ryb2tlLWxpbmVjYXA9InNxdWFyZSIgc3Ryb2tlLWxpbmVqb2luPSJiZXZlbCIgbGV0dGVyLXNwYWNpbmc9IjAiIHdvcmQtc3BhY2luZz0iMCIgc3R5bGU9InRleHQtYWxpZ246IHN0YXJ0O3RleHQtYWxpZ24tbGFzdDogYXV0bztmb250LWZhbWlseTogUmVkIEhhdCBEaXNwbGF5O2ZvbnQtc2l6ZTogNDA7Zm9udC13ZWlnaHQ6IDcwMDsiPjx0c3BhbiB4PSIwIj5RRTwvdHNwYW4+PC90ZXh0Pjx0ZXh0IGlkPSJzaGFwZTEiIGtyaXRhOnVzZVJpY2hUZXh0PSJ0cnVlIiB0ZXh0LXJlbmRlcmluZz0iYXV0byIga3JpdGE6dGV4dFZlcnNpb249IjMiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDU3LjU2NDgyMDYxNTAzNDIsIDM1LjcyOTY4NzUpIiBmaWxsPSIjZmZmZmZmIiBzdHJva2Utb3BhY2l0eT0iMCIgc3Ryb2tlPSIjMDAwMDAwIiBzdHJva2Utd2lkdGg9IjAiIHN0cm9rZS1saW5lY2FwPSJzcXVhcmUiIHN0cm9rZS1saW5lam9pbj0iYmV2ZWwiIGxldHRlci1zcGFjaW5nPSIwIiB3b3JkLXNwYWNpbmc9IjAiIHN0eWxlPSJ0ZXh0LWFsaWduOiBzdGFydDt0ZXh0LWFsaWduLWxhc3Q6IGF1dG87Zm9udC1mYW1pbHk6IFJlZCBIYXQgVGV4dDtmb250LXNpemU6IDE0O2ZvbnQtd2VpZ2h0OiA3MDA7Ij48dHNwYW4geD0iMCI+UmVkIEhhdDwvdHNwYW4+PHRzcGFuIHg9IjAiIGR5PSIxOC41MTU2MjUiPkRldmVsb3BlciBIdWI8L3RzcGFuPjwvdGV4dD4KPC9zdmc+Cg=="
@@ -53,6 +54,9 @@ dynamicPlugins:
         title: Dark Dynamic
         variant: dark
 backend:
+  baseUrl: ${BASE_URL}
+  cors:
+    origin: ${BASE_URL}
   auth:
     keys:
       - secret: temp

.ibm/pipelines/resources/rhdh-operator/deployment/dynamic-plugins-root.yaml

@@ -0,0 +1,10 @@
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: dynamic-plugins-root
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi

.ibm/pipelines/resources/rhdh-operator/deployment/rhdh-start-rbac.yaml

@@ -0,0 +1,21 @@
+kind: Backstage
+apiVersion: rhdh.redhat.com/v1alpha2
+metadata: 
+  name: rhdh-rbac
+spec:
+  application:
+    image: 'quay.io/rhdh/rhdh-hub-rhel9:next' 
+    appConfig:
+      configMaps:
+        - name: app-config-rhdh
+      mountPath: /opt/app-root/src
+    dynamicPluginsConfigMapName: dynamic-plugins
+    extraEnvs:
+      secrets:
+        - name: rhdh-secrets
+    extraFiles:
+      configMaps:
+        - name: rbac-policy
+      mountPath: /opt/app-root/src/rbac
+
+

.ibm/pipelines/resources/rhdh-operator/deployment/rhdh-start.yaml

@@ -0,0 +1,16 @@
+kind: Backstage
+apiVersion: rhdh.redhat.com/v1alpha2
+metadata: 
+  name: rhdh
+spec:
+  application:
+    image: 'quay.io/rhdh/rhdh-hub-rhel9:next'
+    appConfig:
+      configMaps:
+        - name: app-config-rhdh
+      mountPath: /opt/app-root/src
+    dynamicPluginsConfigMapName: dynamic-plugins
+    extraEnvs:
+      secrets:
+        - name: rhdh-secrets
+

.ibm/pipelines/resources/rhdh-operator/patch/rhdh-patch-rbac.yaml

@@ -0,0 +1,15 @@
+apiVersion: rhdh.redhat.com/v1alpha2
+kind: Backstage
+metadata:
+  name: rhdh-rbac
+spec:
+  deployment:
+    patch:
+      spec:
+        template:
+          spec:
+            volumes:
+              - $patch: replace
+                name: dynamic-plugins-root
+                persistentVolumeClaim:
+                  claimName: dynamic-plugins-root

.ibm/pipelines/resources/rhdh-operator/patch/rhdh-patch.yaml

@@ -0,0 +1,15 @@
+apiVersion: rhdh.redhat.com/v1alpha2
+kind: Backstage
+metadata:
+  name: rhdh
+spec:
+  deployment:
+    patch:
+      spec:
+        template:
+          spec:
+            volumes:
+              - $patch: replace
+                name: dynamic-plugins-root
+                persistentVolumeClaim:
+                  claimName: dynamic-plugins-root

.ibm/pipelines/utils.sh

@@ -196,6 +196,19 @@ yq_merge_value_files() {
   ' "${step_2_file}" "${step_1_file}" > "${final_file}"
 }
 
+# Uses the base YAML value file to create the dynamic plugins config map for the operator
+create_dynamic_plugins_config() {
+  local base_file=$1
+  local final_file=$2
+  echo "kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: dynamic-plugins
+data:
+  dynamic-plugins.yaml: |" >> ${final_file}
+  yq '.global.dynamic' ${base_file} | sed -e 's/^/    /' >> ${final_file}
+}
+
 # Waits for a Kubernetes/OpenShift deployment to become ready within a specified timeout period
 wait_for_deployment() {
     local namespace=$1

e2e-tests/package.json

@@ -18,6 +18,8 @@
     "showcase-rbac-k8s-ci-nightly": "playwright test --project=showcase-rbac-k8s",
     "showcase-rds-nightly": "playwright test --project=postgres-health-check",
     "showcase-runtime": "playwright test --project=showcase-runtime",
+    "showcase-operator-nightly": "playwright test --project=showcase-operator",
+    "showcase-op-rbac-nightly": "playwright test --project=showcase-operator-rbac",
     "lint:check": "eslint . --ext .js,.ts",
     "lint:fix": "eslint . --ext .js,.ts --fix",
     "postinstall": "playwright install",

e2e-tests/playwright.config.ts

@@ -55,6 +55,20 @@ export default defineConfig({
         "**/playwright/e2e/configuration-test/config-map.spec.ts",
       ],
     },
+    {
+      name: "showcase-operator",
+      use: {
+        ...devices["Desktop Chrome"],
+        viewport: { width: 1920, height: 1080 },
+      },
+      testIgnore: [
+        "**/playwright/e2e/plugins/rbac/**/*.spec.ts",
+        "**/playwright/e2e/plugins/analytics/analytics-disabled-rbac.spec.ts",
+        "**/playwright/e2e/verify-tls-config-with-external-postgres-db.spec.ts",
+        "**/playwright/e2e/authProviders/**/*.spec.ts",
+        "**/playwright/e2e/plugins/bulk-import.spec.ts",
+      ],
+    },
     {
       name: "showcase-rbac",
       ...useCommonDeviceAndViewportConfig,
@@ -65,6 +79,16 @@ export default defineConfig({
         "**/playwright/e2e/plugins/bulk-import.spec.ts",
       ],
     },
+    {
+      name: "showcase-operator-rbac",
+      ...useCommonDeviceAndViewportConfig,
+      testMatch: [
+        "**/playwright/e2e/plugins/rbac/**/*.spec.ts",
+        "**/playwright/e2e/plugins/analytics/analytics-disabled-rbac.spec.ts",
+        "**/playwright/e2e/verify-tls-config-with-external-postgres-db.spec.ts",
+        "**/playwright/e2e/plugins/bulk-import.spec.ts",
+      ],
+    },
     {
       name: "showcase-auth-providers",
       ...useCommonDeviceAndViewportConfig,

e2e-tests/playwright/e2e/audit-log/log-utils.ts

@@ -66,7 +66,7 @@ export class LogUtils {
 
   /**
    * Fetches the logs from pods that match the fixed pod selector and applies a grep filter.
-   * The pod selector is:
+   * The pod selector for showcase is:
    * - app.kubernetes.io/component=backstage
    * - app.kubernetes.io/instance=redhat-developer-hub
    * - app.kubernetes.io/name=developer-hub
@@ -75,8 +75,11 @@ export class LogUtils {
    * @returns A promise that resolves with the filtered logs
    */
   static async getPodLogsWithGrep(filter: string): Promise<string> {
-    const podSelector =
+    let podSelector =
       "app.kubernetes.io/component=backstage,app.kubernetes.io/instance=rhdh,app.kubernetes.io/name=backstage";
+    if (process.env.NAME_SPACE == "showcase-operator-nightly") {
+      podSelector = "rhdh.redhat.com/app=backstage-rhdh";
+    }
     const tailNumber = 30;
     const namespace = process.env.NAME_SPACE || "default";