Skip to content

Commit 37fc322

Browse files
authored
Remove MirrorMaker 1 support (#10924)
Signed-off-by: Jakub Scholz <[email protected]>
1 parent aefb372 commit 37fc322

File tree

136 files changed

+111
-10993
lines changed

Some content is hidden

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

136 files changed

+111
-10993
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
### Major changes, deprecations and removals
66

7+
* Support for MirrorMaker 1 has been removed.
8+
Please make sure to migrate to MirrorMaker 2 before upgrading to Strimzi 0.46 or newer.
79
* [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.
810
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.
911

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ifneq ($(RELEASE_VERSION),latest)
1414
GITHUB_VERSION = $(RELEASE_VERSION)
1515
endif
1616

17-
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
17+
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
1818
DOCKERDIRS=docker-images/base docker-images/operator docker-images/kafka-based docker-images/maven-builder docker-images/kaniko-executor
1919
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
2020
JAVA_TARGETS=java_build java_install java_clean

api/pom.xml

-2
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@
172172
<argument>--yaml</argument>
173173
<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>
174174
<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>
175-
<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>
176175
<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>
177176
<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>
178177
<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 @@
231230
<argument>io.strimzi.api.kafka.model.connect.KafkaConnect</argument>
232231
<argument>io.strimzi.api.kafka.model.topic.KafkaTopic</argument>
233232
<argument>io.strimzi.api.kafka.model.user.KafkaUser</argument>
234-
<argument>io.strimzi.api.kafka.model.mirrormaker.KafkaMirrorMaker</argument>
235233
<argument>io.strimzi.api.kafka.model.bridge.KafkaBridge</argument>
236234
<argument>io.strimzi.api.kafka.model.connector.KafkaConnector</argument>
237235
<argument>io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2</argument>

api/src/main/java/io/strimzi/api/ResourceLabels.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class ResourceLabels {
2020
* <ul>
2121
* <li>Kafka</li>
2222
* <li>KafkaConnect</li>
23-
* <li>KafkaMirrorMaker</li>
23+
* <li>KafkaMirrorMaker2</li>
2424
* <li>KafkaBridge</li>
2525
* <li>KafkaUser</li>
2626
* <li>KafkaTopic</li>

api/src/main/java/io/strimzi/api/kafka/Crds.java

-21
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import io.strimzi.api.kafka.model.connector.KafkaConnectorList;
2323
import io.strimzi.api.kafka.model.kafka.Kafka;
2424
import io.strimzi.api.kafka.model.kafka.KafkaList;
25-
import io.strimzi.api.kafka.model.mirrormaker.KafkaMirrorMaker;
26-
import io.strimzi.api.kafka.model.mirrormaker.KafkaMirrorMakerList;
2725
import io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2;
2826
import io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2List;
2927
import io.strimzi.api.kafka.model.nodepool.KafkaNodePool;
@@ -46,15 +44,13 @@
4644
/**
4745
* "Static" information about the CRDs defined in this package
4846
*/
49-
@SuppressWarnings("deprecation") // Kafka Mirror Maker is deprecated
5047
public class Crds {
5148
@SuppressWarnings("unchecked")
5249
private static final Class<? extends CustomResource>[] CRDS = new Class[] {
5350
Kafka.class,
5451
KafkaConnect.class,
5552
KafkaTopic.class,
5653
KafkaUser.class,
57-
KafkaMirrorMaker.class,
5854
KafkaBridge.class,
5955
KafkaConnector.class,
6056
KafkaMirrorMaker2.class,
@@ -108,15 +104,6 @@ private static CustomResourceDefinition crd(Class<? extends CustomResource> cls)
108104
listKind = KafkaUser.RESOURCE_LIST_KIND;
109105
versions = KafkaUser.VERSIONS;
110106
status = new CustomResourceSubresourceStatus();
111-
} else if (cls.equals(KafkaMirrorMaker.class)) {
112-
scope = KafkaMirrorMaker.SCOPE;
113-
plural = KafkaMirrorMaker.RESOURCE_PLURAL;
114-
singular = KafkaMirrorMaker.RESOURCE_SINGULAR;
115-
group = KafkaMirrorMaker.RESOURCE_GROUP;
116-
kind = KafkaMirrorMaker.RESOURCE_KIND;
117-
listKind = KafkaMirrorMaker.RESOURCE_LIST_KIND;
118-
versions = KafkaMirrorMaker.VERSIONS;
119-
status = new CustomResourceSubresourceStatus();
120107
} else if (cls.equals(KafkaBridge.class)) {
121108
scope = KafkaBridge.SCOPE;
122109
plural = KafkaBridge.RESOURCE_PLURAL;
@@ -251,14 +238,6 @@ public static MixedOperation<KafkaUser, KafkaUserList, Resource<KafkaUser>> kafk
251238
return client.resources(KafkaUser.class, KafkaUserList.class);
252239
}
253240

254-
public static CustomResourceDefinition kafkaMirrorMaker() {
255-
return crd(KafkaMirrorMaker.class);
256-
}
257-
258-
public static MixedOperation<KafkaMirrorMaker, KafkaMirrorMakerList, Resource<KafkaMirrorMaker>> mirrorMakerOperation(KubernetesClient client) {
259-
return client.resources(KafkaMirrorMaker.class, KafkaMirrorMakerList.class);
260-
}
261-
262241
public static CustomResourceDefinition kafkaBridge() {
263242
return crd(KafkaBridge.class);
264243
}

api/src/main/java/io/strimzi/api/kafka/model/common/ClientTls.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.util.Map;
1818

1919
/**
20-
* Represent the TLS configuration for all the Clients(KafkaConnect, KafkaBridge, KafkaMirrorMaker, KafkaMirrorMaker2).
20+
* Represent the TLS configuration for all the Clients(KafkaConnect, KafkaBridge, KafkaMirrorMaker2).
2121
*/
2222
@DescriptionFile
2323
@Buildable(

api/src/main/java/io/strimzi/api/kafka/model/mirrormaker/KafkaMirrorMaker.java

-153
This file was deleted.

api/src/main/java/io/strimzi/api/kafka/model/mirrormaker/KafkaMirrorMakerClientSpec.java

-86
This file was deleted.

0 commit comments

Comments
 (0)