reduced logging

Author: rostalan

workspaces/orchestrator/e2e-tests/tests/specs/orchestrator.tests.ts

@@ -122,10 +122,6 @@ test.describe("Orchestrator", () => {
     test.setTimeout(40 * 60 * 1000);
     await test.runOnce("orchestrator-setup", async () => {
       const project = rhdh.deploymentConfig.namespace;
-      // eslint-disable-next-line no-console -- version/PID logged once for CI diagnostics
-      console.log(
-        `[orchestrator-setup]   Node.js ${process.version}, PID ${process.pid}`,
-      );
       await rhdh.configure({ auth: "keycloak" });
       await deploySonataflow(project);
       process.env.SONATAFLOW_DATA_INDEX_URL =

workspaces/orchestrator/e2e-tests/tests/specs/test-helpers.ts

@@ -366,10 +366,6 @@ export async function deploySonataflow(namespace: string): Promise<void> {
     console.warn(
       `[deploy-sonataflow] WARNING: OS (${osMajorMinor}) and OSL (${oslMajorMinor}) major.minor versions differ — this may cause Knative API incompatibilities`,
     );
-  } else {
-    console.warn(
-      `[deploy-sonataflow] Operator versions: OS=${osFullVersion || "unknown"}, OSL=${oslFullVersion || "unknown"}`,
-    );
   }
 
   hardenSonataFlowPlatform(namespace);
@@ -682,28 +678,26 @@ function formatOcFailure(err: unknown): string {
 }
 
 /**
- * Best-effort diagnostics bundle for CI when `rhdh.deploy()` fails waiting for RHDH.
- * Keep this intentionally stderr-heavy: it should only run on failure paths.
+ * Best-effort snapshot when `rhdh.deploy()` fails (pods, hub describe/logs, recent events).
  */
 export function logOrchestratorDeployFailureDiagnostics(
   namespace: string,
 ): void {
   const banner = (title: string) => {
-    console.error(`\n===== [orchestrator-e2e diagnostics] ${title} =====\n`);
+    console.error(`\n===== [orchestrator-e2e deploy failure] ${title} =====\n`);
   };
 
   const safeOc = (args: string[], timeoutMs = 120_000): string | undefined => {
     try {
       return runOc(args, timeoutMs);
     } catch (err) {
       console.error(
-        `[orchestrator-e2e diagnostics] oc ${args.join(" ")} failed: ${formatOcFailure(err)}`,
+        `[orchestrator-e2e deploy failure] oc ${args.join(" ")} failed: ${formatOcFailure(err)}`,
       );
       return undefined;
     }
   };
 
-  /** Print `oc` stdout; empty string usually means “no matches” (message on stderr). */
   const dumpOc = (out: string | undefined, emptyHint: string) => {
     if (out === undefined) return;
     if (out.trim().length > 0) {
@@ -715,6 +709,11 @@ export function logOrchestratorDeployFailureDiagnostics(
 
   banner(`namespace=${namespace}`);
 
+  dumpOc(
+    safeOc(["get", "pods", "-n", namespace, "-o", "wide"], 60_000),
+    "(get pods — empty stdout)",
+  );
+
   const hubPod = safeOc([
     "get",
     "pods",
@@ -724,263 +723,37 @@ export function logOrchestratorDeployFailureDiagnostics(
     "app.kubernetes.io/instance=redhat-developer-hub",
     "-o",
     "jsonpath={.items[0].metadata.name}",
-  ]);
+  ])?.trim();
 
   if (hubPod) {
     banner(`redhat-developer-hub pod describe (${hubPod})`);
     dumpOc(
       safeOc(["describe", "pod", "-n", namespace, hubPod], 120_000),
       "(describe produced no stdout)",
     );
-
     banner(`redhat-developer-hub pod logs (${hubPod}) --all-containers`);
     dumpOc(
       safeOc(
-        ["logs", "-n", namespace, hubPod, "--all-containers", "--tail=400"],
-        180_000,
+        ["logs", "-n", namespace, hubPod, "--all-containers", "--tail=300"],
+        120_000,
       ),
-      "(no current container logs on stdout)",
-    );
-
-    banner(
-      `redhat-developer-hub previous pod logs (${hubPod}) --all-containers`,
+      "(no container logs on stdout)",
     );
-    try {
-      console.error(
-        runOc(
-          [
-            "logs",
-            "-n",
-            namespace,
-            hubPod,
-            "--all-containers",
-            "--previous",
-            "--tail=400",
-          ],
-          180_000,
-        ),
-      );
-    } catch (err) {
-      const msg = formatOcFailure(err);
-      if (/BadRequest|not found|no previous/i.test(msg)) {
-        console.error(
-          "(no previous pod/container logs — single revision or init never restarted)",
-        );
-      } else {
-        console.error(`previous logs unavailable: ${msg}`);
-      }
-    }
   } else {
     banner("redhat-developer-hub pod not found via label selector");
-    dumpOc(
-      safeOc(["get", "pods", "-n", namespace, "-o", "wide"], 120_000),
-      "(get pods — empty stdout)",
-    );
-  }
-
-  banner(
-    "SonataFlow / workflow / data-index pods (namespace-wide — label selectors vary by OSL version)",
-  );
-  dumpOc(
-    safeOc(["get", "pods", "-n", namespace, "-o", "wide"], 120_000),
-    "(no pods listed in namespace)",
-  );
-
-  banner(
-    "sonataflow workflow pods (label selectors — may be empty on some OSL builds)",
-  );
-  dumpOc(
-    safeOc(
-      [
-        "get",
-        "pods",
-        "-n",
-        namespace,
-        "-l",
-        "sonataflow.org/workflowName=failswitch",
-        "-o",
-        "wide",
-      ],
-      120_000,
-    ),
-    "(no pods with sonataflow.org/workflowName=failswitch — see namespace-wide list above)",
-  );
-  dumpOc(
-    safeOc(
-      [
-        "get",
-        "pods",
-        "-n",
-        namespace,
-        "-l",
-        "sonataflow.org/workflowName=greeting",
-        "-o",
-        "wide",
-      ],
-      120_000,
-    ),
-    "(no pods with sonataflow.org/workflowName=greeting — see namespace-wide list above)",
-  );
-
-  banner(
-    "SonataFlow CRs (oc get sonataflow … -o yaml — persistence vs operator reconcile)",
-  );
-  for (const workflow of WORKFLOWS) {
-    banner(`sonataflow/${workflow} (full YAML)`);
-    dumpOc(
-      safeOc(
-        ["get", "sonataflow", workflow, "-n", namespace, "-o", "yaml"],
-        120_000,
-      ),
-      `(get sonataflow/${workflow} returned empty stdout)`,
-    );
   }
 
-  banner(
-    "workflow Deployments (oc describe deployment … — secret/volume mounts on pod template)",
+  banner("recent namespace events (last 40 lines)");
+  const events = safeOc(
+    ["get", "events", "-n", namespace, "--sort-by=.lastTimestamp"],
+    60_000,
   );
-  for (const workflow of WORKFLOWS) {
-    banner(`deployment/${workflow} (describe)`);
-    dumpOc(
-      safeOc(["describe", "deployment", workflow, "-n", namespace], 120_000),
-      `(describe deployment/${workflow} returned empty stdout)`,
-    );
-  }
-
-  banner(
-    "Services + Endpoints (workflow — empty endpoints => DNS ok but no ready backends)",
-  );
-  dumpOc(
-    safeOc(
-      ["get", "svc", "failswitch", "greeting", "-n", namespace, "-o", "wide"],
-      60_000,
-    ),
-    "(get svc failswitch greeting — empty stdout)",
-  );
-  dumpOc(
-    safeOc(
-      [
-        "get",
-        "endpoints",
-        "failswitch",
-        "greeting",
-        "-n",
-        namespace,
-        "-o",
-        "wide",
-      ],
-      60_000,
-    ),
-    "(get endpoints — empty stdout)",
-  );
-  for (const svc of ["failswitch", "greeting"] as const) {
-    dumpOc(
-      safeOc(
-        [
-          "get",
-          "endpointslices.discovery.k8s.io",
-          "-n",
-          namespace,
-          "-l",
-          `kubernetes.io/service-name=${svc}`,
-          "-o",
-          "wide",
-        ],
-        60_000,
-      ),
-      `(no EndpointSlices for service ${svc} — empty stdout)`,
-    );
-  }
-
-  banner("NetworkPolicy (can block pod-to-pod traffic to workflow Services)");
-  dumpOc(
-    safeOc(["get", "networkpolicy", "-n", namespace, "-o", "wide"], 60_000),
-    "(no NetworkPolicies in namespace)",
-  );
-
-  banner(
-    "Postgres-related Secrets (existence only — compare to Deployment volume/env refs)",
-  );
-  banner("secret/backstage-psql-secret");
-  dumpOc(
-    safeOc(["get", "secret", "backstage-psql-secret", "-n", namespace], 30_000),
-    "(get secret backstage-psql-secret — empty stdout)",
-  );
-  banner(
-    "secret/sonataflow-psql-postgresql (upstream default; often absent in e2e)",
-  );
-  try {
-    dumpOc(
-      runOc(
-        ["get", "secret", "sonataflow-psql-postgresql", "-n", namespace],
-        30_000,
-      ),
-      "(secret absent — expected when workflows use backstage-psql-secret)",
-    );
-  } catch (err) {
-    const msg = formatOcFailure(err);
-    if (/NotFound/i.test(msg)) {
-      console.error(
-        "(not found — expected when workflows are patched to backstage-psql-secret)",
-      );
-    } else {
-      console.error(`unexpected error: ${msg}`);
-    }
-  }
-
-  banner(
-    "ReplicaSets in namespace (workflow — multiple RS generations / stale templates)",
-  );
-  dumpOc(
-    safeOc(["get", "rs", "-n", namespace, "-o", "wide"], 120_000),
-    "(get rs — empty stdout)",
-  );
-
-  banner(
-    "SonataFlow reconcile hints (generation / observedGeneration when present)",
-  );
-  for (const workflow of WORKFLOWS) {
-    banner(`sonataflow/${workflow} (generation line)`);
-    const gen = safeOc(
-      [
-        "get",
-        "sonataflow",
-        workflow,
-        "-n",
-        namespace,
-        "-o",
-        "jsonpath={.metadata.generation}",
-      ],
-      30_000,
-    );
-    if (gen !== undefined) {
-      console.error(`  metadata.generation=${gen.trim()}`);
-    }
-    const observed = safeOc(
-      [
-        "get",
-        "sonataflow",
-        workflow,
-        "-n",
-        namespace,
-        "-o",
-        "jsonpath={.status.observedGeneration}",
-      ],
-      30_000,
-    );
-    if (observed !== undefined && observed.trim() !== "") {
-      console.error(`  status.observedGeneration=${observed.trim()}`);
-    }
+  if (events?.trim()) {
+    const lines = events.trim().split("\n");
+    console.error(lines.slice(-40).join("\n"));
+  } else {
+    console.error("(no events or oc get events failed)");
   }
-
-  banner("recent namespace warnings/errors (last 200 events)");
-  dumpOc(
-    safeOc(
-      ["get", "events", "-n", namespace, "--sort-by=.lastTimestamp"],
-      120_000,
-    ),
-    "(get events — empty stdout)",
-  );
 }
 
 function detectOperatorVersion(...labels: string[]): string {