Remove MirrorMaker 1 support (#10924)

Signed-off-by: Jakub Scholz <[email protected]>
strimzi · Dec 11, 2024 · 37fc322 · 37fc322
1 parent aefb372
commit 37fc322
Show file tree

Hide file tree

Showing 136 changed files with 111 additions and 10,993 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Major changes, deprecations and removals
 
+* Support for MirrorMaker 1 has been removed.
+  Please make sure to migrate to MirrorMaker 2 before upgrading to Strimzi 0.46 or newer.
 * [Strimzi EnvVar Configuration Provider](https://github.com/strimzi/kafka-env-var-config-provider) (deprecated in Strimzi 0.38.0) and [Strimzi MirrorMaker 2 Extensions](https://github.com/strimzi/mirror-maker-2-extensions) (deprecated in Strimzi 0.28.0) plugins were removed from Strimzi container images.
   Please use the Apache Kafka [EnvVarConfigProvider](https://github.com/strimzi/kafka-env-var-config-provider?tab=readme-ov-file#deprecation-notice) and [Identity Replication Policy](https://github.com/strimzi/mirror-maker-2-extensions?tab=readme-ov-file#identity-replication-policy) instead.
 

diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ ifneq ($(RELEASE_VERSION),latest)
   GITHUB_VERSION = $(RELEASE_VERSION)
 endif
 
-SUBDIRS=kafka-agent mirror-maker-agent tracing-agent crd-annotations test crd-generator api mockkube certificate-manager operator-common config-model config-model-generator cluster-operator topic-operator user-operator kafka-init systemtest docker-images/artifacts packaging/helm-charts/helm3 packaging/install packaging/examples
+SUBDIRS=kafka-agent tracing-agent crd-annotations test crd-generator api mockkube certificate-manager operator-common config-model config-model-generator cluster-operator topic-operator user-operator kafka-init systemtest docker-images/artifacts packaging/helm-charts/helm3 packaging/install packaging/examples
 DOCKERDIRS=docker-images/base docker-images/operator docker-images/kafka-based docker-images/maven-builder docker-images/kaniko-executor
 DOCKER_TARGETS=docker_build docker_push docker_tag docker_load docker_save docker_amend_manifest docker_push_manifest docker_sign_manifest docker_delete_manifest docker_delete_archive docker_sbom docker_push_sbom
 JAVA_TARGETS=java_build java_install java_clean

diff --git a/api/pom.xml b/api/pom.xml
@@ -172,7 +172,6 @@
                                 <argument>--yaml</argument>
                                 <argument>io.strimzi.api.kafka.model.kafka.Kafka=${project.basedir}${file.separator}..${file.separator}packaging${file.separator}install${file.separator}cluster-operator${file.separator}040-Crd-kafka.yaml</argument>
                                 <argument>io.strimzi.api.kafka.model.connect.KafkaConnect=${project.basedir}${file.separator}..${file.separator}packaging${file.separator}install${file.separator}cluster-operator${file.separator}041-Crd-kafkaconnect.yaml</argument>
-                                <argument>io.strimzi.api.kafka.model.mirrormaker.KafkaMirrorMaker=${project.basedir}${file.separator}..${file.separator}packaging${file.separator}install${file.separator}cluster-operator${file.separator}045-Crd-kafkamirrormaker.yaml</argument>
                                 <argument>io.strimzi.api.kafka.model.bridge.KafkaBridge=${project.basedir}${file.separator}..${file.separator}packaging${file.separator}install${file.separator}cluster-operator${file.separator}046-Crd-kafkabridge.yaml</argument>
                                 <argument>io.strimzi.api.kafka.model.connector.KafkaConnector=${project.basedir}${file.separator}..${file.separator}packaging${file.separator}install${file.separator}cluster-operator${file.separator}047-Crd-kafkaconnector.yaml</argument>
                                 <argument>io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2=${project.basedir}${file.separator}..${file.separator}packaging${file.separator}install${file.separator}cluster-operator${file.separator}048-Crd-kafkamirrormaker2.yaml</argument>
@@ -231,7 +230,6 @@
                                 <argument>io.strimzi.api.kafka.model.connect.KafkaConnect</argument>
                                 <argument>io.strimzi.api.kafka.model.topic.KafkaTopic</argument>
                                 <argument>io.strimzi.api.kafka.model.user.KafkaUser</argument>
-                                <argument>io.strimzi.api.kafka.model.mirrormaker.KafkaMirrorMaker</argument>
                                 <argument>io.strimzi.api.kafka.model.bridge.KafkaBridge</argument>
                                 <argument>io.strimzi.api.kafka.model.connector.KafkaConnector</argument>
                                 <argument>io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2</argument>

diff --git a/api/src/main/java/io/strimzi/api/ResourceLabels.java b/api/src/main/java/io/strimzi/api/ResourceLabels.java
@@ -20,7 +20,7 @@ public class ResourceLabels {
      * <ul>
      *   <li>Kafka</li>
      *   <li>KafkaConnect</li>
-     *   <li>KafkaMirrorMaker</li>
+     *   <li>KafkaMirrorMaker2</li>
      *   <li>KafkaBridge</li>
      *   <li>KafkaUser</li>
      *   <li>KafkaTopic</li>

diff --git a/api/src/main/java/io/strimzi/api/kafka/Crds.java b/api/src/main/java/io/strimzi/api/kafka/Crds.java
@@ -22,8 +22,6 @@
 import io.strimzi.api.kafka.model.connector.KafkaConnectorList;
 import io.strimzi.api.kafka.model.kafka.Kafka;
 import io.strimzi.api.kafka.model.kafka.KafkaList;
-import io.strimzi.api.kafka.model.mirrormaker.KafkaMirrorMaker;
-import io.strimzi.api.kafka.model.mirrormaker.KafkaMirrorMakerList;
 import io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2;
 import io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2List;
 import io.strimzi.api.kafka.model.nodepool.KafkaNodePool;
@@ -46,15 +44,13 @@
 /**
  * "Static" information about the CRDs defined in this package
  */
-@SuppressWarnings("deprecation") // Kafka Mirror Maker is deprecated
 public class Crds {
     @SuppressWarnings("unchecked")
     private static final Class<? extends CustomResource>[] CRDS = new Class[] {
         Kafka.class,
         KafkaConnect.class,
         KafkaTopic.class,
         KafkaUser.class,
-        KafkaMirrorMaker.class,
         KafkaBridge.class,
         KafkaConnector.class,
         KafkaMirrorMaker2.class,
@@ -108,15 +104,6 @@ private static CustomResourceDefinition crd(Class<? extends CustomResource> cls)
             listKind = KafkaUser.RESOURCE_LIST_KIND;
             versions = KafkaUser.VERSIONS;
             status = new CustomResourceSubresourceStatus();
-        } else if (cls.equals(KafkaMirrorMaker.class)) {
-            scope = KafkaMirrorMaker.SCOPE;
-            plural = KafkaMirrorMaker.RESOURCE_PLURAL;
-            singular = KafkaMirrorMaker.RESOURCE_SINGULAR;
-            group = KafkaMirrorMaker.RESOURCE_GROUP;
-            kind = KafkaMirrorMaker.RESOURCE_KIND;
-            listKind = KafkaMirrorMaker.RESOURCE_LIST_KIND;
-            versions = KafkaMirrorMaker.VERSIONS;
-            status = new CustomResourceSubresourceStatus();
         } else if (cls.equals(KafkaBridge.class)) {
             scope = KafkaBridge.SCOPE;
             plural = KafkaBridge.RESOURCE_PLURAL;
@@ -251,14 +238,6 @@ public static MixedOperation<KafkaUser, KafkaUserList, Resource<KafkaUser>> kafk
         return client.resources(KafkaUser.class, KafkaUserList.class);
     }
 
-    public static CustomResourceDefinition kafkaMirrorMaker() {
-        return crd(KafkaMirrorMaker.class);
-    }
-
-    public static MixedOperation<KafkaMirrorMaker, KafkaMirrorMakerList, Resource<KafkaMirrorMaker>> mirrorMakerOperation(KubernetesClient client) {
-        return client.resources(KafkaMirrorMaker.class, KafkaMirrorMakerList.class);
-    }
-
     public static CustomResourceDefinition kafkaBridge() {
         return crd(KafkaBridge.class);
     }

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/common/ClientTls.java b/api/src/main/java/io/strimzi/api/kafka/model/common/ClientTls.java
@@ -17,7 +17,7 @@
 import java.util.Map;
 
 /**
- * Represent the TLS configuration for all the Clients(KafkaConnect, KafkaBridge, KafkaMirrorMaker, KafkaMirrorMaker2).
+ * Represent the TLS configuration for all the Clients(KafkaConnect, KafkaBridge, KafkaMirrorMaker2).
  */
 @DescriptionFile
 @Buildable(

diff --git a/api/src/main/java/io/strimzi/api/kafka/model/mirrormaker/KafkaMirrorMaker.java b/api/src/main/java/io/strimzi/api/kafka/model/mirrormaker/KafkaMirrorMaker.java
diff --git a/api/src/main/java/io/strimzi/api/kafka/model/mirrormaker/KafkaMirrorMakerClientSpec.java b/api/src/main/java/io/strimzi/api/kafka/model/mirrormaker/KafkaMirrorMakerClientSpec.java