Address comments from Lukas

Signed-off-by: OwenCorrigan76 <[email protected]>

Author: OwenCorrigan76

api/src/main/java/io/strimzi/kafka/access/model/KafkaAccessStatus.java

@@ -22,6 +22,7 @@
 public class KafkaAccessStatus {
 
     private BindingStatus binding;
+    private Long observedGeneration;
     private final List<Condition> conditions = new ArrayList<>();
 
     /**
@@ -76,4 +77,30 @@ public void setReadyCondition(final boolean ready, final String message, final S
             StatusUtils.buildReadyCondition(ready, reason, message)
         );
     }
+
+    /**
+     * Gets the observed generation of the KafkaAccess resource.
+     *
+     * @return The observed generation.
+     */
+    public Long getObservedGeneration() {
+        return observedGeneration;
+    }
+
+    /**
+     * Sets the observed generation of the KafkaAccess resource.
+     *
+     * <p>
+     * The **observed generation** is a key field in a Kubernetes resource's status.
+     * It is used by the controller to track the {@link io.fabric8.kubernetes.api.model.ObjectMeta#getGeneration() metadata.generation}
+     * of the resource that has been successfully reconciled. By setting this field,
+     * the controller signals that the reported status accurately reflects the state
+     * of the corresponding resource specification.
+     * </p>
+     *
+     * @param observedGeneration The generation number of the processed resource specification.
+     */
+    public void setObservedGeneration(Long observedGeneration) {
+        this.observedGeneration = observedGeneration;
+    }
 }

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

@@ -97,6 +97,8 @@ public UpdateControl<KafkaAccess> reconcile(final KafkaAccess kafkaAccess, final
 
         kafkaAccessStatus.setBinding(new BindingStatus(secretName));
         kafkaAccessStatus.setReadyCondition(true, "Ready", "Ready");
+        // replaces using the old ObservedGenerationAwareStatus method
+        kafkaAccessStatus.setObservedGeneration(kafkaAccess.getMetadata().getGeneration());
 
         return UpdateControl.patchStatus(kafkaAccess);
     }

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

@@ -72,7 +72,7 @@ public class KafkaAccessReconcilerTest {
     @BeforeEach
     void beforeEach() {
         operator = new Operator(overrider -> overrider.withKubernetesClient(client)
-                .withUseSSAToPatchPrimaryResource(false));
+                .withUseSSAToPatchPrimaryResource(false)); // Motivation: mock Kubernetes client doesn't fully support some SSA features.
         operator.register(new KafkaAccessReconciler(operator.getKubernetesClient()));
         operator.start();
     }

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

@@ -5,7 +5,6 @@
 package io.strimzi.kafka.access;
 
 import io.fabric8.kubernetes.api.model.Secret;
-import io.fabric8.kubernetes.api.model.SecretBuilder;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
@@ -86,17 +85,8 @@ void testSecretDataWithTls() {
         final String cert = encodeUtf8("-----BEGIN CERTIFICATE-----\nMIIFLTCCAx\n-----END CERTIFICATE-----\n");
         final Map<String, String> certSecretData = new HashMap<>();
         certSecretData.put("ca.crt", cert);
-//        final Secret certSecret = ResourceProvider.getStrimziSecret(KafkaResources.clusterCaCertificateSecretName(KAFKA_NAME), KAFKA_NAMESPACE, KAFKA_NAME);
-//        certSecret.setData(certSecretData);
-        // Use SecretBuilder to create the Secret
-        final Secret certSecret = new SecretBuilder()
-                .withNewMetadata()
-                .withName(KafkaResources.clusterCaCertificateSecretName(KAFKA_NAME))
-                .withNamespace(KAFKA_NAMESPACE)
-                .endMetadata()
-                .addToData(certSecretData)
-                .build();
-
+        final Secret certSecret = ResourceProvider.getStrimziSecret(KafkaResources.clusterCaCertificateSecretName(KAFKA_NAME), KAFKA_NAMESPACE, KAFKA_NAME);
+        certSecret.setData(certSecretData);
         final Kafka kafka = ResourceProvider.getKafka(
                 KAFKA_NAME,
                 KAFKA_NAMESPACE,

packaging/helm-charts/helm3/strimzi-access-operator/crds/040-Crd-kafkaaccess.yaml

@@ -94,6 +94,8 @@ spec:
                     type: object
                     x-kubernetes-preserve-unknown-fields: true
                   type: array
+                observedGeneration:
+                  type: integer
               type: object
           type: object
       served: true

packaging/install/040-Crd-kafkaaccess.yaml

@@ -94,6 +94,8 @@ spec:
                     type: object
                     x-kubernetes-preserve-unknown-fields: true
                   type: array
+                observedGeneration:
+                  type: integer
               type: object
           type: object
       served: true