From 97f77d7999ce1aa9be6318d4ba55cfb135fc779f Mon Sep 17 00:00:00 2001
From: Steve Hawkins <shawkins@redhat.com>
Date: Thu, 9 Apr 2026 08:17:20 -0400
Subject: [PATCH] fix: remove extra dependencies from the operator

closes: #47872

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
---
 .../operator/testsuite/integration/BaseOperatorTest.java | 3 ++-
 .../testsuite/integration/KeycloakDeploymentTest.java    | 9 +++++++++
 .../integration/KeycloakNewServiceClientTest.java        | 3 +--
 rest/admin-v2/api/pom.xml                                | 2 ++
 rest/admin-v2/rest/pom.xml                               | 2 ++
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java
index 0b9289c79a59..4e2ad0664d68 100644
--- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java
+++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java
@@ -117,6 +117,7 @@ public class BaseOperatorTest implements QuarkusTestAfterEachCallback {
   public static final String OPERATOR_KUBERNETES_IP = "test.operator.kubernetes.ip";
   public static final String OPERATOR_CUSTOM_IMAGE = "test.operator.custom.image";
   public static final String POSTGRESQL_NAME = "postgresql-db";
+  public static final String KEYCLOAK_OPERATOR = "keycloak-operator";
 
   public static final String TEST_RESULTS_DIR = "target/operator-test-results/";
   public static final String POD_LOGS_DIR = TEST_RESULTS_DIR + "pod-logs/";
@@ -401,7 +402,7 @@ public void afterEach(QuarkusTestMethodContext context) {
           logKeycloaks();
           logKeycloakRealmImports();
           if (operatorDeployment == OperatorDeployment.remote) {
-              log(k8sclient.apps().deployments().withName("keycloak-operator"), Deployment::getStatus, false);
+              log(k8sclient.apps().deployments().withName(KEYCLOAK_OPERATOR), Deployment::getStatus, false);
           }
           if (operatorDeployment != OperatorDeployment.local_apiserver) {
               logFailed(k8sclient.apps().statefulSets().withName(POSTGRESQL_NAME), StatefulSet::getStatus);
diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakDeploymentTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakDeploymentTest.java
index 1cb8856c0515..f0186a07d73e 100644
--- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakDeploymentTest.java
+++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakDeploymentTest.java
@@ -79,6 +79,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @DisabledIfApiServerTest
@@ -114,6 +115,14 @@ public void testBasicKeycloakDeploymentAndDeletion() {
         k8sclient.resource(kc).delete();
         Awaitility.await()
                 .untilAsserted(() -> assertThat(k8sclient.apps().statefulSets().inNamespace(namespace).withName(deploymentName).get()).isNull());
+
+        // check that the operator is not attempting to use telemetry
+        if (operatorDeployment == OperatorDeployment.remote) {
+            String log = k8sclient.apps().deployments().withName(BaseOperatorTest.KEYCLOAK_OPERATOR).getLog();
+            if (log != null) {
+                assertFalse(log.contains("opentelemetry"), "Should not mention opentelemetry " + log);
+            }
+        }
     }
 
     /**
diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakNewServiceClientTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakNewServiceClientTest.java
index f2e4259ac1f7..5f4fbfe495e8 100644
--- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakNewServiceClientTest.java
+++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakNewServiceClientTest.java
@@ -2,7 +2,6 @@
 
 import org.keycloak.operator.crds.v2beta1.deployment.Keycloak;
 import org.keycloak.operator.crds.v2beta1.deployment.ValueOrSecret;
-import org.keycloak.utils.StringUtil;
 
 import io.quarkus.test.junit.QuarkusTest;
 import org.junit.jupiter.api.Tag;
@@ -26,7 +25,7 @@ protected Keycloak getTestDeployment(boolean disableProbes) {
 
         if (existingJavaOptsAppend != null) {
             String existingValue = existingJavaOptsAppend.getValue();
-            if (StringUtil.isNotBlank(existingValue)) {
+            if (existingValue != null && !existingValue.isBlank()) {
                 existingJavaOptsAppend.setValue(existingValue + " " + newClientServiceProperty);
             } else {
                 existingJavaOptsAppend.setValue(newClientServiceProperty);
diff --git a/rest/admin-v2/api/pom.xml b/rest/admin-v2/api/pom.xml
index 6384d6cda210..9e7420e52484 100644
--- a/rest/admin-v2/api/pom.xml
+++ b/rest/admin-v2/api/pom.xml
@@ -28,10 +28,12 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-server-spi</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-server-spi-private</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
diff --git a/rest/admin-v2/rest/pom.xml b/rest/admin-v2/rest/pom.xml
index 99bfbf0232b2..d9c69a3bd028 100644
--- a/rest/admin-v2/rest/pom.xml
+++ b/rest/admin-v2/rest/pom.xml
@@ -33,6 +33,7 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-server-spi</artifactId>
+             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
@@ -41,6 +42,7 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-services</artifactId>
+             <scope>provided</scope>
         </dependency>
         <!-- used by OAS Filter during OpenAPI spec generation -->
         <dependency>