Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Fix CC not restarted when API secret changes #9616

Merged
merged 7 commits into from
Feb 2, 2024
Merged

Fix CC not restarted when API secret changes #9616

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a299de8
Fix CC not restarted when API secret changes
fvaleri Jan 30, 2024
3bc11ba
Hash passwords instead of using Secret hashCode
fvaleri Jan 30, 2024
48c6f05
Address review comments
fvaleri Jan 31, 2024
22bd567
Update comment
fvaleri Jan 31, 2024
be67803
Remove unnecessary changes
fvaleri Jan 31, 2024
97b0991
Address new comments from review
fvaleri Jan 31, 2024
aeb6dbc
Use full secret content
fvaleri Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions .../src/main/java/io/strimzi/operator/cluster/operator/assembly/CruiseControlReconciler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import io.strimzi.operator.cluster.model.KafkaVersion;
import io.strimzi.operator.cluster.model.NodeRef;
import io.strimzi.operator.cluster.operator.resource.ResourceOperatorSupplier;
import io.strimzi.operator.common.Annotations;
import io.strimzi.operator.common.Reconciliation;
import io.strimzi.operator.common.ReconciliationLogger;
import io.strimzi.operator.common.Util;
Expand Down Expand Up @@ -68,7 +69,8 @@ public class CruiseControlReconciler {

private String serverConfigurationHash = "";
private String capacityConfigurationHash = "";

private String apiCredentialsHash = "";

/**
* Constructs the Cruise Control reconciler
*
Expand Down Expand Up @@ -249,6 +251,8 @@ protected Future<Void> apiSecret() {
newSecret.setData(oldSecret.getData());
}

this.apiCredentialsHash = String.valueOf(newSecret.hashCode());
fvaleri marked this conversation as resolved.
Show resolved Hide resolved

return secretOperator.reconcile(reconciliation, reconciliation.namespace(), CruiseControlResources.apiSecretName(reconciliation.name()), newSecret)
.map((Void) null);
});
Expand Down Expand Up @@ -285,7 +289,8 @@ protected Future<Void> deployment(boolean isOpenShift, ImagePullPolicy imagePull
podAnnotations.put(Ca.ANNO_STRIMZI_IO_CLUSTER_CA_KEY_GENERATION, String.valueOf(clusterCa.caKeyGeneration()));
podAnnotations.put(CruiseControl.ANNO_STRIMZI_SERVER_CONFIGURATION_HASH, serverConfigurationHash);
podAnnotations.put(CruiseControl.ANNO_STRIMZI_CAPACITY_CONFIGURATION_HASH, capacityConfigurationHash);

podAnnotations.put(Annotations.ANNO_STRIMZI_AUTH_HASH, apiCredentialsHash);

Deployment deployment = cruiseControl.generateDeployment(podAnnotations, isOpenShift, imagePullPolicy, imagePullSecrets);

return deploymentOperator
Expand Down
2 changes: 2 additions & 0 deletions .../test/java/io/strimzi/operator/cluster/operator/assembly/CruiseControlReconcilerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import io.strimzi.operator.cluster.model.KafkaVersion;
import io.strimzi.operator.cluster.model.NodeRef;
import io.strimzi.operator.cluster.operator.resource.ResourceOperatorSupplier;
import io.strimzi.operator.common.Annotations;
import io.strimzi.operator.common.Reconciliation;
import io.strimzi.operator.common.model.PasswordGenerator;
import io.strimzi.operator.common.operator.MockCertManager;
Expand Down Expand Up @@ -151,6 +152,7 @@ public void reconcileEnabledCruiseControl(VertxTestContext context) {
assertThat(deployCaptor.getValue(), is(notNullValue()));
assertThat(deployCaptor.getAllValues().get(0).getSpec().getTemplate().getMetadata().getAnnotations().get(CruiseControl.ANNO_STRIMZI_SERVER_CONFIGURATION_HASH), is("f6dc41c7"));
assertThat(deployCaptor.getAllValues().get(0).getSpec().getTemplate().getMetadata().getAnnotations().get(CruiseControl.ANNO_STRIMZI_CAPACITY_CONFIGURATION_HASH), is("1eb49220"));
assertThat(deployCaptor.getAllValues().get(0).getSpec().getTemplate().getMetadata().getAnnotations().get(Annotations.ANNO_STRIMZI_AUTH_HASH), notNullValue());

async.flag();
})));
Expand Down