Skip to content

Commit 3a01c37

Browse files
committed
add possibility to configure CRD for all unit tests via application.properties
1 parent 432a8bb commit 3a01c37

File tree

5 files changed

+36
-2
lines changed

5 files changed

+36
-2
lines changed

operator-framework-spring-boot-starter-test/src/main/java/io/javaoperatorsdk/operator/springboot/starter/test/TestConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.io.FileNotFoundException;
1212
import java.util.Collections;
1313
import java.util.HashMap;
14+
import java.util.stream.Stream;
1415
import okhttp3.mockwebserver.MockWebServer;
1516
import org.slf4j.Logger;
1617
import org.slf4j.LoggerFactory;
@@ -45,8 +46,7 @@ public KubernetesClient kubernetesClient(
4546
KubernetesMockServer server, TestConfigurationProperties properties) {
4647
final var client = server.createClient();
4748

48-
properties
49-
.getCrdPaths()
49+
Stream.concat(properties.getCrdPaths().stream(), properties.getGlobalCrdPaths().stream())
5050
.forEach(
5151
crdPath -> {
5252
CustomResourceDefinition crd;

operator-framework-spring-boot-starter-test/src/main/java/io/javaoperatorsdk/operator/springboot/starter/test/TestConfigurationProperties.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
@ConfigurationProperties("io.javaoperatorsdk.test")
88
public class TestConfigurationProperties {
99

10+
private List<String> globalCrdPaths = new ArrayList<>();
11+
1012
private List<String> crdPaths = new ArrayList<>();
1113

1214
public List<String> getCrdPaths() {
@@ -16,4 +18,12 @@ public List<String> getCrdPaths() {
1618
public void setCrdPaths(List<String> crdPaths) {
1719
this.crdPaths = crdPaths;
1820
}
21+
22+
public List<String> getGlobalCrdPaths() {
23+
return globalCrdPaths;
24+
}
25+
26+
public void setGlobalCrdPaths(List<String> globalCrdPaths) {
27+
this.globalCrdPaths = globalCrdPaths;
28+
}
1929
}

operator-framework-spring-boot-starter-test/src/test/java/io/javaoperatorsdk/operator/springboot/starter/test/EnableMockOperatorTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ void testCrdLoaded() {
2727
.withName("customservices.sample.javaoperatorsdk")
2828
.get())
2929
.isNotNull();
30+
assertThat(
31+
client
32+
.customResourceDefinitions()
33+
.withName("customservices.global.sample.javaoperatorsdk")
34+
.get())
35+
.isNotNull();
3036
}
3137

3238
@SpringBootApplication
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
io.javaoperatorsdk.test.global-crd-paths=classpath:global-crd.yml
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: customservices.global.sample.javaoperatorsdk
5+
spec:
6+
group: sample.javaoperatorsdk
7+
scope: Namespaced
8+
names:
9+
plural: customservices
10+
singular: customservice
11+
kind: CustomService
12+
shortNames:
13+
- cs
14+
versions:
15+
- name: v1
16+
served: true
17+
storage: true

0 commit comments

Comments
 (0)