Skip to content

Commit f23e2c0

Browse files
Address comments
Signed-off-by: OwenCorrigan76 <[email protected]>
1 parent e063acb commit f23e2c0

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

operator/src/main/java/io/strimzi/kafka/access/KafkaAccessReconciler.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
/**
3838
* The custom reconciler of Strimzi Access Operator
3939
*/
40-
@SuppressWarnings({"ClassFanOutComplexity"})
40+
@SuppressWarnings("ClassFanOutComplexity")
4141
@ControllerConfiguration
4242
public class KafkaAccessReconciler implements Reconciler<KafkaAccess> {
4343

@@ -141,7 +141,8 @@ private void createOrUpdateSecret(final Map<String, String> data, final KafkaAcc
141141
}
142142

143143
/**
144-
* Prepares the event sources required for triggering the reconciliation. This tells the JOSDK framework which resources the operator needs to watch.
144+
* Prepares the event sources required for triggering the reconciliation.
145+
* It configures the JOSDK framework with resources the operator needs to watch.
145146
*
146147
* @param context The EventSourceContext for KafkaAccess resource
147148
*

operator/src/test/java/io/strimzi/kafka/access/KafkaAccessReconcilerTest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,12 @@ public class KafkaAccessReconcilerTest {
7272
@BeforeEach
7373
void beforeEach() {
7474
operator = new Operator(overrider -> overrider.withKubernetesClient(client)
75-
.withUseSSAToPatchPrimaryResource(false)); // Motivation: mock Kubernetes client doesn't fully support some SSA features.
75+
/**
76+
* Disables the use of Server-Side Apply for patching the primary resource.
77+
* Motivation: Mock Kubernetes client doesn't fully support SSA features.
78+
* See: <a href="https://github.com/fabric8io/kubernetes-client/issues/5337">fabric8io/kubernetes-client Issue #5337</a>
79+
**/
80+
.withUseSSAToPatchPrimaryResource(false));
7681
operator.register(new KafkaAccessReconciler(operator.getKubernetesClient()));
7782
operator.start();
7883
}
@@ -323,6 +328,7 @@ void testReconcileWithExistingSecret() {
323328
customAnnotation.put("my-custom", "annotation");
324329
secret.setMetadata(new ObjectMetaBuilder(secret.getMetadata()).addToAnnotations(customAnnotation).build());
325330
client.secrets().inNamespace(NAMESPACE).resource(secret).create();
331+
326332
client.resources(KafkaAccess.class).resource(kafkaAccess).create();
327333
client.resources(KafkaAccess.class).inNamespace(NAMESPACE).withName(NAME).waitUntilCondition(updatedKafkaAccess -> {
328334
final Optional<String> bindingName = Optional.ofNullable(updatedKafkaAccess)

pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
<!-- Runtime dependencies -->
7272
<javaoperatorsdk.version>5.1.2</javaoperatorsdk.version>
7373
<fabric8.version>7.2.0</fabric8.version>
74-
<fabric8-client.version>7.4.0</fabric8-client.version>
7574
<sundrio.version>0.200.0</sundrio.version>
7675
<strimzi.version>0.48.0</strimzi.version>
7776
<kafka.clients.version>4.1.0</kafka.clients.version>

0 commit comments

Comments
 (0)