Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit fe995a0

Browse files
committedSep 20, 2024
improve: replace jenvtest with kube-api-test from fabric8 client (#2497)
Signed-off-by: Attila Mészáros <[email protected]>
1 parent ee7fbee commit fe995a0

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed
 

Diff for: ‎operator-framework/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@
8585
<scope>test</scope>
8686
</dependency>
8787
<dependency>
88-
<groupId>io.javaoperatorsdk</groupId>
89-
<artifactId>jenvtest</artifactId>
88+
<groupId>io.fabric8</groupId>
89+
<artifactId>kube-api-test-client-inject</artifactId>
9090
<scope>test</scope>
9191
</dependency>
9292
</dependencies>

Diff for: ‎operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
import java.time.Duration;
44

55
import org.junit.jupiter.api.*;
6-
import org.slf4j.Logger;
7-
import org.slf4j.LoggerFactory;
86

7+
import io.fabric8.kubeapitest.junit.EnableKubeAPIServer;
98
import io.fabric8.kubernetes.api.model.ConfigMap;
109
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
1110
import io.fabric8.kubernetes.api.model.Namespace;
@@ -18,7 +17,6 @@
1817
import io.fabric8.kubernetes.client.KubernetesClient;
1918
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
2019
import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil;
21-
import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
2220
import io.javaoperatorsdk.operator.Operator;
2321
import io.javaoperatorsdk.operator.OperatorException;
2422
import io.javaoperatorsdk.operator.ReconcilerUtils;
@@ -49,8 +47,6 @@
4947
@EnableKubeAPIServer(apiServerFlags = {"--min-request-timeout", "1"}, updateKubeConfigFile = true)
5048
class InformerRelatedBehaviorITS {
5149

52-
private static final Logger log = LoggerFactory.getLogger(InformerRelatedBehaviorITS.class);
53-
5450
public static final String TEST_RESOURCE_NAME = "test1";
5551
public static final String ADDITIONAL_NAMESPACE_SUFFIX = "-additional";
5652

Diff for: ‎pom.xml

+3-5
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
<micrometer-core.version>1.13.3</micrometer-core.version>
7676
<okhttp.version>4.12.0</okhttp.version>
7777
<caffeine.version>3.1.8</caffeine.version>
78-
<jenvtest.version>0.9.6</jenvtest.version>
7978
<mustache.version>0.9.11</mustache.version>
8079
<commons.io.version>2.16.1</commons.io.version>
8180

@@ -216,10 +215,9 @@
216215
<version>${caffeine.version}</version>
217216
</dependency>
218217
<dependency>
219-
<groupId>io.javaoperatorsdk</groupId>
220-
<artifactId>jenvtest</artifactId>
221-
<version>${jenvtest.version}</version>
222-
<scope>test</scope>
218+
<groupId>io.fabric8</groupId>
219+
<artifactId>kube-api-test-client-inject</artifactId>
220+
<version>${fabric8-client.version}</version>
223221
</dependency>
224222
<!-- Kubernetes client HTTP client implementations -->
225223
<!-- Default implementation is controlled by fabric8-httpclient-impl.name property -->

0 commit comments

Comments
 (0)
Please sign in to comment.