From b42f6fd49fa8b598aad13b2ab29b3a03e6a11df1 Mon Sep 17 00:00:00 2001
From: Michael Edgar <medgar@redhat.com>
Date: Tue, 1 Oct 2024 15:06:10 -0400
Subject: [PATCH] Bump quarkus.platform.version from 3.8.6 to 3.15.1 (#1082)

* Bump quarkus.platform.version from 3.8.6 to 3.15.1

Signed-off-by: Michael Edgar <medgar@redhat.com>

* Capture operator logs on playwright test failure

Signed-off-by: Michael Edgar <medgar@redhat.com>

* Manage QOSDK at version 6.8.1

Signed-off-by: Michael Edgar <medgar@redhat.com>

---------

Signed-off-by: Michael Edgar <medgar@redhat.com>
---
 .github/workflows/playwright-tests.yml |  1 +
 pom.xml                                | 21 ++++++++++-----------
 ui/.gitignore                          |  1 +
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/playwright-tests.yml b/.github/workflows/playwright-tests.yml
index 52100afe6..b9301df7c 100644
--- a/.github/workflows/playwright-tests.yml
+++ b/.github/workflows/playwright-tests.yml
@@ -248,6 +248,7 @@ jobs:
           mkdir ./resources
           kubectl get all,catalogsources,operatorgroups -n olm -o yaml > ./resources/olm.yaml
           kubectl get all,subscriptions,csv,operatorgroups,installplans -n operators -o yaml > ./resources/operators.yaml
+          kubectl logs -n operators -l app.kubernetes.io/name=console-operator --all-containers=true --tail -1 > ./resources/console-operator-logs.txt
           kubectl get all -n $TARGET_NAMESPACE -o yaml > ./resources/$TARGET_NAMESPACE.yaml
           kubectl logs -n ${TARGET_NAMESPACE} -l app.kubernetes.io/instance=example-console-deployment --all-containers=true > ./resources/$TARGET_NAMESPACE-console-logs.txt
 
diff --git a/pom.xml b/pom.xml
index 69f2e3a43..e169a09ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
         <!-- Dependencies -->
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>3.8.6</quarkus.platform.version>
+        <quarkus.platform.version>3.15.1</quarkus.platform.version>
         <strimzi-api.version>0.43.0</strimzi-api.version>
         <strimzi-oauth.version>0.15.0</strimzi-oauth.version>
 
@@ -74,14 +74,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- fabric8 to align with version used by JOSDK -->
-            <dependency>
-                <groupId>io.fabric8</groupId>
-                <artifactId>kubernetes-client-bom</artifactId>
-                <version>6.11.0</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <!-- Manage nimbus-jose-jwt for CVE-2023-52428 -->
             <dependency>
                 <groupId>com.nimbusds</groupId>
@@ -116,9 +108,16 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>${quarkus.platform.group-id}</groupId>
+                <!--
+                    When bumping quarkus-platform next, check that QOSDK
+                    6.8.1 or above and change back to using properties:
+
+                      groupId = ${quarkus.platform.group-id}
+                      version = ${quarkus.platform.version}
+                -->
+                <groupId>io.quarkiverse.operatorsdk</groupId>
                 <artifactId>quarkus-operator-sdk-bom</artifactId>
-                <version>${quarkus.platform.version}</version>
+                <version>6.8.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/ui/.gitignore b/ui/.gitignore
index ced597da1..7605c937d 100644
--- a/ui/.gitignore
+++ b/ui/.gitignore
@@ -44,3 +44,4 @@ yarn.lock
 
 tests/playwright/.auth/*.json
 /test-results/
+/.pino-prettyrc