From 5fd553ce13ffd44979f86e8a20c151f0f488c3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Tue, 13 Jan 2026 10:22:33 +0100 Subject: [PATCH 1/2] improve: moving some integration test into packages, some @Sample cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Having those tests in packages gives better visibility on webpage. Removing sample from two tests, which does not demonstrate functionlity, rather just tests some cases. Signed-off-by: Attila Mészáros --- .../operator/baseapi/ConcurrencyIT.java | 10 ---------- .../operator/baseapi/StopWithoutStartIT.java | 10 ---------- .../InformerErrorHandlerStartIT.java | 2 +- .../LeaderElectionPermissionIT.java | 2 +- 4 files changed, 2 insertions(+), 22 deletions(-) rename operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/{ => informerstarterror}/InformerErrorHandlerStartIT.java (97%) rename operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/{ => leaderelectionpermission}/LeaderElectionPermissionIT.java (98%) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ConcurrencyIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ConcurrencyIT.java index 7a9282dcce..8522fb30e7 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ConcurrencyIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ConcurrencyIT.java @@ -25,7 +25,6 @@ import org.slf4j.LoggerFactory; import io.fabric8.kubernetes.api.model.ConfigMap; -import io.javaoperatorsdk.annotation.Sample; import io.javaoperatorsdk.operator.baseapi.simple.TestCustomResource; import io.javaoperatorsdk.operator.baseapi.simple.TestReconciler; import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension; @@ -34,15 +33,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; -@Sample( - tldr = "Concurrent Reconciliation of Multiple Resources", - description = - """ - Demonstrates the operator's ability to handle concurrent reconciliation of multiple \ - resources. The test creates, updates, and deletes many resources simultaneously to \ - verify proper handling of concurrent operations, ensuring thread safety and correct \ - resource state management under load. - """) class ConcurrencyIT { public static final int NUMBER_OF_RESOURCES_CREATED = 50; public static final int NUMBER_OF_RESOURCES_DELETED = 30; diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/StopWithoutStartIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/StopWithoutStartIT.java index fdf5865d3e..086d5486ff 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/StopWithoutStartIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/StopWithoutStartIT.java @@ -19,22 +19,12 @@ import org.junit.jupiter.api.Timeout; import io.fabric8.kubernetes.api.model.ConfigMap; -import io.javaoperatorsdk.annotation.Sample; import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration; import io.javaoperatorsdk.operator.api.reconciler.Reconciler; import io.javaoperatorsdk.operator.api.reconciler.UpdateControl; -@Sample( - tldr = "Stop Operator Without Starting", - description = - """ - Demonstrates that an operator can be stopped without being started. This is important \ - for cleanup scenarios where an operator is created and registered with reconcilers but \ - never started due to initialization failures or other conditions. The stop() method \ - properly cleans up thread pools even when the operator was never started. - """) class StopWithoutStartIT { @Test diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/InformerErrorHandlerStartIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerstarterror/InformerErrorHandlerStartIT.java similarity index 97% rename from operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/InformerErrorHandlerStartIT.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerstarterror/InformerErrorHandlerStartIT.java index b10591461c..3f062baf75 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/InformerErrorHandlerStartIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerstarterror/InformerErrorHandlerStartIT.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.javaoperatorsdk.operator.baseapi; +package io.javaoperatorsdk.operator.baseapi.informerstarterror; import java.time.Duration; diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/LeaderElectionPermissionIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/leaderelectionpermission/LeaderElectionPermissionIT.java similarity index 98% rename from operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/LeaderElectionPermissionIT.java rename to operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/leaderelectionpermission/LeaderElectionPermissionIT.java index db99324ae2..0180e3b8b8 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/LeaderElectionPermissionIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/leaderelectionpermission/LeaderElectionPermissionIT.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.javaoperatorsdk.operator.baseapi; +package io.javaoperatorsdk.operator.baseapi.leaderelectionpermission; import org.junit.jupiter.api.Test; From 384778a26660db798bd1e09bcefec3f7d52fba7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Tue, 13 Jan 2026 10:55:52 +0100 Subject: [PATCH 2/2] wip MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../leader-elector-stop-noaccess-role-binding.yaml | 0 .../leader-elector-stop-role-noaccess.yaml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename operator-framework/src/test/resources/io/javaoperatorsdk/operator/baseapi/{ => leaderelectionpermission}/leader-elector-stop-noaccess-role-binding.yaml (100%) rename operator-framework/src/test/resources/io/javaoperatorsdk/operator/baseapi/{ => leaderelectionpermission}/leader-elector-stop-role-noaccess.yaml (100%) diff --git a/operator-framework/src/test/resources/io/javaoperatorsdk/operator/baseapi/leader-elector-stop-noaccess-role-binding.yaml b/operator-framework/src/test/resources/io/javaoperatorsdk/operator/baseapi/leaderelectionpermission/leader-elector-stop-noaccess-role-binding.yaml similarity index 100% rename from operator-framework/src/test/resources/io/javaoperatorsdk/operator/baseapi/leader-elector-stop-noaccess-role-binding.yaml rename to operator-framework/src/test/resources/io/javaoperatorsdk/operator/baseapi/leaderelectionpermission/leader-elector-stop-noaccess-role-binding.yaml diff --git a/operator-framework/src/test/resources/io/javaoperatorsdk/operator/baseapi/leader-elector-stop-role-noaccess.yaml b/operator-framework/src/test/resources/io/javaoperatorsdk/operator/baseapi/leaderelectionpermission/leader-elector-stop-role-noaccess.yaml similarity index 100% rename from operator-framework/src/test/resources/io/javaoperatorsdk/operator/baseapi/leader-elector-stop-role-noaccess.yaml rename to operator-framework/src/test/resources/io/javaoperatorsdk/operator/baseapi/leaderelectionpermission/leader-elector-stop-role-noaccess.yaml