Skip to content

Commit d04d7e6

Browse files
committed
refactor: remove unneeded path to CRD as it's now automatically inferred
1 parent 1e25efe commit d04d7e6

File tree

7 files changed

+13
-15
lines changed

7 files changed

+13
-15
lines changed

operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class ConcurrencyIT {
3232
public void setup() {
3333
KubernetesClient k8sClient = new DefaultKubernetesClient();
3434
integrationTest.initialize(
35-
k8sClient, new TestCustomResourceController(k8sClient, true), "test-crd.yaml");
35+
k8sClient, new TestCustomResourceController(k8sClient, true));
3636
}
3737

3838
@BeforeEach

operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.javaoperatorsdk.operator;
22

3-
import static org.assertj.core.api.Assertions.*;
3+
import static org.assertj.core.api.Assertions.assertThat;
44
import static org.awaitility.Awaitility.await;
55

66
import io.fabric8.kubernetes.api.model.ConfigMap;
@@ -21,8 +21,8 @@ public void initAndCleanup(boolean controllerStatusUpdate) {
2121
KubernetesClient k8sClient = new DefaultKubernetesClient();
2222
integrationTestSupport.initialize(
2323
k8sClient,
24-
new TestCustomResourceController(k8sClient, controllerStatusUpdate),
25-
"test-crd.yaml");
24+
new TestCustomResourceController(k8sClient, controllerStatusUpdate)
25+
);
2626
integrationTestSupport.cleanup();
2727
}
2828

operator-framework/src/test/java/io/javaoperatorsdk/operator/EventSourceIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class EventSourceIT {
2626
public void initAndCleanup() {
2727
KubernetesClient k8sClient = new DefaultKubernetesClient();
2828
integrationTestSupport.initialize(
29-
k8sClient, new EventSourceTestCustomResourceController(), "eventsource-test-crd.yaml");
29+
k8sClient, new EventSourceTestCustomResourceController());
3030
integrationTestSupport.cleanup();
3131
}
3232

operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,11 @@ public class IntegrationTestSupport {
3737
private Operator operator;
3838
private ResourceController controller;
3939

40-
public void initialize(
41-
KubernetesClient k8sClient, ResourceController controller, String crdPath) {
42-
initialize(k8sClient, controller, crdPath, null);
40+
public void initialize(KubernetesClient k8sClient, ResourceController controller) {
41+
initialize(k8sClient, controller, null);
4342
}
4443

45-
public void initialize(
46-
KubernetesClient k8sClient, ResourceController controller, String crdPath, Retry retry) {
44+
public void initialize(KubernetesClient k8sClient, ResourceController controller, Retry retry) {
4745
log.info("Initializing integration test in namespace {}", TEST_NAMESPACE);
4846
this.k8sClient = k8sClient;
4947
this.controller = controller;
@@ -52,7 +50,7 @@ public void initialize(
5250

5351
final var config = configurationService.getConfigurationFor(controller);
5452
// load generated CRD
55-
crdPath = "/META-INF/fabric8/" + config.getCRDName() + "-v1.yml";
53+
final var crdPath = "/META-INF/fabric8/" + config.getCRDName() + "-v1.yml";
5654
loadCRDAndApplyToCluster(crdPath);
5755

5856
final var customResourceClass = config.getCustomResourceClass();

operator-framework/src/test/java/io/javaoperatorsdk/operator/RetryIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.javaoperatorsdk.operator;
22

33
import static io.javaoperatorsdk.operator.IntegrationTestSupport.TEST_NAMESPACE;
4-
import static org.assertj.core.api.Assertions.*;
4+
import static org.assertj.core.api.Assertions.assertThat;
55

66
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
77
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
@@ -26,7 +26,7 @@ public void initAndCleanup() {
2626
new GenericRetry().setInitialInterval(RETRY_INTERVAL).withLinearRetry().setMaxAttempts(5);
2727
KubernetesClient k8sClient = new DefaultKubernetesClient();
2828
integrationTestSupport.initialize(
29-
k8sClient, new RetryTestCustomResourceController(), "retry-test-crd.yaml", retry);
29+
k8sClient, new RetryTestCustomResourceController(), retry);
3030
integrationTestSupport.cleanup();
3131
}
3232

operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class SubResourceUpdateIT {
2626
public void initAndCleanup() {
2727
KubernetesClient k8sClient = new DefaultKubernetesClient();
2828
integrationTestSupport.initialize(
29-
k8sClient, new SubResourceTestCustomResourceController(), "subresource-test-crd.yaml");
29+
k8sClient, new SubResourceTestCustomResourceController());
3030
integrationTestSupport.cleanup();
3131
}
3232

operator-framework/src/test/java/io/javaoperatorsdk/operator/UpdatingResAndSubResIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class UpdatingResAndSubResIT {
2525
public void initAndCleanup() {
2626
KubernetesClient k8sClient = new DefaultKubernetesClient();
2727
integrationTestSupport.initialize(
28-
k8sClient, new DoubleUpdateTestCustomResourceController(), "doubleupdate-test-crd.yaml");
28+
k8sClient, new DoubleUpdateTestCustomResourceController());
2929
integrationTestSupport.cleanup();
3030
}
3131

0 commit comments

Comments
 (0)