Configure new version of the quota plugin #719
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SamBarker
reviewed
May 5, 2022
operator/src/main/java/org/bf2/operator/operands/KafkaCluster.java
Outdated
Show resolved
Hide resolved
k-wall
changed the title
allow kafka and zookeeper images to be overridden (supports development use-cases)
grdryn
approved these changes
May 11, 2022
MikeEdgar
approved these changes
May 11, 2022
Comment on lines
+622
to
+626
| KafkaInstanceConfiguration.Kafka kafka = instanceConfig.getKafka(); | ||
| config.put("client.quota.callback.usageMetrics.topic", String.valueOf(kafka.getQuotaCallbackUsageMetricsTopic())); | ||
| config.put("client.quota.callback.quotaPolicy.check-interval", String.valueOf(kafka.getQuotaCallbackQuotaPolicyCheckInterval())); | ||
| config.put("client.quota.callback.kafka.clientIdPrefix", String.valueOf(kafka.getQuotaCallbackQuotaKafkaClientIdPrefix())); | ||
| config.put("client.quota.callback.static.storage.check-interval", String.valueOf(instanceConfig.getStorage().getCheckInterval())); |
There was a problem hiding this comment.
Just to mention it, the OperandOverride class supports additionalProperties that can be used to configure properties specific to a Strimzi bundle deployment version.
That can be leveraged to only apply new/changed properties alongside the image updates they align with. I think ultimately we'll want to use that (or something like it) to extend support for blast-radius control to include configuration as well.
There was a problem hiding this comment.
Thanks - that's useful. In this case, the new config is just adds so it is harmless to pass new config to the old plugin.
|
@SamBarker can you re-review, once you are happy I believe this is good to merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The new quota plugin requires additional configuration options. This PR passes those options. The new configuration options will be ignored by the older version of the plugin, so will be safe for older bundle versions.
This PR also let's you override the kafka/zookeeper images via either the configmap or fleetshard environment variables. Just set a env var on the deployment like this and it will override the image provided by the rhosak bundle.