improve: replace jenvtest with kube-api-test from fabric8 client (#2497)

Signed-off-by: Attila Mészáros <[email protected]>
operator-framework · Aug 15, 2024 · e364774 · e364774
1 parent e26c81e
commit e364774
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml
@@ -85,8 +85,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>io.javaoperatorsdk</groupId>
-      <artifactId>jenvtest</artifactId>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kube-api-test-client-inject</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...avaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java b/...avaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java
@@ -3,9 +3,8 @@
 import java.time.Duration;
 
 import org.junit.jupiter.api.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import io.fabric8.kubeapitest.junit.EnableKubeAPIServer;
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.fabric8.kubernetes.api.model.Namespace;
@@ -18,7 +17,6 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil;
-import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.OperatorException;
 import io.javaoperatorsdk.operator.ReconcilerUtils;
@@ -49,8 +47,6 @@
 @EnableKubeAPIServer(apiServerFlags = {"--min-request-timeout", "1"}, updateKubeConfigFile = true)
 class InformerRelatedBehaviorITS {
 
-  private static final Logger log = LoggerFactory.getLogger(InformerRelatedBehaviorITS.class);
-
   public static final String TEST_RESOURCE_NAME = "test1";
   public static final String ADDITIONAL_NAMESPACE_SUFFIX = "-additional";
 

diff --git a/pom.xml b/pom.xml
@@ -74,7 +74,6 @@
     <micrometer-core.version>1.13.3</micrometer-core.version>
     <okhttp.version>4.12.0</okhttp.version>
     <caffeine.version>3.1.8</caffeine.version>
-    <jenvtest.version>0.9.6</jenvtest.version>
     <mustache.version>0.9.11</mustache.version>
     <commons.io.version>2.16.1</commons.io.version>
 
@@ -215,10 +214,9 @@
         <version>${caffeine.version}</version>
       </dependency>
       <dependency>
-        <groupId>io.javaoperatorsdk</groupId>
-        <artifactId>jenvtest</artifactId>
-        <version>${jenvtest.version}</version>
-        <scope>test</scope>
+        <groupId>io.fabric8</groupId>
+        <artifactId>kube-api-test-client-inject</artifactId>
+        <version>${fabric8-client.version}</version>
       </dependency>
       <!-- Kubernetes client HTTP client implementations -->
       <!-- Default implementation is controlled by fabric8-httpclient-impl.name property -->