Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Chore - cleanup redundant quota plugin code #496

Merged
merged 1 commit into from
Sep 6, 2021
Merged

Chore - cleanup redundant quota plugin code #496

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions operator/src/main/java/org/bf2/operator/operands/KafkaCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
import org.bf2.operator.operands.KafkaInstanceConfiguration.AccessControl;
import org.bf2.operator.resources.v1alpha1.ManagedKafka;
import org.bf2.operator.resources.v1alpha1.ServiceAccount;
import org.bf2.operator.resources.v1alpha1.Versions;
import org.bf2.operator.secrets.ImagePullSecretManager;
import org.bf2.operator.secrets.SecuritySecretManager;
import org.eclipse.microprofile.config.Config;
Expand Down Expand Up @@ -96,7 +95,6 @@ public class KafkaCluster extends AbstractKafkaCluster {
private static final String KAFKA_EXPORTER_LOG_LEVEL = "logLevel";

private static final String DIGEST = "org.bf2.operator/digest";
private static final String ORG_APACHE_KAFKA_SERVER_QUOTA_STATIC_QUOTA_CALLBACK = "org.apache.kafka.server.quota.StaticQuotaCallback";
private static final String IO_STRIMZI_KAFKA_QUOTA_STATIC_QUOTA_CALLBACK = "io.strimzi.kafka.quotas.StaticQuotaCallback";

private static final String SERVICE_ACCOUNT_KEY = "managedkafka.kafka.acl.service-accounts.%s";
Expand Down Expand Up @@ -464,9 +462,7 @@ private Map<String, Object> buildKafkaConfig(ManagedKafka managedKafka, Kafka cu

private void addQuotaConfig(ManagedKafka managedKafka, Kafka current, Map<String, Object> config) {

Versions versions = managedKafka.getSpec().getVersions();
boolean legacyQuotaClass = versions.getStrimzi().endsWith("0.23.0-0");
config.put("client.quota.callback.class", legacyQuotaClass ? ORG_APACHE_KAFKA_SERVER_QUOTA_STATIC_QUOTA_CALLBACK : IO_STRIMZI_KAFKA_QUOTA_STATIC_QUOTA_CALLBACK);
config.put("client.quota.callback.class", IO_STRIMZI_KAFKA_QUOTA_STATIC_QUOTA_CALLBACK);

// Throttle at Ingress/Egress MB/sec per broker
Quantity ingressEgressThroughputPerSec = managedKafka.getSpec().getCapacity().getIngressEgressThroughputPerSec();
Expand Down