Move unrelated clases from the package with resource operators (strimzi#9882)

scholzj · web-flow · commit a13058f2543a · 2024-03-27T15:47:33.000+01:00
Signed-off-by: Jakub Scholz &lt;www@scholzj.com&gt;
diff --git a/cluster-operator/src/main/java/io/strimzi/operator/cluster/ClusterOperatorConfig.java b/cluster-operator/src/main/java/io/strimzi/operator/cluster/ClusterOperatorConfig.java
@@ -12,9 +12,9 @@
 import io.strimzi.operator.cluster.model.UnsupportedVersionException;
 import io.strimzi.operator.common.InvalidConfigurationException;
 import io.strimzi.operator.common.Util;
+import io.strimzi.operator.common.config.ConfigParameter;
+import io.strimzi.operator.common.config.ConfigParameterParser;
 import io.strimzi.operator.common.model.Labels;
-import io.strimzi.operator.common.operator.resource.ConfigParameter;
-import io.strimzi.operator.common.operator.resource.ConfigParameterParser;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -25,13 +25,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import static io.strimzi.operator.common.operator.resource.ConfigParameterParser.BOOLEAN;
-import static io.strimzi.operator.common.operator.resource.ConfigParameterParser.INTEGER;
-import static io.strimzi.operator.common.operator.resource.ConfigParameterParser.LABEL_PREDICATE;
-import static io.strimzi.operator.common.operator.resource.ConfigParameterParser.LOCAL_OBJECT_REFERENCE_LIST;
-import static io.strimzi.operator.common.operator.resource.ConfigParameterParser.LONG;
-import static io.strimzi.operator.common.operator.resource.ConfigParameterParser.NAMESPACE_SET;
-import static io.strimzi.operator.common.operator.resource.ConfigParameterParser.STRING;
+import static io.strimzi.operator.common.config.ConfigParameterParser.BOOLEAN;
+import static io.strimzi.operator.common.config.ConfigParameterParser.INTEGER;
+import static io.strimzi.operator.common.config.ConfigParameterParser.LABEL_PREDICATE;
+import static io.strimzi.operator.common.config.ConfigParameterParser.LOCAL_OBJECT_REFERENCE_LIST;
+import static io.strimzi.operator.common.config.ConfigParameterParser.LONG;
+import static io.strimzi.operator.common.config.ConfigParameterParser.NAMESPACE_SET;
+import static io.strimzi.operator.common.config.ConfigParameterParser.STRING;
 
 /**
  * Cluster Operator configuration
@@ -136,7 +136,7 @@ public class ClusterOperatorConfig {
     /**
      * Namespace in which the operator will run and create resources
      */
-    public static final ConfigParameter<Set<String>> NAMESPACE = new ConfigParameter<>("STRIMZI_NAMESPACE", NAMESPACE_SET, "*",  CONFIG_VALUES);
+    public static final ConfigParameter<Set<String>> NAMESPACE = new ConfigParameter<>("STRIMZI_NAMESPACE", NAMESPACE_SET, ConfigParameter.ANY_NAMESPACE,  CONFIG_VALUES);
 
     /**
      * Specify every how many milliseconds the reconciliation runs
diff --git a/cluster-operator/src/main/java/io/strimzi/operator/cluster/leaderelection/LeaderElectionManagerConfig.java b/cluster-operator/src/main/java/io/strimzi/operator/cluster/leaderelection/LeaderElectionManagerConfig.java
@@ -4,16 +4,16 @@
  */
 package io.strimzi.operator.cluster.leaderelection;
 
-import io.strimzi.operator.common.operator.resource.ConfigParameter;
+import io.strimzi.operator.common.config.ConfigParameter;
 
 import java.time.Duration;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import static io.strimzi.operator.common.operator.resource.ConfigParameterParser.DURATION;
-import static io.strimzi.operator.common.operator.resource.ConfigParameterParser.NON_EMPTY_STRING;
+import static io.strimzi.operator.common.config.ConfigParameterParser.DURATION;
+import static io.strimzi.operator.common.config.ConfigParameterParser.NON_EMPTY_STRING;
 
 /**
  * Configuration class for the Leader Election Manager
diff --git a/cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/AbstractOperator.java b/cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/AbstractOperator.java
@@ -20,6 +20,7 @@
 import io.strimzi.operator.common.Reconciliation;
 import io.strimzi.operator.common.ReconciliationException;
 import io.strimzi.operator.common.ReconciliationLogger;
+import io.strimzi.operator.common.TimeoutException;
 import io.strimzi.operator.common.Util;
 import io.strimzi.operator.common.VertxUtil;
 import io.strimzi.operator.common.metrics.OperatorMetricsHolder;
@@ -30,7 +31,6 @@
 import io.strimzi.operator.common.model.StatusDiff;
 import io.strimzi.operator.common.model.StatusUtils;
 import io.strimzi.operator.common.operator.resource.AbstractWatchableStatusedNamespacedResourceOperator;
-import io.strimzi.operator.common.operator.resource.TimeoutException;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
diff --git a/cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ConnectOperatorMetricsHolder.java b/cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ConnectOperatorMetricsHolder.java
@@ -8,6 +8,7 @@
 import io.micrometer.core.instrument.Timer;
 import io.strimzi.api.kafka.model.connector.KafkaConnector;
 import io.strimzi.operator.common.MetricsProvider;
+import io.strimzi.operator.common.config.ConfigParameter;
 import io.strimzi.operator.common.metrics.OperatorMetricsHolder;
 import io.strimzi.operator.common.model.Labels;
 
@@ -133,7 +134,7 @@ public Timer connectorsReconciliationsTimer(String namespace) {
      * @param namespace Namespace for which should the metrics be reset to 0
      */
     public void resetConnectorsCounters(String namespace) {
-        if (namespace.equals("*")) {
+        if (namespace.equals(ConfigParameter.ANY_NAMESPACE)) {
             connectorsResourceCounterMap.forEach((key, counter) -> counter.set(0));
             pausedConnectorsResourceCounterMap.forEach((key, counter) -> counter.set(0));
         } else {
diff --git a/cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/Operator.java b/cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/Operator.java
@@ -6,6 +6,7 @@
 
 import io.fabric8.kubernetes.api.model.LabelSelector;
 import io.strimzi.operator.common.Reconciliation;
+import io.strimzi.operator.common.config.ConfigParameter;
 import io.strimzi.operator.common.metrics.OperatorMetricsHolder;
 import io.strimzi.operator.common.model.NamespaceAndName;
 import io.vertx.core.AsyncResult;
@@ -73,7 +74,7 @@ default void reconcileAll(String trigger, String namespace, Handler<AsyncResult<
      * @param handler       Handler called on completion.
      */
     default void reconcileThese(String trigger, Set<NamespaceAndName> desiredNames, String namespace, Handler<AsyncResult<Void>> handler) {
-        if (namespace.equals("*")) {
+        if (namespace.equals(ConfigParameter.ANY_NAMESPACE)) {
             metrics().resetResourceAndPausedResourceCounters();
         } else {
             metrics().resourceCounter(namespace).set(0);
diff --git a/cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/resource/KafkaRoller.java b/cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/resource/KafkaRoller.java
@@ -390,7 +390,7 @@ private Future<Void> schedule(NodeRef nodeRef, long delay, TimeUnit unit) {
                     LOGGER.infoCr(reconciliation, "Could not verify pod {} is up-to-date, giving up after {} attempts. Total delay between attempts {}ms",
                             nodeRef, ctx.backOff.maxAttempts(), ctx.backOff.totalDelayMs(), e);
                     ctx.promise.fail(e instanceof TimeoutException ?
-                            new io.strimzi.operator.common.operator.resource.TimeoutException() :
+                            new io.strimzi.operator.common.TimeoutException() :
                             e);
                 } else {
                     long delay1 = ctx.backOff.delayMs();
diff --git a/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/ZooKeeperEraserTest.java b/cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/ZooKeeperEraserTest.java
@@ -23,6 +23,7 @@
 import io.strimzi.operator.cluster.operator.resource.ResourceOperatorSupplier;
 import io.strimzi.operator.common.Annotations;
 import io.strimzi.operator.common.Reconciliation;
+import io.strimzi.operator.common.TimeoutException;
 import io.strimzi.operator.common.model.Labels;
 import io.strimzi.operator.common.operator.resource.ConfigMapOperator;
 import io.strimzi.operator.common.operator.resource.NetworkPolicyOperator;
@@ -32,7 +33,6 @@
 import io.strimzi.operator.common.operator.resource.ServiceAccountOperator;
 import io.strimzi.operator.common.operator.resource.ServiceOperator;
 import io.strimzi.operator.common.operator.resource.StrimziPodSetOperator;
-import io.strimzi.operator.common.operator.resource.TimeoutException;
 import io.vertx.core.Future;
 import io.vertx.junit5.Checkpoint;
 import io.vertx.junit5.VertxExtension;
diff --git a/operator-common/src/main/java/io/strimzi/operator/common/TimeoutException.java b/operator-common/src/main/java/io/strimzi/operator/common/TimeoutException.java
@@ -2,7 +2,7 @@
  * Copyright Strimzi authors.
  * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
  */
-package io.strimzi.operator.common.operator.resource;
+package io.strimzi.operator.common;
 
 /**
  * Thrown to indicate that timeout has been exceeded.
diff --git a/operator-common/src/main/java/io/strimzi/operator/common/VertxUtil.java b/operator-common/src/main/java/io/strimzi/operator/common/VertxUtil.java
@@ -14,7 +14,6 @@
 import io.strimzi.api.kafka.model.common.authentication.KafkaClientAuthenticationTls;
 import io.strimzi.certs.CertAndKey;
 import io.strimzi.operator.common.operator.resource.SecretOperator;
-import io.strimzi.operator.common.operator.resource.TimeoutException;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
 import io.vertx.core.Promise;
diff --git a/operator-common/src/main/java/io/strimzi/operator/common/config/ConfigParameter.java b/operator-common/src/main/java/io/strimzi/operator/common/config/ConfigParameter.java
@@ -2,7 +2,7 @@
  * Copyright Strimzi authors.
  * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
  */
-package io.strimzi.operator.common.operator.resource;
+package io.strimzi.operator.common.config;
 
 import io.strimzi.operator.common.InvalidConfigurationException;
 
@@ -22,6 +22,11 @@
  * @param map           Map that will contain all the configuration values
  */
 public record ConfigParameter<T>(String key, ConfigParameterParser<T> type, String defaultValue, boolean required, Map<String, ConfigParameter<?>> map) {
+    /**
+     * Marker for indication "all namespaces" => this is used for example when creating watches to create a cluster
+     * wide watch.
+     */
+    public final static String ANY_NAMESPACE = "*";
 
     /**
      * Constructor
diff --git a/operator-common/src/main/java/io/strimzi/operator/common/config/ConfigParameterParser.java b/operator-common/src/main/java/io/strimzi/operator/common/config/ConfigParameterParser.java
@@ -2,8 +2,7 @@
  * Copyright Strimzi authors.
  * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
  */
-package io.strimzi.operator.common.operator.resource;
-
+package io.strimzi.operator.common.config;
 
 import io.fabric8.kubernetes.api.model.LocalObjectReference;
 import io.fabric8.kubernetes.api.model.LocalObjectReferenceBuilder;
@@ -174,16 +173,16 @@ static <T extends Number> ConfigParameterParser<T> strictlyPositive(ConfigParame
      */
     ConfigParameterParser<Set<String>> NAMESPACE_SET = namespacesList -> {
         Set<String> namespaces;
-        if (namespacesList.equals("*")) {
-            namespaces = Collections.singleton(AbstractNamespacedResourceOperator.ANY_NAMESPACE);
+        if (namespacesList.equals(ConfigParameter.ANY_NAMESPACE)) {
+            namespaces = Collections.singleton(ConfigParameter.ANY_NAMESPACE);
         } else {
-            if (namespacesList.trim().equals(AbstractNamespacedResourceOperator.ANY_NAMESPACE)) {
-                namespaces = Collections.singleton(AbstractNamespacedResourceOperator.ANY_NAMESPACE);
+            if (namespacesList.trim().equals(ConfigParameter.ANY_NAMESPACE)) {
+                namespaces = Collections.singleton(ConfigParameter.ANY_NAMESPACE);
             } else if (namespacesList.matches("(\\s*[a-z0-9.-]+\\s*,)*\\s*[a-z0-9.-]+\\s*")) {
                 namespaces = new HashSet<>(asList(namespacesList.trim().split("\\s*,+\\s*")));
             } else {
                 throw new InvalidConfigurationException("Not a valid list of namespaces nor the 'any namespace' wildcard "
-                        + AbstractNamespacedResourceOperator.ANY_NAMESPACE);
+                        + ConfigParameter.ANY_NAMESPACE);
             }
         }
 
diff --git a/operator-common/src/main/java/io/strimzi/operator/common/metrics/MetricsHolder.java b/operator-common/src/main/java/io/strimzi/operator/common/metrics/MetricsHolder.java
@@ -9,6 +9,7 @@
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.Timer;
 import io.strimzi.operator.common.MetricsProvider;
+import io.strimzi.operator.common.config.ConfigParameter;
 import io.strimzi.operator.common.model.Labels;
 
 import java.util.Map;
@@ -182,7 +183,7 @@ protected static <M> M metric(String namespace, String kind, Labels selectorLabe
         String selectorValue = selectorLabels != null ? selectorLabels.toSelectorString() : "";
         Tags metricTags;
         String metricKey = namespace + "/" + kind;
-        if (namespace.equals("*")) {
+        if (namespace.equals(ConfigParameter.ANY_NAMESPACE)) {
             metricTags = Tags.of(Tag.of("kind", kind), Tag.of("namespace", ""), Tag.of("selector", selectorValue));
         } else {
             metricTags = Tags.of(Tag.of("kind", kind), Tag.of("namespace", namespace), Tag.of("selector", selectorValue));
diff --git a/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/AbstractNamespacedResourceOperator.java b/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/AbstractNamespacedResourceOperator.java
@@ -20,6 +20,7 @@
 import io.strimzi.operator.common.Reconciliation;
 import io.strimzi.operator.common.ReconciliationLogger;
 import io.strimzi.operator.common.VertxUtil;
+import io.strimzi.operator.common.config.ConfigParameter;
 import io.strimzi.operator.common.model.Labels;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
@@ -47,12 +48,6 @@ public abstract class AbstractNamespacedResourceOperator<C extends KubernetesCli
         extends AbstractResourceOperator<C, T, L, R> {
     private static final ReconciliationLogger LOGGER = ReconciliationLogger.create(AbstractNamespacedResourceOperator.class);
 
-    /**
-     * Marker for indication "all namespaces" => this is used for example when creating watches to create a cluster
-     * wide watch.
-     */
-    public final static String ANY_NAMESPACE = "*";
-
     /**
      * Constructor.
      * @param vertx The vertx instance.
@@ -323,7 +318,7 @@ public List<T> list(String namespace, Labels selector) {
      * @return  Operation with applied namespace
      */
     private FilterWatchListDeletable<T, L, R> applyNamespace(String namespace)  {
-        if (ANY_NAMESPACE.equals(namespace))  {
+        if (ConfigParameter.ANY_NAMESPACE.equals(namespace))  {
             return operation().inAnyNamespace();
         } else {
             return operation().inNamespace(namespace);
diff --git a/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/AbstractWatchableNamespacedResourceOperator.java b/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/AbstractWatchableNamespacedResourceOperator.java
@@ -12,6 +12,7 @@
 import io.fabric8.kubernetes.client.Watcher;
 import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
 import io.fabric8.kubernetes.client.dsl.Resource;
+import io.strimzi.operator.common.config.ConfigParameter;
 import io.vertx.core.Vertx;
 
 /**
@@ -56,7 +57,7 @@ protected Watch watchInNamespace(String namespace, Watcher<T> watcher) {
      * @return  A Kubernetes watch instance
      */
     public Watch watch(String namespace, Watcher<T> watcher) {
-        if (ANY_NAMESPACE.equals(namespace))    {
+        if (ConfigParameter.ANY_NAMESPACE.equals(namespace))    {
             return watchInAnyNamespace(watcher);
         } else {
             return watchInNamespace(namespace, watcher);
@@ -74,7 +75,7 @@ public Watch watch(String namespace, Watcher<T> watcher) {
      */
     public Watch watch(String namespace, LabelSelector selector, Watcher<T> watcher) {
         FilterWatchListDeletable<T, L, R> operation
-                = ANY_NAMESPACE.equals(namespace) ? operation().inAnyNamespace() : operation().inNamespace(namespace);
+                = ConfigParameter.ANY_NAMESPACE.equals(namespace) ? operation().inAnyNamespace() : operation().inNamespace(namespace);
         if (selector != null) {
             operation = operation.withLabelSelector(selector);
         }
diff --git a/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/ResourceSupport.java b/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/ResourceSupport.java
@@ -16,6 +16,7 @@
 import io.fabric8.kubernetes.client.dsl.Watchable;
 import io.strimzi.operator.common.Reconciliation;
 import io.strimzi.operator.common.ReconciliationLogger;
+import io.strimzi.operator.common.TimeoutException;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
 import io.vertx.core.Promise;
diff --git a/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/concurrent/AbstractNamespacedResourceOperator.java b/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/concurrent/AbstractNamespacedResourceOperator.java
@@ -20,6 +20,7 @@
 import io.fabric8.kubernetes.client.informers.SharedIndexInformer;
 import io.strimzi.operator.common.Reconciliation;
 import io.strimzi.operator.common.ReconciliationLogger;
+import io.strimzi.operator.common.config.ConfigParameter;
 import io.strimzi.operator.common.model.Labels;
 import io.strimzi.operator.common.operator.resource.ReconcileResult;
 
@@ -48,12 +49,6 @@ public abstract class AbstractNamespacedResourceOperator<C extends KubernetesCli
         extends AbstractResourceOperator<C, T, L, R> {
     private static final ReconciliationLogger LOGGER = ReconciliationLogger.create(AbstractNamespacedResourceOperator.class);
 
-    /**
-     * Marker for indication "all namespaces" => this is used for example when creating watches to create a cluster
-     * wide watch.
-     */
-    public static final String ANY_NAMESPACE = "*";
-
     /**
      * Constructor.
      *
@@ -356,7 +351,7 @@ public List<T> list(String namespace, Labels selector) {
      * @return  Operation with applied namespace
      */
     private FilterWatchListDeletable<T, L, R> applyNamespace(String namespace) {
-        if (ANY_NAMESPACE.equals(namespace)) {
+        if (ConfigParameter.ANY_NAMESPACE.equals(namespace)) {
             return operation().inAnyNamespace();
         } else {
             return operation().inNamespace(namespace);
diff --git a/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/concurrent/AbstractWatchableNamespacedResourceOperator.java b/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/concurrent/AbstractWatchableNamespacedResourceOperator.java
@@ -12,6 +12,7 @@
 import io.fabric8.kubernetes.client.Watcher;
 import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
 import io.fabric8.kubernetes.client.dsl.Resource;
+import io.strimzi.operator.common.config.ConfigParameter;
 
 import java.util.concurrent.Executor;
 
@@ -57,7 +58,7 @@ protected Watch watchInNamespace(String namespace, Watcher<T> watcher) {
      * @return  A Kubernetes watch instance
      */
     public Watch watch(String namespace, Watcher<T> watcher) {
-        if (ANY_NAMESPACE.equals(namespace))    {
+        if (ConfigParameter.ANY_NAMESPACE.equals(namespace))    {
             return watchInAnyNamespace(watcher);
         } else {
             return watchInNamespace(namespace, watcher);
@@ -75,7 +76,7 @@ public Watch watch(String namespace, Watcher<T> watcher) {
      */
     public Watch watch(String namespace, LabelSelector selector, Watcher<T> watcher) {
         FilterWatchListDeletable<T, L, R> operation
-                = ANY_NAMESPACE.equals(namespace) ? operation().inAnyNamespace() : operation().inNamespace(namespace);
+                = ConfigParameter.ANY_NAMESPACE.equals(namespace) ? operation().inAnyNamespace() : operation().inNamespace(namespace);
         if (selector != null) {
             operation = operation.withLabelSelector(selector);
         }
diff --git a/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/concurrent/ResourceSupport.java b/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/concurrent/ResourceSupport.java
@@ -16,8 +16,8 @@
 import io.fabric8.kubernetes.client.dsl.Watchable;
 import io.strimzi.operator.common.Reconciliation;
 import io.strimzi.operator.common.ReconciliationLogger;
+import io.strimzi.operator.common.TimeoutException;
 import io.strimzi.operator.common.Util;
-import io.strimzi.operator.common.operator.resource.TimeoutException;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/operator-common/src/test/java/io/strimzi/operator/common/operator/resource/AbstractNonNamespacedResourceOperatorTest.java b/operator-common/src/test/java/io/strimzi/operator/common/operator/resource/AbstractNonNamespacedResourceOperatorTest.java
@@ -14,6 +14,7 @@
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.strimzi.operator.common.Reconciliation;
+import io.strimzi.operator.common.TimeoutException;
 import io.vertx.core.Vertx;
 import io.vertx.core.WorkerExecutor;
 import io.vertx.junit5.Checkpoint;
diff --git a/operator-common/src/test/java/io/strimzi/operator/common/operator/resource/AbstractReadyResourceOperatorTest.java b/operator-common/src/test/java/io/strimzi/operator/common/operator/resource/AbstractReadyResourceOperatorTest.java
@@ -11,6 +11,7 @@
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.strimzi.operator.common.Reconciliation;
+import io.strimzi.operator.common.TimeoutException;
 import io.vertx.core.Vertx;
 import io.vertx.junit5.Checkpoint;
 import io.vertx.junit5.VertxTestContext;
diff --git a/systemtest/src/main/java/io/strimzi/systemtest/matchers/LogHasNoUnexpectedErrors.java b/systemtest/src/main/java/io/strimzi/systemtest/matchers/LogHasNoUnexpectedErrors.java
@@ -65,7 +65,7 @@ public void describeTo(Description description) {
     }
 
     enum LogIgnoreList {
-        CO_TIMEOUT_EXCEPTION("io.strimzi.operator.common.operator.resource.TimeoutException"),
+        CO_TIMEOUT_EXCEPTION("io.strimzi.operator.common.TimeoutException"),
         // "NO_ERROR" is necessary because DnsNameResolver prints debug information `QUERY(0), NoError(0), RD RA` after `received` operation
         NO_ERROR("NoError\\(0\\)"),
         // This is necessary for OCP 3.10 or less because of having exception handling during the patching of NetworkPolicy
diff --git a/topic-operator/src/main/java/io/strimzi/operator/topic/TopicOperatorConfig.java b/topic-operator/src/main/java/io/strimzi/operator/topic/TopicOperatorConfig.java
diff --git a/user-operator/src/main/java/io/strimzi/operator/user/UserOperatorConfig.java b/user-operator/src/main/java/io/strimzi/operator/user/UserOperatorConfig.java
