Skip to content

Commit efd47da

Browse files
authored
fix: move default client to abstract extension, use config if available (#1512)
1 parent 904275a commit efd47da

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/AbstractOperatorExtension.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import io.fabric8.kubernetes.api.model.KubernetesResourceList;
1818
import io.fabric8.kubernetes.api.model.NamespaceBuilder;
1919
import io.fabric8.kubernetes.client.KubernetesClient;
20+
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
2021
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
2122
import io.fabric8.kubernetes.client.dsl.Resource;
2223
import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil;
@@ -51,7 +52,9 @@ protected AbstractOperatorExtension(
5152
boolean preserveNamespaceOnError,
5253
boolean waitForNamespaceDeletion,
5354
KubernetesClient kubernetesClient) {
54-
this.kubernetesClient = kubernetesClient;
55+
this.kubernetesClient = kubernetesClient != null ? kubernetesClient
56+
: new KubernetesClientBuilder()
57+
.withConfig(configurationService.getClientConfiguration()).build();
5558
this.configurationService = configurationService;
5659
this.infrastructure = infrastructure;
5760
this.infrastructureTimeout = infrastructureTimeout;

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/ClusterDeployedOperatorExtension.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import io.fabric8.kubernetes.api.model.HasMetadata;
2020
import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
2121
import io.fabric8.kubernetes.client.KubernetesClient;
22-
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
2322
import io.javaoperatorsdk.operator.api.config.ConfigurationService;
2423

2524
public class ClusterDeployedOperatorExtension extends AbstractOperatorExtension {
@@ -155,7 +154,7 @@ public ClusterDeployedOperatorExtension build() {
155154
preserveNamespaceOnError,
156155
waitForNamespaceDeletion,
157156
oneNamespacePerClass,
158-
kubernetesClient != null ? kubernetesClient : new KubernetesClientBuilder().build());
157+
kubernetesClient);
159158
}
160159
}
161160
}

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.fabric8.kubernetes.api.model.HasMetadata;
1818
import io.fabric8.kubernetes.client.CustomResource;
1919
import io.fabric8.kubernetes.client.KubernetesClient;
20-
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
2120
import io.fabric8.kubernetes.client.LocalPortForward;
2221
import io.javaoperatorsdk.operator.Operator;
2322
import io.javaoperatorsdk.operator.ReconcilerUtils;
@@ -270,7 +269,7 @@ public LocallyRunOperatorExtension build() {
270269
preserveNamespaceOnError,
271270
waitForNamespaceDeletion,
272271
oneNamespacePerClass,
273-
kubernetesClient != null ? kubernetesClient : new KubernetesClientBuilder().build());
272+
kubernetesClient);
274273
}
275274
}
276275

0 commit comments

Comments
 (0)