Skip to content

Commit 4d461f9

Browse files
metacosmxstefank
authored andcommitted
fix: use infrastructure client for tests set up & tear down
Signed-off-by: Chris Laprun <[email protected]>
1 parent 6f5500d commit 4d461f9

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ protected void before(ExtensionContext context) {
7171
final var crdPath = "./target/classes/META-INF/fabric8/";
7272
final var crdSuffix = "-v1.yml";
7373

74-
final var kubernetesClient = getKubernetesClient();
74+
final var kubernetesClient = getInfrastructureKubernetesClient();
7575
for (var crdFile :
7676
Objects.requireNonNull(
7777
new File(crdPath).listFiles((ignored, name) -> name.endsWith(crdSuffix)))) {
@@ -109,7 +109,10 @@ protected void before(ExtensionContext context) {
109109

110110
@Override
111111
protected void deleteOperator() {
112-
getKubernetesClient().resourceList(operatorDeployment).inNamespace(namespace).delete();
112+
getInfrastructureKubernetesClient()
113+
.resourceList(operatorDeployment)
114+
.inNamespace(namespace)
115+
.delete();
113116
}
114117

115118
public static class Builder extends AbstractBuilder<Builder> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ public Operator getOperator() {
242242
protected void before(ExtensionContext context) {
243243
super.before(context);
244244

245-
final var kubernetesClient = getKubernetesClient();
245+
final var kubernetesClient = getInfrastructureKubernetesClient();
246246

247247
for (var ref : portForwards) {
248248
String podName =
@@ -315,7 +315,7 @@ protected void before(ExtensionContext context) {
315315
protected void after(ExtensionContext context) {
316316
super.after(context);
317317

318-
var kubernetesClient = getKubernetesClient();
318+
var kubernetesClient = getInfrastructureKubernetesClient();
319319

320320
var iterator = appliedCRDs.iterator();
321321
while (iterator.hasNext()) {

0 commit comments

Comments
 (0)