From c0f6574f476778fdf0fd34a416cbceab37deaedc Mon Sep 17 00:00:00 2001 From: csviri Date: Thu, 19 Jan 2023 15:08:13 +0100 Subject: [PATCH 1/5] chore: fabric8 client 6.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bcc55dc646..660fd24fbd 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ https://sonarcloud.io 5.9.1 - 6.3.1 + 6.4.0 1.7.36 2.19.0 5.1.0 From c9f0f41f01ca07bbcef556fffad89a3504d6b0c6 Mon Sep 17 00:00:00 2001 From: csviri Date: Thu, 19 Jan 2023 19:08:18 +0100 Subject: [PATCH 2/5] fix regarding api change --- .../operator/sample/MySQLSchemaOperatorE2E.java | 4 ++-- .../io/javaoperatorsdk/operator/sample/TomcatOperatorE2E.java | 2 +- .../javaoperatorsdk/operator/sample/WebPageOperatorE2E.java | 2 +- .../sample/WebPageOperatorManagedDependentResourcesE2E.java | 2 +- .../WebPageOperatorStandaloneDependentResourcesE2E.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java b/sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java index e6aa796656..f420741809 100644 --- a/sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java +++ b/sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java @@ -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(); } diff --git a/sample-operators/tomcat-operator/src/test/java/io/javaoperatorsdk/operator/sample/TomcatOperatorE2E.java b/sample-operators/tomcat-operator/src/test/java/io/javaoperatorsdk/operator/sample/TomcatOperatorE2E.java index 377d6c540f..929af47e5d 100644 --- a/sample-operators/tomcat-operator/src/test/java/io/javaoperatorsdk/operator/sample/TomcatOperatorE2E.java +++ b/sample-operators/tomcat-operator/src/test/java/io/javaoperatorsdk/operator/sample/TomcatOperatorE2E.java @@ -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() { diff --git a/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorE2E.java b/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorE2E.java index 81746769c1..03c3d2c2e0 100644 --- a/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorE2E.java +++ b/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorE2E.java @@ -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(); diff --git a/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorManagedDependentResourcesE2E.java b/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorManagedDependentResourcesE2E.java index 3fbf877d64..92b0ce0a41 100644 --- a/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorManagedDependentResourcesE2E.java +++ b/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorManagedDependentResourcesE2E.java @@ -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(); diff --git a/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorStandaloneDependentResourcesE2E.java b/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorStandaloneDependentResourcesE2E.java index 1b7a08d71b..e1e9e65f96 100644 --- a/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorStandaloneDependentResourcesE2E.java +++ b/sample-operators/webpage/src/test/java/io/javaoperatorsdk/operator/sample/WebPageOperatorStandaloneDependentResourcesE2E.java @@ -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 From c652aff5e96beed3b2584b97438e54c08ddd526f Mon Sep 17 00:00:00 2001 From: csviri Date: Thu, 19 Jan 2023 19:15:39 +0100 Subject: [PATCH 3/5] additional fix --- .../javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java b/sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java index f420741809..d65ab98647 100644 --- a/sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java +++ b/sample-operators/mysql-schema/src/test/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperatorE2E.java @@ -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(); From b7df10afd4cfe7cfccc19a43b4b172b9e945f8e7 Mon Sep 17 00:00:00 2001 From: csviri Date: Thu, 19 Jan 2023 19:28:38 +0100 Subject: [PATCH 4/5] fix --- .../io/javaoperatorsdk/operator/sample/LeaderElectionE2E.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample-operators/leader-election/src/test/java/io/javaoperatorsdk/operator/sample/LeaderElectionE2E.java b/sample-operators/leader-election/src/test/java/io/javaoperatorsdk/operator/sample/LeaderElectionE2E.java index 5512f54fc1..7932472aab 100644 --- a/sample-operators/leader-election/src/test/java/io/javaoperatorsdk/operator/sample/LeaderElectionE2E.java +++ b/sample-operators/leader-election/src/test/java/io/javaoperatorsdk/operator/sample/LeaderElectionE2E.java @@ -165,7 +165,7 @@ void applyCRD() { void applyResources(String path) { try { - List resources = client.load(new FileInputStream(path)).get(); + List resources = client.load(new FileInputStream(path)).items(); resources.forEach(hm -> { hm.getMetadata().setNamespace(namespace); if (hm.getKind().toLowerCase(Locale.ROOT).equals("clusterrolebinding")) { From 76e03426f9c2d14313bc5eaf5833c31b675c62bc Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Wed, 22 Feb 2023 17:51:24 +0100 Subject: [PATCH 5/5] chore: update to fabric8 6.4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 660fd24fbd..a3a969c3db 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ https://sonarcloud.io 5.9.1 - 6.4.0 + 6.4.1 1.7.36 2.19.0 5.1.0