Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<sonar.host.url>https://sonarcloud.io</sonar.host.url>

<junit.version>5.9.1</junit.version>
<fabric8-client.version>6.3.1</fabric8-client.version>
<fabric8-client.version>6.4.1</fabric8-client.version>
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.19.0</log4j.version>
<mokito.version>5.1.0</mokito.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ void applyCRD() {

void applyResources(String path) {
try {
List<HasMetadata> resources = client.load(new FileInputStream(path)).get();
List<HasMetadata> resources = client.load(new FileInputStream(path)).items();
resources.forEach(hm -> {
hm.getMetadata().setNamespace(namespace);
if (hm.getKind().toLowerCase(Locale.ROOT).equals("clusterrolebinding")) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ class MySQLSchemaOperatorE2E {
infrastructure.add(
new NamespaceBuilder().withNewMetadata().withName(MY_SQL_NS).endMetadata().build());
try {
infrastructure.addAll(client.load(new FileInputStream("k8s/mysql-deployment.yaml")).get());
infrastructure.addAll(client.load(new FileInputStream("k8s/mysql-service.yaml")).get());
infrastructure.addAll(client.load(new FileInputStream("k8s/mysql-deployment.yaml")).items());
infrastructure.addAll(client.load(new FileInputStream("k8s/mysql-service.yaml")).items());
} catch (FileNotFoundException e) {
e.printStackTrace();
}
Expand All @@ -67,7 +67,7 @@ boolean isLocal() {
.withPortForward(MY_SQL_NS, "app", "mysql", 3306, SchemaDependentResource.LOCAL_PORT)
.build()
: ClusterDeployedOperatorExtension.builder()
.withOperatorDeployment(client.load(new FileInputStream("k8s/operator.yaml")).get())
.withOperatorDeployment(client.load(new FileInputStream("k8s/operator.yaml")).items())
.withInfrastructure(infrastructure)
.build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ boolean isLocal() {
: ClusterDeployedOperatorExtension.builder()
.waitForNamespaceDeletion(false)
.withOperatorDeployment(
client.load(new FileInputStream("k8s/operator.yaml")).get())
client.load(new FileInputStream("k8s/operator.yaml")).items())
.build();

Tomcat getTomcat() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public WebPageOperatorE2E() throws FileNotFoundException {}
.build()
: ClusterDeployedOperatorExtension.builder()
.waitForNamespaceDeletion(false)
.withOperatorDeployment(client.load(new FileInputStream("k8s/operator.yaml")).get(),
.withOperatorDeployment(client.load(new FileInputStream("k8s/operator.yaml")).items(),
resources -> {
Deployment deployment = (Deployment) resources.stream()
.filter(r -> r instanceof Deployment).findFirst().orElseThrow();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public WebPageOperatorManagedDependentResourcesE2E() throws FileNotFoundExceptio
.build()
: ClusterDeployedOperatorExtension.builder()
.waitForNamespaceDeletion(false)
.withOperatorDeployment(client.load(new FileInputStream("k8s/operator.yaml")).get(),
.withOperatorDeployment(client.load(new FileInputStream("k8s/operator.yaml")).items(),
resources -> {
Deployment deployment = (Deployment) resources.stream()
.filter(r -> r instanceof Deployment).findFirst().orElseThrow();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public WebPageOperatorStandaloneDependentResourcesE2E() throws FileNotFoundExcep
.build()
: ClusterDeployedOperatorExtension.builder()
.waitForNamespaceDeletion(false)
.withOperatorDeployment(client.load(new FileInputStream("k8s/operator.yaml")).get())
.withOperatorDeployment(client.load(new FileInputStream("k8s/operator.yaml")).items())
.build();

@Override
Expand Down