Skip to content

Commit e63ade5

Browse files
scholzjscholzj
authored
Remove Vert.x dependency from the operator-common module and from UO and TO (strimzi#9887)
Signed-off-by: Jakub Scholz <[email protected]>
1 parent a13058f commit e63ade5

File tree

170 files changed

+457
-495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+457
-495
lines changed

‎cluster-operator/scripts/cluster_operator_run.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,6 @@ if [[ -z "$STRIMZI_OPERATOR_NAME" ]]; then
3333
export STRIMZI_OPERATOR_NAME
3434
fi
3535

36+
export JAVA_OPTS="${JAVA_OPTS} -Dvertx.cacheDirBase=/tmp/vertx-cache"
37+
3638
exec "${STRIMZI_HOME}/bin/launch_java.sh"

‎cluster-operator/src/main/java/io/strimzi/operator/cluster/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
import io.strimzi.operator.cluster.operator.assembly.KafkaMirrorMakerAssemblyOperator;
1919
import io.strimzi.operator.cluster.operator.assembly.KafkaRebalanceAssemblyOperator;
2020
import io.strimzi.operator.cluster.operator.resource.ResourceOperatorSupplier;
21+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ClusterRoleOperator;
2122
import io.strimzi.operator.common.MetricsProvider;
2223
import io.strimzi.operator.common.MicrometerMetricsProvider;
2324
import io.strimzi.operator.common.OperatorKubernetesClientBuilder;
2425
import io.strimzi.operator.common.Reconciliation;
2526
import io.strimzi.operator.common.Util;
2627
import io.strimzi.operator.common.model.PasswordGenerator;
27-
import io.strimzi.operator.common.operator.resource.ClusterRoleOperator;
2828
import io.strimzi.operator.common.operator.resource.ReconcileResult;
2929
import io.vertx.core.CompositeFuture;
3030
import io.vertx.core.Future;

‎operator-common/src/main/java/io/strimzi/operator/common/VertxUtil.java renamed to ‎cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/VertxUtil.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright Strimzi authors.
33
* License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
44
*/
5-
package io.strimzi.operator.common;
5+
package io.strimzi.operator.cluster.operator;
66

77
import io.fabric8.kubernetes.api.model.Secret;
88
import io.strimzi.api.kafka.model.common.CertSecretSource;
@@ -13,7 +13,11 @@
1313
import io.strimzi.api.kafka.model.common.authentication.KafkaClientAuthenticationScram;
1414
import io.strimzi.api.kafka.model.common.authentication.KafkaClientAuthenticationTls;
1515
import io.strimzi.certs.CertAndKey;
16-
import io.strimzi.operator.common.operator.resource.SecretOperator;
16+
import io.strimzi.operator.cluster.operator.resource.kubernetes.SecretOperator;
17+
import io.strimzi.operator.common.InvalidConfigurationException;
18+
import io.strimzi.operator.common.Reconciliation;
19+
import io.strimzi.operator.common.ReconciliationLogger;
20+
import io.strimzi.operator.common.TimeoutException;
1721
import io.vertx.core.Future;
1822
import io.vertx.core.Handler;
1923
import io.vertx.core.Promise;

‎cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/AbstractAssemblyOperator.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
import io.strimzi.operator.cluster.model.ImagePullPolicy;
1818
import io.strimzi.operator.cluster.model.KafkaVersion;
1919
import io.strimzi.operator.cluster.operator.resource.ResourceOperatorSupplier;
20+
import io.strimzi.operator.cluster.operator.resource.kubernetes.AbstractWatchableStatusedNamespacedResourceOperator;
21+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ClusterRoleBindingOperator;
22+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ConfigMapOperator;
23+
import io.strimzi.operator.cluster.operator.resource.kubernetes.PodDisruptionBudgetOperator;
24+
import io.strimzi.operator.cluster.operator.resource.kubernetes.SecretOperator;
25+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ServiceAccountOperator;
26+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ServiceOperator;
2027
import io.strimzi.operator.common.Reconciliation;
2128
import io.strimzi.operator.common.model.PasswordGenerator;
22-
import io.strimzi.operator.common.operator.resource.AbstractWatchableStatusedNamespacedResourceOperator;
23-
import io.strimzi.operator.common.operator.resource.ClusterRoleBindingOperator;
24-
import io.strimzi.operator.common.operator.resource.ConfigMapOperator;
25-
import io.strimzi.operator.common.operator.resource.PodDisruptionBudgetOperator;
26-
import io.strimzi.operator.common.operator.resource.SecretOperator;
27-
import io.strimzi.operator.common.operator.resource.ServiceAccountOperator;
28-
import io.strimzi.operator.common.operator.resource.ServiceOperator;
2929
import io.vertx.core.Future;
3030
import io.vertx.core.Vertx;
3131

‎cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/AbstractConnectOperator.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,17 @@
3939
import io.strimzi.operator.cluster.model.RestartReasons;
4040
import io.strimzi.operator.cluster.model.SharedEnvironmentProvider;
4141
import io.strimzi.operator.cluster.operator.resource.ResourceOperatorSupplier;
42+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ClusterRoleBindingOperator;
43+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ConfigMapOperator;
44+
import io.strimzi.operator.cluster.operator.resource.kubernetes.CrdOperator;
45+
import io.strimzi.operator.cluster.operator.resource.kubernetes.DeploymentOperator;
46+
import io.strimzi.operator.cluster.operator.resource.kubernetes.NetworkPolicyOperator;
47+
import io.strimzi.operator.cluster.operator.resource.kubernetes.PodDisruptionBudgetOperator;
48+
import io.strimzi.operator.cluster.operator.resource.kubernetes.PodOperator;
49+
import io.strimzi.operator.cluster.operator.resource.kubernetes.SecretOperator;
50+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ServiceAccountOperator;
51+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ServiceOperator;
52+
import io.strimzi.operator.cluster.operator.resource.kubernetes.StrimziPodSetOperator;
4253
import io.strimzi.operator.common.Annotations;
4354
import io.strimzi.operator.common.BackOff;
4455
import io.strimzi.operator.common.Reconciliation;
@@ -47,18 +58,7 @@
4758
import io.strimzi.operator.common.model.Labels;
4859
import io.strimzi.operator.common.model.StatusDiff;
4960
import io.strimzi.operator.common.model.StatusUtils;
50-
import io.strimzi.operator.common.operator.resource.ClusterRoleBindingOperator;
51-
import io.strimzi.operator.common.operator.resource.ConfigMapOperator;
52-
import io.strimzi.operator.common.operator.resource.CrdOperator;
53-
import io.strimzi.operator.common.operator.resource.DeploymentOperator;
54-
import io.strimzi.operator.common.operator.resource.NetworkPolicyOperator;
55-
import io.strimzi.operator.common.operator.resource.PodDisruptionBudgetOperator;
56-
import io.strimzi.operator.common.operator.resource.PodOperator;
5761
import io.strimzi.operator.common.operator.resource.ReconcileResult;
58-
import io.strimzi.operator.common.operator.resource.SecretOperator;
59-
import io.strimzi.operator.common.operator.resource.ServiceAccountOperator;
60-
import io.strimzi.operator.common.operator.resource.ServiceOperator;
61-
import io.strimzi.operator.common.operator.resource.StrimziPodSetOperator;
6262
import io.vertx.core.Future;
6363
import io.vertx.core.Promise;
6464
import io.vertx.core.Vertx;

‎cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/AbstractOperator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@
1515
import io.strimzi.api.kafka.model.common.ConditionBuilder;
1616
import io.strimzi.api.kafka.model.common.Spec;
1717
import io.strimzi.api.kafka.model.kafka.Status;
18+
import io.strimzi.operator.cluster.operator.VertxUtil;
19+
import io.strimzi.operator.cluster.operator.resource.kubernetes.AbstractWatchableStatusedNamespacedResourceOperator;
1820
import io.strimzi.operator.common.Annotations;
1921
import io.strimzi.operator.common.MetricsProvider;
2022
import io.strimzi.operator.common.Reconciliation;
2123
import io.strimzi.operator.common.ReconciliationException;
2224
import io.strimzi.operator.common.ReconciliationLogger;
2325
import io.strimzi.operator.common.TimeoutException;
2426
import io.strimzi.operator.common.Util;
25-
import io.strimzi.operator.common.VertxUtil;
2627
import io.strimzi.operator.common.metrics.OperatorMetricsHolder;
2728
import io.strimzi.operator.common.model.InvalidConfigParameterException;
2829
import io.strimzi.operator.common.model.InvalidResourceException;
2930
import io.strimzi.operator.common.model.Labels;
3031
import io.strimzi.operator.common.model.NamespaceAndName;
3132
import io.strimzi.operator.common.model.StatusDiff;
3233
import io.strimzi.operator.common.model.StatusUtils;
33-
import io.strimzi.operator.common.operator.resource.AbstractWatchableStatusedNamespacedResourceOperator;
3434
import io.vertx.core.AsyncResult;
3535
import io.vertx.core.Future;
3636
import io.vertx.core.Handler;
@@ -61,7 +61,7 @@
6161
* </ul>
6262
* @param <T> The Java representation of the Kubernetes resource, e.g. {@code Kafka} or {@code KafkaConnect}
6363
* @param <O> The "Resource Operator" for the source resource type. Typically, this will be some instantiation of
64-
* {@link io.strimzi.operator.common.operator.resource.CrdOperator}.
64+
* {@link io.strimzi.operator.cluster.operator.resource.kubernetes.CrdOperator}.
6565
*/
6666
public abstract class AbstractOperator<
6767
T extends CustomResource<P, S>,

‎cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/BrokersInUseCheck.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
import io.strimzi.api.kafka.model.kafka.KafkaResources;
88
import io.strimzi.operator.cluster.model.KafkaCluster;
9+
import io.strimzi.operator.cluster.operator.VertxUtil;
910
import io.strimzi.operator.common.AdminClientProvider;
1011
import io.strimzi.operator.common.Reconciliation;
1112
import io.strimzi.operator.common.ReconciliationLogger;
12-
import io.strimzi.operator.common.VertxUtil;
1313
import io.strimzi.operator.common.auth.TlsPemIdentity;
1414
import io.vertx.core.Future;
1515
import io.vertx.core.Vertx;

‎cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/CaReconciler.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
import io.strimzi.operator.cluster.operator.resource.ZooKeeperRoller;
3030
import io.strimzi.operator.cluster.operator.resource.ZookeeperLeaderFinder;
3131
import io.strimzi.operator.cluster.operator.resource.events.KubernetesRestartEventPublisher;
32+
import io.strimzi.operator.cluster.operator.resource.kubernetes.DeploymentOperator;
33+
import io.strimzi.operator.cluster.operator.resource.kubernetes.PodOperator;
34+
import io.strimzi.operator.cluster.operator.resource.kubernetes.SecretOperator;
35+
import io.strimzi.operator.cluster.operator.resource.kubernetes.StrimziPodSetOperator;
3236
import io.strimzi.operator.common.AdminClientProvider;
3337
import io.strimzi.operator.common.Annotations;
3438
import io.strimzi.operator.common.BackOff;
@@ -43,11 +47,7 @@
4347
import io.strimzi.operator.common.model.InvalidResourceException;
4448
import io.strimzi.operator.common.model.Labels;
4549
import io.strimzi.operator.common.model.PasswordGenerator;
46-
import io.strimzi.operator.common.operator.resource.DeploymentOperator;
47-
import io.strimzi.operator.common.operator.resource.PodOperator;
4850
import io.strimzi.operator.common.operator.resource.ReconcileResult;
49-
import io.strimzi.operator.common.operator.resource.SecretOperator;
50-
import io.strimzi.operator.common.operator.resource.StrimziPodSetOperator;
5151
import io.vertx.core.Future;
5252
import io.vertx.core.Promise;
5353
import io.vertx.core.Vertx;

‎cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ConnectBuildOperator.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
import io.strimzi.operator.cluster.model.KafkaConnectBuildUtils;
2020
import io.strimzi.operator.cluster.model.KafkaConnectDockerfile;
2121
import io.strimzi.operator.cluster.operator.resource.ResourceOperatorSupplier;
22+
import io.strimzi.operator.cluster.operator.resource.kubernetes.BuildConfigOperator;
23+
import io.strimzi.operator.cluster.operator.resource.kubernetes.BuildOperator;
24+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ConfigMapOperator;
25+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ImageStreamOperator;
26+
import io.strimzi.operator.cluster.operator.resource.kubernetes.PodOperator;
27+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ServiceAccountOperator;
2228
import io.strimzi.operator.common.Annotations;
2329
import io.strimzi.operator.common.InvalidConfigurationException;
2430
import io.strimzi.operator.common.Reconciliation;
2531
import io.strimzi.operator.common.ReconciliationLogger;
2632
import io.strimzi.operator.common.Util;
27-
import io.strimzi.operator.common.operator.resource.BuildConfigOperator;
28-
import io.strimzi.operator.common.operator.resource.BuildOperator;
29-
import io.strimzi.operator.common.operator.resource.ConfigMapOperator;
30-
import io.strimzi.operator.common.operator.resource.ImageStreamOperator;
31-
import io.strimzi.operator.common.operator.resource.PodOperator;
32-
import io.strimzi.operator.common.operator.resource.ServiceAccountOperator;
3333
import io.vertx.core.Future;
3434

3535
import java.util.List;

‎cluster-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/CruiseControlReconciler.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@
2121
import io.strimzi.operator.cluster.model.KafkaVersion;
2222
import io.strimzi.operator.cluster.model.NodeRef;
2323
import io.strimzi.operator.cluster.operator.resource.ResourceOperatorSupplier;
24+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ConfigMapOperator;
25+
import io.strimzi.operator.cluster.operator.resource.kubernetes.DeploymentOperator;
26+
import io.strimzi.operator.cluster.operator.resource.kubernetes.NetworkPolicyOperator;
27+
import io.strimzi.operator.cluster.operator.resource.kubernetes.SecretOperator;
28+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ServiceAccountOperator;
29+
import io.strimzi.operator.cluster.operator.resource.kubernetes.ServiceOperator;
2430
import io.strimzi.operator.common.Annotations;
2531
import io.strimzi.operator.common.Reconciliation;
2632
import io.strimzi.operator.common.ReconciliationLogger;
2733
import io.strimzi.operator.common.Util;
2834
import io.strimzi.operator.common.model.Ca;
2935
import io.strimzi.operator.common.model.Labels;
3036
import io.strimzi.operator.common.model.PasswordGenerator;
31-
import io.strimzi.operator.common.operator.resource.ConfigMapOperator;
32-
import io.strimzi.operator.common.operator.resource.DeploymentOperator;
33-
import io.strimzi.operator.common.operator.resource.NetworkPolicyOperator;
3437
import io.strimzi.operator.common.operator.resource.ReconcileResult;
35-
import io.strimzi.operator.common.operator.resource.SecretOperator;
36-
import io.strimzi.operator.common.operator.resource.ServiceAccountOperator;
37-
import io.strimzi.operator.common.operator.resource.ServiceOperator;
3838
import io.vertx.core.Future;
3939

4040
import java.time.Clock;

0 commit comments

Comments
 (0)