Simplify Ca and CaReconciler logic #10809
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
* Remove code in CaReconciler that is never being executed. * Move Secret existence checking from CaReconciler to Ca. Signed-off-by: Katherine Stanley <11195226+katheris@users.noreply.github.com>
katheris
force-pushed
the
simplifyCaLogic
branch
from
16a3d41 to
b94cc00
Compare
|
/azp run regression |
|
Azure Pipelines successfully started running 1 pipeline(s). |
tombentley
approved these changes
Nov 17, 2024
|
@scholzj do you have any plan to review this one or I can proceed by merging it? Thanks! |
|
I do plan to review it when I get back. |
scholzj
reviewed
Nov 20, 2024
operator-common/src/main/java/io/strimzi/operator/common/model/Ca.java
Outdated
Show resolved
Hide resolved
...r-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/CaReconcilerTest.java
Outdated
Show resolved
Hide resolved
operator-common/src/main/java/io/strimzi/operator/common/model/Ca.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Katherine Stanley <11195226+katheris@users.noreply.github.com>
scholzj
approved these changes
Nov 21, 2024
|
/azp run zookeeper-regression |
|
Azure Pipelines successfully started running 1 pipeline(s). |
OwenCorrigan76
pushed a commit
to OwenCorrigan76/strimzi-kafka-operator
that referenced
this pull request
Dec 6, 2024
Signed-off-by: Katherine Stanley <11195226+katheris@users.noreply.github.com>
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.
Type of change
Select the type of your PR
Description
Simplify Ca and CaReconciler logic:
Here are fuller explanations of why I did the refactors.
1
Today
logRenewalState()inCa.javais only called from insideshouldCreateOrRenew(), andshouldCreateOrRenew()is only called fromcreateRenewOrReplace()and only whengenerateCaistrue. Therefore any code inlogRenewalState()that is only executed whengenerateCais false is never executed. To further simplify the code I removedlogRenewalState()completely and moved the code that is executed insideshouldCreateOrRenew().2
Today
createRenewOrReplace()inCa.javais only called (excluding test classes) fromCaReconciler.java, once for the ClusterCA and once for the ClientsCA. Prior to that call we callcheckCustomCaSecret()to verify the Secret exists. Then insideCa.javawe have additional logic to handle the case where the Secrets are null. I moved the verification logic intoCa.javato simplify the code.Checklist
Please go through this checklist and make sure all applicable tasks have been done