Skip to content
This repository was archived by the owner on Apr 10, 2024. It is now read-only.

fix: close client #93

Merged
merged 1 commit into from
Apr 19, 2023
Merged

fix: close client #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions core/src/main/java/io/javaoperatorsdk/jenvtest/junit/ClientInjectionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ boolean isTargetFieldAvailable(ExtensionContext extensionContext,

void inject(ExtensionContext extensionContext,
boolean staticField, KubeAPIServer kubeApiServer);

default void cleanup(ExtensionContext extensionContext) {}
}
5 changes: 4 additions & 1 deletion core/src/main/java/io/javaoperatorsdk/jenvtest/junit/KubeAPIServerExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
});
}

Expand Down
14 changes: 11 additions & 3 deletions fabric8/src/main/java/io/javaoperatorsdk/jenvtest/junit/Fabric8ClientInjectionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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) {
Expand Down