OWLS-103645 - Add domain and cluster 4.0 'observedGeneration' to pod labels. (#3648)

* OWLS-103645 - Add domain and cluster 4.0 'observedGeneration' to pod labels.

Author: ankedia

operator/src/main/java/oracle/kubernetes/operator/LabelConstants.java

@@ -25,6 +25,8 @@ public interface LabelConstants {
   String MII_UPDATED_RESTART_REQUIRED_LABEL = "weblogic.configChangesPendingRestart";
   String INTROSPECTION_DOMAIN_SPEC_GENERATION = "weblogic.domainSpecGeneration";
   String TO_BE_ROLLED_LABEL = "weblogic.awaitingPodRoll";
+  String DOMAIN_OBSERVED_GENERATION_LABEL = "weblogic.domainObservedGeneration";
+  String CLUSTER_OBSERVED_GENERATION_LABEL = "weblogic.clusterObservedGeneration";
 
   static String forDomainUidSelector(String uid) {
     return String.format("%s=%s", DOMAINUID_LABEL, uid);

operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java

@@ -73,6 +73,7 @@
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
 import oracle.kubernetes.weblogic.domain.model.AuxiliaryImage;
+import oracle.kubernetes.weblogic.domain.model.ClusterResource;
 import oracle.kubernetes.weblogic.domain.model.DomainResource;
 import oracle.kubernetes.weblogic.domain.model.IntrospectorJobEnvVars;
 import oracle.kubernetes.weblogic.domain.model.MonitoringExporterSpecification;
@@ -90,6 +91,8 @@
 import static oracle.kubernetes.operator.KubernetesConstants.DEFAULT_EXPORTER_SIDECAR_PORT;
 import static oracle.kubernetes.operator.KubernetesConstants.EXPORTER_CONTAINER_NAME;
 import static oracle.kubernetes.operator.KubernetesConstants.HTTP_NOT_FOUND;
+import static oracle.kubernetes.operator.LabelConstants.CLUSTER_OBSERVED_GENERATION_LABEL;
+import static oracle.kubernetes.operator.LabelConstants.DOMAIN_OBSERVED_GENERATION_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.INTROSPECTION_STATE_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.MII_UPDATED_RESTART_REQUIRED_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.MODEL_IN_IMAGE_DOMAINZIP_HASH;
@@ -147,8 +150,9 @@ private static boolean isPatchableItem(Map.Entry<String, String> entry) {
     return isCustomerItem(entry) || PATCHABLE_OPERATOR_KEYS.contains(entry.getKey());
   }
 
-  private static final Set<String> PATCHABLE_OPERATOR_KEYS
-        = Set.of(INTROSPECTION_STATE_LABEL, OPERATOR_VERSION, MODEL_IN_IMAGE_DOMAINZIP_HASH, SHA256_ANNOTATION);
+  private static final Set<String> PATCHABLE_OPERATOR_KEYS = Set.of(INTROSPECTION_STATE_LABEL, OPERATOR_VERSION,
+      MODEL_IN_IMAGE_DOMAINZIP_HASH, SHA256_ANNOTATION, DOMAIN_OBSERVED_GENERATION_LABEL,
+      CLUSTER_OBSERVED_GENERATION_LABEL);
 
   private static boolean isCustomerItem(Map.Entry<String, String> entry) {
     return !entry.getKey().startsWith("weblogic.");
@@ -214,6 +218,10 @@ DomainResource getDomain() {
     return info.getDomain();
   }
 
+  ClusterResource getCluster(String clusterName) {
+    return info.getClusterResource(clusterName);
+  }
+
   private String getDomainName() {
     return domainTopology.getName();
   }
@@ -443,6 +451,10 @@ private Map<String, String> getNonHashedPodLabels() {
         .ifPresent(version -> result.put(INTROSPECTION_STATE_LABEL, version));
     Optional.ofNullable(productVersion)
           .ifPresent(pv -> result.put(LabelConstants.OPERATOR_VERSION, pv));
+    Optional.ofNullable(getDomain().getMetadata()).map(V1ObjectMeta::getGeneration)
+        .ifPresent(generation -> result.put(DOMAIN_OBSERVED_GENERATION_LABEL, String.valueOf(generation)));
+    Optional.ofNullable(getCluster(getClusterName())).map(ClusterResource::getMetadata).map(V1ObjectMeta::getGeneration)
+        .ifPresent(generation -> result.put(CLUSTER_OBSERVED_GENERATION_LABEL, String.valueOf(generation)));
 
     if (addRestartRequiredLabel) {
       result.put(MII_UPDATED_RESTART_REQUIRED_LABEL, "true");

operator/src/test/java/oracle/kubernetes/operator/DomainProcessorTest.java

@@ -119,9 +119,11 @@
 import static oracle.kubernetes.operator.KubernetesConstants.HTTP_NOT_FOUND;
 import static oracle.kubernetes.operator.KubernetesConstants.HTTP_OK;
 import static oracle.kubernetes.operator.LabelConstants.CLUSTERNAME_LABEL;
+import static oracle.kubernetes.operator.LabelConstants.CLUSTER_OBSERVED_GENERATION_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.CREATEDBYOPERATOR_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.DOMAINNAME_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.DOMAINUID_LABEL;
+import static oracle.kubernetes.operator.LabelConstants.DOMAIN_OBSERVED_GENERATION_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.INTROSPECTION_STATE_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.SERVERNAME_LABEL;
 import static oracle.kubernetes.operator.ProcessingConstants.DOMAIN_INTROSPECTION_COMPLETE;
@@ -486,7 +488,7 @@ void whenDomainConfiguredForMaxServers_establishMatchingPresence() {
   }
 
   @Test
-  void whenMakeRightRun_updateDomainStatus() {
+  void whenMakeRightRun_updateDomainStatusAndDomainObservedGeneration() {
     domainConfigurator.configureCluster(newInfo, CLUSTER).withReplicas(MIN_REPLICAS);
     newInfo.getReferencedClusters().forEach(testSupport::defineResources);
 
@@ -501,10 +503,26 @@ void whenMakeRightRun_updateDomainStatus() {
     assertThat(getStateGoal(updatedDomain, MANAGED_SERVER_NAMES[4]), equalTo(SHUTDOWN_STATE));
     assertThat(getResourceVersion(updatedDomain), not(getResourceVersion(domain)));
     assertThat(updatedDomain.getStatus().getObservedGeneration(), equalTo(2L));
+    assertThat(getDomainObservedGeneration(ADMIN_NAME), is("2"));
+    assertThat(getDomainObservedGeneration(getManagedServerName(1)), is("2"));
+    assertThat(getDomainObservedGeneration(getManagedServerName(2)), is("2"));
+  }
+
+  private String getDomainObservedGeneration(String name) {
+    return getObservedGeneration(name, "DOMAIN");
+  }
+
+  private String getObservedGeneration(String name, String generationType) {
+    return generationType.equals("DOMAIN") ? getPodLabels(name).get(DOMAIN_OBSERVED_GENERATION_LABEL)
+        : getPodLabels(name).get(CLUSTER_OBSERVED_GENERATION_LABEL);
+  }
+
+  private Map<String, String> getPodLabels(String name) {
+    return testSupport.<V1Pod>getResourceWithName(POD, UID + "-" + name).getMetadata().getLabels();
   }
 
   @Test
-  void whenMakeRightRun_updateClusterResourceStatus() {
+  void whenMakeRightRun_updateClusterResourceStatusAndClusterObservedGeneration() {
     ClusterResource clusterResource = createClusterResource(NS, CLUSTER);
     clusterResource.getMetadata().generation(2L);
     testSupport.defineResources(clusterResource);
@@ -515,10 +533,12 @@ void whenMakeRightRun_updateClusterResourceStatus() {
 
     ClusterResource updatedClusterResource = testSupport
         .getResourceWithName(KubernetesTestSupport.CLUSTER, CLUSTER);
+
     assertThat(updatedClusterResource.getStatus(), notNullValue());
     assertThat(updatedClusterResource.getStatus().getMinimumReplicas(), equalTo(0));
     assertThat(updatedClusterResource.getStatus().getMaximumReplicas(), equalTo(5));
     assertThat(updatedClusterResource.getStatus().getObservedGeneration(), equalTo(2L));
+    assertThat(getObservedGeneration(getManagedServerName(1), "CLUSTER"), is("2"));
   }
 
   @Test