From 4f1e5c174909ac1b8d778811bb966f6eee41e44c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Thu, 21 Mar 2024 09:38:00 +0100 Subject: [PATCH 1/8] improve: replace current formatting plugins with spotless plugin (#2302) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../io/javaoperatorsdk/operator/sample/LeaderElectionE2E.java | 1 + 1 file changed, 1 insertion(+) 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 863407999d..4954c6a0e8 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 @@ -10,6 +10,7 @@ import java.util.OptionalInt; import java.util.UUID; import java.util.stream.IntStream; +import javaoperatorsdk.sample.v1.LeaderElection; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; From 911284bd9c4acc306e3479a22688961e4f0594c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Mon, 8 Apr 2024 18:47:48 +0200 Subject: [PATCH 2/8] fix: error with java docs validation (#2336) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../operator/api/config/ConfigurationService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java index 0bd1607213..ab689c23a3 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java @@ -366,6 +366,8 @@ default ExecutorServiceManager getExecutorServiceManager() { * * @return if SSA should be used for dependent resources * @since 4.4.0 + * + * @return if SSA should be used for dependent resources */ default boolean ssaBasedCreateUpdateMatchForDependentResources() { return true; @@ -395,6 +397,8 @@ default Set> defaultNonSSAResource() { * * @return if special annotation should be used for dependent resource to filter events * @since 4.5.0 + * + * @return if special annotation should be used for dependent resource to filter events */ default boolean previousAnnotationForDependentResourcesEventFiltering() { return true; @@ -411,6 +415,8 @@ default boolean previousAnnotationForDependentResourcesEventFiltering() { * * @return if resource version should be parsed (as integer) * @since 4.5.0 + * + * @return if resource version should be parsed (as integer) */ default boolean parseResourceVersionsForEventFilteringAndCaching() { return false; From be5d5c8d452c0cb2fabc86a34c08762aae3e143c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Wed, 14 Aug 2024 14:44:38 +0200 Subject: [PATCH 3/8] improve: replace jenvtest with kube-api-test from fabric8 client MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- operator-framework/pom.xml | 5 ++--- .../informerrelatedbehavior/InformerRelatedBehaviorITS.java | 2 +- pom.xml | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml index 0026c48dd6..b91530058e 100644 --- a/operator-framework/pom.xml +++ b/operator-framework/pom.xml @@ -85,9 +85,8 @@ test - io.javaoperatorsdk - jenvtest - test + io.fabric8 + kube-api-test-client-inject diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java index 12488af133..3b12222afa 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java @@ -6,6 +6,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import io.fabric8.kubeapitest.junit.EnableKubeAPIServer; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.Namespace; @@ -18,7 +19,6 @@ import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientBuilder; import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil; -import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer; import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.OperatorException; import io.javaoperatorsdk.operator.ReconcilerUtils; diff --git a/pom.xml b/pom.xml index 664e2afaf4..5130f95258 100644 --- a/pom.xml +++ b/pom.xml @@ -215,9 +215,9 @@ ${caffeine.version} - io.javaoperatorsdk - jenvtest - ${jenvtest.version} + io.fabric8 + kube-api-test-client-inject + ${fabric8-client.version} test From 6a2942a8811814e7ce7130190c28a2dc5f25edb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Wed, 14 Aug 2024 14:47:46 +0200 Subject: [PATCH 4/8] remove unused log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../informerrelatedbehavior/InformerRelatedBehaviorITS.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java index 3b12222afa..9fc9dcef18 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java @@ -48,9 +48,7 @@ */ @EnableKubeAPIServer(apiServerFlags = {"--min-request-timeout", "1"}, updateKubeConfigFile = true) class InformerRelatedBehaviorITS { - - private static final Logger log = LoggerFactory.getLogger(InformerRelatedBehaviorITS.class); - + public static final String TEST_RESOURCE_NAME = "test1"; public static final String ADDITIONAL_NAMESPACE_SUFFIX = "-additional"; From 2c3e8e2b771adf771cb474f5b336153239ca2a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Wed, 14 Aug 2024 14:49:11 +0200 Subject: [PATCH 5/8] format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../informerrelatedbehavior/InformerRelatedBehaviorITS.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java index 9fc9dcef18..21079c0504 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/InformerRelatedBehaviorITS.java @@ -3,8 +3,6 @@ import java.time.Duration; import org.junit.jupiter.api.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import io.fabric8.kubeapitest.junit.EnableKubeAPIServer; import io.fabric8.kubernetes.api.model.ConfigMap; @@ -48,7 +46,7 @@ */ @EnableKubeAPIServer(apiServerFlags = {"--min-request-timeout", "1"}, updateKubeConfigFile = true) class InformerRelatedBehaviorITS { - + public static final String TEST_RESOURCE_NAME = "test1"; public static final String ADDITIONAL_NAMESPACE_SUFFIX = "-additional"; From bfc252e0f9eafb7383fe0b5d956251a09e18eb10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Wed, 14 Aug 2024 15:55:30 +0200 Subject: [PATCH 6/8] move scope from dependency management MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- operator-framework/pom.xml | 1 + pom.xml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml index b91530058e..172f176c73 100644 --- a/operator-framework/pom.xml +++ b/operator-framework/pom.xml @@ -87,6 +87,7 @@ io.fabric8 kube-api-test-client-inject + test diff --git a/pom.xml b/pom.xml index 5130f95258..4de2249bbe 100644 --- a/pom.xml +++ b/pom.xml @@ -218,7 +218,6 @@ io.fabric8 kube-api-test-client-inject ${fabric8-client.version} - test From 9492575ef5bed4c0dbf1aaba67f137e09509f620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Thu, 15 Aug 2024 11:20:41 +0200 Subject: [PATCH 7/8] fix aftrer rebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- pom.xml | 1 - .../io/javaoperatorsdk/operator/sample/LeaderElectionE2E.java | 1 - 2 files changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4de2249bbe..eea74bbd49 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,6 @@ 1.13.3 4.12.0 3.1.8 - 0.9.6 0.9.11 2.16.1 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 4954c6a0e8..863407999d 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 @@ -10,7 +10,6 @@ import java.util.OptionalInt; import java.util.UUID; import java.util.stream.IntStream; -import javaoperatorsdk.sample.v1.LeaderElection; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; From 9b1dfbb07578ab30ef4970776d0017c8250cf227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Thu, 15 Aug 2024 11:22:27 +0200 Subject: [PATCH 8/8] fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../operator/api/config/ConfigurationService.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java index ab689c23a3..0bd1607213 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java @@ -366,8 +366,6 @@ default ExecutorServiceManager getExecutorServiceManager() { * * @return if SSA should be used for dependent resources * @since 4.4.0 - * - * @return if SSA should be used for dependent resources */ default boolean ssaBasedCreateUpdateMatchForDependentResources() { return true; @@ -397,8 +395,6 @@ default Set> defaultNonSSAResource() { * * @return if special annotation should be used for dependent resource to filter events * @since 4.5.0 - * - * @return if special annotation should be used for dependent resource to filter events */ default boolean previousAnnotationForDependentResourcesEventFiltering() { return true; @@ -415,8 +411,6 @@ default boolean previousAnnotationForDependentResourcesEventFiltering() { * * @return if resource version should be parsed (as integer) * @since 4.5.0 - * - * @return if resource version should be parsed (as integer) */ default boolean parseResourceVersionsForEventFilteringAndCaching() { return false;