Merge branch 'main' into e2e-transitive-groups-ownership

Author: albarbaro

.ibm/pipelines/jobs/operator.sh

@@ -62,6 +62,23 @@ initiate_operator_deployments() {
   deploy_rhdh_operator "${DIR}" "${NAME_SPACE_RBAC}"
 }
 
+run_operator_runtime_config_change_tests() {
+  # Deploy `showcase-runtime` to run tests that require configuration changes at runtime
+  configure_namespace "${NAME_SPACE_RUNTIME}"
+  local runtime_url="https://backstage-${RELEASE_NAME}-${NAME_SPACE_RUNTIME}.${K8S_CLUSTER_ROUTER_BASE}"
+  sed -i "s|POSTGRES_USER:.*|POSTGRES_USER: $RDS_USER|g" "${DIR}/resources/postgres-db/postgres-cred.yaml"
+  sed -i "s|POSTGRES_PASSWORD:.*|POSTGRES_PASSWORD: $(echo -n $RDS_PASSWORD | base64 -w 0)|g" "${DIR}/resources/postgres-db/postgres-cred.yaml"
+  sed -i "s|POSTGRES_HOST:.*|POSTGRES_HOST: $(echo -n $RDS_1_HOST | base64 -w 0)|g" "${DIR}/resources/postgres-db/postgres-cred.yaml"
+  sed -i "s|RHDH_RUNTIME_URL:.*|RHDH_RUNTIME_URL: $(echo -n $runtime_url | base64 -w 0)|g" "${DIR}/resources/postgres-db/postgres-cred.yaml"
+  oc apply -f "$DIR/resources/postgres-db/postgres-crt-rds.yaml" -n "${NAME_SPACE_RUNTIME}"
+  oc apply -f "$DIR/resources/postgres-db/postgres-cred.yaml" -n "${NAME_SPACE_RUNTIME}"
+  oc apply -f "$DIR/resources/postgres-db/dynamic-plugins-root-PVC.yaml" -n "${NAME_SPACE_RUNTIME}"
+  create_app_config_map "$DIR/resources/postgres-db/rds-app-config.yaml" "${NAME_SPACE_RUNTIME}"
+  local runtime_url="https://backstage-${RELEASE_NAME}-${NAME_SPACE_RUNTIME}.${K8S_CLUSTER_ROUTER_BASE}"
+  oc apply -f "$DIR/resources/rhdh-operator/rhdh-start-runtime.yaml" -n "${NAME_SPACE_RUNTIME}"
+  check_and_test "${RELEASE_NAME}" "${NAME_SPACE_RUNTIME}" "${runtime_url}"
+}
+
 handle_operator() {
   oc_login
 
@@ -73,4 +90,6 @@ handle_operator() {
   initiate_operator_deployments
   check_and_test "${RELEASE_NAME}" "${NAME_SPACE}" "${url}"
   check_and_test "${RELEASE_NAME_RBAC}" "${NAME_SPACE_RBAC}" "${rbac_url}"
+
+  run_operator_runtime_config_change_tests
 }

.ibm/pipelines/resources/postgres-db/postgres-cred.yaml

@@ -9,3 +9,4 @@ data:
   POSTGRES_HOST: dG1w
   PGSSLMODE: cmVxdWlyZQ==
   NODE_EXTRA_CA_CERTS: L29wdC9hcHAtcm9vdC9zcmMvcG9zdGdyZXMtY3J0LnBlbQ==
+  RHDH_RUNTIME_URL: dG1w

.ibm/pipelines/resources/postgres-db/rds-app-config.yaml

@@ -0,0 +1,24 @@
+app:
+  title: Red Hat Developer Hub
+  baseUrl: ${RHDH_RUNTIME_URL}
+backend:
+  auth:
+    externalAccess:
+    - type: legacy
+      options:
+        subject: legacy-default-config
+        secret: "secret"
+  baseUrl: ${RHDH_RUNTIME_URL}
+  cors:
+    origin: ${RHDH_RUNTIME_URL}
+  database:
+    connection:  # configure Backstage DB connection parameters
+      host: ${POSTGRES_HOST}
+      port: ${POSTGRES_PORT}
+      user: ${POSTGRES_USER}
+      password: ${POSTGRES_PASSWORD}
+auth:
+  environment: development
+  providers:
+    guest:
+      dangerouslyAllowOutsideDevelopment: true

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

@@ -4,7 +4,7 @@ metadata:
   name: rhdh-rbac
 spec:
   application:
-    image: 'quay.io/rhdh/rhdh-hub-rhel9:next' 
+    image: "quay.io/rhdh-community/rhdh:next"
     appConfig:
       configMaps:
         - name: app-config-rhdh

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

@@ -0,0 +1,23 @@
+kind: Backstage
+apiVersion: rhdh.redhat.com/v1alpha2
+metadata: 
+  name: rhdh
+spec:
+  application:
+    image: 'quay.io/rhdh-community/rhdh:next'
+    appConfig:
+      configMaps:
+        - name: app-config-rhdh
+      mountPath: /opt/app-root/src
+    extraFiles:
+      mountPath: /opt/app-root/src
+      secrets:
+        - name: postgres-crt
+          key: postgres-crt.pem
+    extraEnvs:
+      secrets:
+        - name: postgres-cred
+    route:
+      enabled: true
+  database:
+    enableLocalDb: false

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

@@ -4,7 +4,7 @@ metadata:
   name: rhdh
 spec:
   application:
-    image: 'quay.io/rhdh/rhdh-hub-rhel9:next'
+    image: 'quay.io/rhdh-community/rhdh:next'
     appConfig:
       configMaps:
         - name: app-config-rhdh

e2e-tests/playwright/e2e/verify-tls-config-health-check.spec.ts

@@ -5,7 +5,11 @@ import { KubeClient } from "../utils/kube-client";
 test.describe
   .serial("Verify TLS configuration with Postgres DB health check", () => {
   const namespace = process.env.NAME_SPACE_RUNTIME || "showcase-runtime";
-  const deploymentName = "rhdh-backstage";
+  const job: string = process.env.JOB_NAME;
+  let deploymentName = "rhdh-backstage";
+  if (job.includes("operator")) {
+    deploymentName = "backstage-rhdh";
+  }
   const secretName = "postgres-cred";
   const hostLatest2 = Buffer.from(process.env.RDS_2_HOST).toString("base64");
   const hostLatest3 = Buffer.from(process.env.RDS_3_HOST).toString("base64");