Fix CC not restarted when API secret changes #9616
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
The user may need to create new CC API credentials because they may have been compromised. This can be done by simply deleting the secret containing CC API credentials, which is then recreated by the CO. The problem is that CC is not restarted, which leads to the following Rebalance error: ```sh 2024-01-29 17:44:08 ERROR KafkaRebalanceAssemblyOperator:483 - Reconciliation strimzi#64(kafkarebalance-watch) KafkaRebalance(test/my-rebalance): Status updated to [NotReady] due to error: Unexpected status code 401 for request to my-cluster-cruise-control.test.svc:9090/kafkacruisecontrol/rebalance?json=true&dryrun=true&verbose=true&skip_hard_goal_check=false&rebalance_disk=false ``` To fix this issue, I'm adding the API secret hash as CC annotation, so that any change will trigger a CC pod restart. Signed-off-by: Federico Valeri <fedevaleri@gmail.com>
scholzj
reviewed
Jan 30, 2024
...tor/src/main/java/io/strimzi/operator/cluster/operator/assembly/CruiseControlReconciler.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Federico Valeri <fedevaleri@gmail.com>
|
@scholzj I'm now hashing all passwords in the API secret. Test updated. |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
...er-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ReconcilerUtils.java
Fixed
Show fixed
Hide fixed
kyguy
reviewed
Jan 30, 2024
...er-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ReconcilerUtils.java
Outdated
Show resolved
Hide resolved
...tor/src/main/java/io/strimzi/operator/cluster/operator/assembly/CruiseControlReconciler.java
Outdated
Show resolved
Hide resolved
kyguy
reviewed
Jan 30, 2024
...er-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ReconcilerUtils.java
Outdated
Show resolved
Hide resolved
scholzj
reviewed
Jan 30, 2024
...tor/src/main/java/io/strimzi/operator/cluster/operator/assembly/CruiseControlReconciler.java
Outdated
Show resolved
Hide resolved
...er-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ReconcilerUtils.java
Outdated
Show resolved
Hide resolved
...er-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ReconcilerUtils.java
Outdated
Show resolved
Hide resolved
...er-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ReconcilerUtils.java
Outdated
Show resolved
Hide resolved
...rator/src/main/java/io/strimzi/operator/cluster/operator/assembly/KafkaAssemblyOperator.java
Outdated
Show resolved
Hide resolved
...src/test/java/io/strimzi/operator/cluster/operator/assembly/CruiseControlReconcilerTest.java
Outdated
Show resolved
Hide resolved
...er-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ReconcilerUtils.java
Outdated
Show resolved
Hide resolved
...er-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ReconcilerUtils.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Federico Valeri <fedevaleri@gmail.com>
Signed-off-by: Federico Valeri <fedevaleri@gmail.com>
Signed-off-by: Federico Valeri <fedevaleri@gmail.com>
ppatierno
approved these changes
Jan 31, 2024
...er-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ReconcilerUtils.java
Outdated
Show resolved
Hide resolved
...er-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ReconcilerUtils.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Federico Valeri <fedevaleri@gmail.com>
scholzj
reviewed
Feb 1, 2024
...er-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ReconcilerUtils.java
Outdated
Show resolved
Hide resolved
|
/azp run regression |
|
Azure Pipelines successfully started running 1 pipeline(s). |
scholzj
reviewed
Feb 1, 2024
...er-operator/src/main/java/io/strimzi/operator/cluster/operator/assembly/ReconcilerUtils.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Federico Valeri <fedevaleri@gmail.com>
|
@scholzj I tried |
|
/azp run regression |
|
Azure Pipelines successfully started running 1 pipeline(s). |
scholzj
approved these changes
Feb 2, 2024
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 user may need to create new CC API credentials because they may have been compromised. This can be done by simply deleting the secret containing CC API credentials, which is then recreated by the CO. The problem is that CC is not restarted, which leads to the following Rebalance error:
2024-01-29 17:44:08 ERROR KafkaRebalanceAssemblyOperator:483 - Reconciliation #64(kafkarebalance-watch) KafkaRebalance(test/my-rebalance): Status updated to [NotReady] due to error: Unexpected status code 401 for request to my-cluster-cruise-control.test.svc:9090/kafkacruisecontrol/rebalance?json=true&dryrun=true&verbose=true&skip_hard_goal_check=false&rebalance_disk=falseTo fix this issue, I'm adding the API secret hash as CC annotation, so that any change will trigger a CC pod restart.