Merge branch 'introspection-followup' into 'main'

Fix additional problems with introspection and creation of config map

See merge request weblogic-cloud/weblogic-kubernetes-operator!4733

Author: rjeberhard

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

@@ -24,7 +24,6 @@ public interface LabelConstants {
   String INTROSPECTION_STATE_LABEL = "weblogic.introspectVersion";
   String MII_UPDATED_RESTART_REQUIRED_LABEL = "weblogic.configChangesPendingRestart";
   String INTROSPECTION_DOMAIN_SPEC_GENERATION = "weblogic.domainSpecGeneration";
-  String INTROSPECTION_CLUSTER_SPEC_GENERATION = "weblogic.clusterSpecGeneration";
   String INTROSPECTION_TIME = "weblogic.introspectionTime";
   String TO_BE_ROLLED_LABEL = "weblogic.awaitingPodRoll";
   String TO_BE_SHUTDOWN_LABEL = "weblogic.awaitingShutdown";

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

@@ -59,7 +59,6 @@
 import static oracle.kubernetes.operator.IntrospectorConfigMapConstants.SECRETS_MD_5;
 import static oracle.kubernetes.operator.IntrospectorConfigMapConstants.SIT_CONFIG_FILE_PREFIX;
 import static oracle.kubernetes.operator.KubernetesConstants.SCRIPT_CONFIG_MAP_NAME;
-import static oracle.kubernetes.operator.LabelConstants.INTROSPECTION_CLUSTER_SPEC_GENERATION;
 import static oracle.kubernetes.operator.LabelConstants.INTROSPECTION_DOMAIN_SPEC_GENERATION;
 import static oracle.kubernetes.operator.LabelConstants.INTROSPECTION_STATE_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.INTROSPECTION_TIME;
@@ -332,11 +331,6 @@ public Result onSuccess(Packet packet, KubernetesApiResponse<V1ConfigMap> callRe
             .ifPresent(value -> addLabel(INTROSPECTION_STATE_LABEL, value));
         Optional.ofNullable(domain).map(DomainResource::getMetadata).map(V1ObjectMeta::getGeneration)
             .ifPresent(value -> addLabel(INTROSPECTION_DOMAIN_SPEC_GENERATION, value.toString()));
-        DomainPresenceInfo.fromPacket(packet).map(DomainPresenceInfo::getReferencedClusters)
-            .ifPresent(list -> list.forEach(cluster -> Optional.ofNullable(cluster.getMetadata())
-                .map(V1ObjectMeta::getGeneration)
-                .ifPresent(value -> addLabel(INTROSPECTION_CLUSTER_SPEC_GENERATION + "."
-                    + cluster.getMetadata().getName(), value.toString()))));
         Optional.ofNullable((String) packet.get(INTROSPECTION_TIME))
                 .ifPresent(value -> addLabel(INTROSPECTION_TIME, value));
         V1ConfigMap existingMap = withoutTransientData(callResponse.getObject());
@@ -927,9 +921,6 @@ private void recordIntrospectVersionAndGeneration(V1ConfigMap result, Packet pac
                       () -> packet.remove(INTROSPECTION_STATE_LABEL));
       Optional.ofNullable(labels).map(l -> l.get(INTROSPECTION_DOMAIN_SPEC_GENERATION))
               .ifPresent(generation -> packet.put(INTROSPECTION_DOMAIN_SPEC_GENERATION, generation));
-      Optional.ofNullable(labels).ifPresent(x -> x.entrySet().stream()
-              .filter(entry -> entry.getKey().startsWith(INTROSPECTION_CLUSTER_SPEC_GENERATION))
-              .forEach(entry -> packet.put(entry.getKey(), entry.getValue())));
       Optional.ofNullable(labels).map(l -> l.get(INTROSPECTION_TIME))
               .ifPresent(value -> packet.put(INTROSPECTION_TIME, value));
     }

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

@@ -64,7 +64,6 @@
 import static oracle.kubernetes.operator.DomainStatusUpdater.createIntrospectionFailureSteps;
 import static oracle.kubernetes.operator.DomainStatusUpdater.createRemoveFailuresStep;
 import static oracle.kubernetes.operator.DomainStatusUpdater.createRemoveSelectedFailuresStep;
-import static oracle.kubernetes.operator.LabelConstants.INTROSPECTION_CLUSTER_SPEC_GENERATION;
 import static oracle.kubernetes.operator.LabelConstants.INTROSPECTION_DOMAIN_SPEC_GENERATION;
 import static oracle.kubernetes.operator.LabelConstants.INTROSPECTION_STATE_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.INTROSPECTION_TIME;
@@ -361,8 +360,7 @@ private Collection<String> getRunningServerNames() {
       }
 
       private boolean isBringingUpNewDomain(Packet packet) {
-        return getNumRunningServers() == 0 && creatingServers(info)
-           && (isDomainGenerationChanged(packet) || isAnyClusterGenerationChanged(packet));
+        return getNumRunningServers() == 0 && creatingServers(info) && (isDomainGenerationChanged(packet));
       }
 
       private int getNumRunningServers() {
@@ -382,31 +380,6 @@ private String getDomainGeneration() {
               .orElse("");
       }
 
-      private boolean isAnyClusterGenerationChanged(Packet packet) {
-        List<ClusterResource> referencedClusters = info.getReferencedClusters();
-        if (referencedClusters.size() != packet.entrySet().stream()
-            .filter(entry -> entry.getKey().startsWith(INTROSPECTION_CLUSTER_SPEC_GENERATION)).count()) {
-          return true;
-        }
-
-        for (ClusterResource clusterResource : referencedClusters) {
-          if (Optional.ofNullable(packet.get(INTROSPECTION_CLUSTER_SPEC_GENERATION
-                  + "." + clusterResource.getMetadata().getName()))
-                  .map(gen -> !gen.equals(getClusterGeneration(clusterResource))).orElse(true)) {
-            return true;
-          }
-        }
-
-        return false;
-      }
-
-      private String getClusterGeneration(ClusterResource clusterResource) {
-        return Optional.ofNullable(clusterResource.getMetadata())
-                .map(V1ObjectMeta::getGeneration)
-                .map(Object::toString)
-                .orElse("");
-      }
-
       // Returns true if an introspection was requested. Clears the flag in any case.
       private boolean isIntrospectionRequested(Packet packet) {
         return packet.remove(DOMAIN_INTROSPECT_REQUESTED) != null;
@@ -904,8 +877,8 @@ private Step createIntrospectorConfigMap() {
 
       // Returns a chain of steps which read the pod log and create a config map.
       private Step processIntrospectorPodLog(Step next) {
-        return Step.chain(waitForJobPod(), readNamedPodLog(), deleteIntrospectorJob(),
-                createIntrospectorConfigMap(), next);
+        return Step.chain(waitForJobPod(), readNamedPodLog(),
+            createIntrospectorConfigMap(), deleteIntrospectorJob(), next);
       }
 
       private String getName(V1Pod pod) {

operator/src/main/java/oracle/kubernetes/operator/makeright/MakeRightDomainOperationImpl.java

@@ -293,8 +293,8 @@ private Step createDomainUpPlan(DomainPresenceInfo info) {
     Step domainUpStrategy =
         Step.chain(
             ConfigMapHelper.createOrReplaceFluentdConfigMapStep(),
-            domainIntrospectionSteps(),
             ConfigMapHelper.createOrReplaceFluentbitConfigMapStep(),
+            domainIntrospectionSteps(),
             new DomainStatusStep(),
             DomainProcessorImpl.bringAdminServerUp(info),
             managedServerStrategy);