fix: close client (#93)

java-operator-sdk · Apr 19, 2023 · 58da34c · 58da34c
1 parent d82e972
commit 58da34c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/core/src/main/java/io/javaoperatorsdk/jenvtest/junit/ClientInjectionHandler.java b/core/src/main/java/io/javaoperatorsdk/jenvtest/junit/ClientInjectionHandler.java
@@ -11,4 +11,6 @@ boolean isTargetFieldAvailable(ExtensionContext extensionContext,
 
   void inject(ExtensionContext extensionContext,
       boolean staticField, KubeAPIServer kubeApiServer);
+
+  default void cleanup(ExtensionContext extensionContext) {}
 }
diff --git a/core/src/main/java/io/javaoperatorsdk/jenvtest/junit/KubeAPIServerExtension.java b/core/src/main/java/io/javaoperatorsdk/jenvtest/junit/KubeAPIServerExtension.java
@@ -89,7 +89,10 @@ private void startApiServer(EnableKubeAPIServer annotation) {
   private void stopIfAnnotationPresent(ExtensionContext extensionContext) {
     extensionContext.getElement().ifPresent(ae -> {
       var annotation = getExtensionAnnotationInstance(ae);
-      annotation.ifPresent(a -> kubeApiServer.stop());
+      annotation.ifPresent(a -> {
+        clientInjectionHandlers.forEach(ih -> ih.cleanup(extensionContext));
+        kubeApiServer.stop();
+      });
     });
   }
 

diff --git a/fabric8/src/main/java/io/javaoperatorsdk/jenvtest/junit/Fabric8ClientInjectionHandler.java b/fabric8/src/main/java/io/javaoperatorsdk/jenvtest/junit/Fabric8ClientInjectionHandler.java
@@ -15,11 +15,14 @@
 
 public class Fabric8ClientInjectionHandler implements ClientInjectionHandler {
 
+  private KubernetesClient client;
+
   public boolean isTargetFieldAvailable(ExtensionContext extensionContext,
       boolean staticField) {
     return getFieldForKubeConfigInjection(extensionContext, staticField).isPresent();
   }
 
+  @Override
   public void inject(ExtensionContext extensionContext,
       boolean staticField, KubeAPIServer kubeApiServer) {
     var field = getFieldForKubeConfigInjection(extensionContext, staticField).orElseThrow();
@@ -31,15 +34,20 @@ private void setKubernetesClientToField(ExtensionContext extensionContext,
     try {
       var target = extensionContext.getTestInstance()
           .orElseGet(() -> extensionContext.getTestClass().orElseThrow());
+      client = new KubernetesClientBuilder()
+          .withConfig(Config.fromKubeconfig(kubeApiServer.getKubeConfigYaml())).build();
       kubeConfigField.setAccessible(true);
-      kubeConfigField.set(target, new KubernetesClientBuilder()
-          .withConfig(Config.fromKubeconfig(kubeApiServer.getKubeConfigYaml()))
-          .build());
+      kubeConfigField.set(target, client);
     } catch (IllegalAccessException e) {
       throw new JenvtestException(e);
     }
   }
 
+  @Override
+  public void cleanup(ExtensionContext extensionContext) {
+    client.close();
+  }
+
   @SuppressWarnings("rawtypes")
   public static Optional<Field> getFieldForKubeConfigInjection(ExtensionContext extensionContext,
       boolean staticField) {