Merge branch 'reduce-domain-incomplete-status' into 'main'

Add restful management api disabled option and reduce number of events for...

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

Author: rjeberhard

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

@@ -91,6 +91,8 @@
 import static oracle.kubernetes.operator.EventConstants.WEBHOOK_STARTUP_FAILED_EVENT;
 import static oracle.kubernetes.operator.EventConstants.WEBLOGIC_OPERATOR_COMPONENT;
 import static oracle.kubernetes.operator.calls.ResponseStep.isForbidden;
+import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.DOMAIN_INCOMPLETE;
+import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.DOMAIN_UNAVAILABLE;
 import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.NAMESPACE_WATCHING_STARTED;
 import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.NAMESPACE_WATCHING_STOPPED;
 import static oracle.kubernetes.operator.helpers.NamespaceHelper.getOperatorNamespace;
@@ -218,6 +220,11 @@ private Step createReplaceEventCall(EventsV1Event event, @NotNull EventsV1Event
       existingEvent.series(new EventsV1EventSeries()
           .lastObservedTime(event.getEventTime())
           .count(Optional.ofNullable(existingEvent.getSeries()).map(EventsV1EventSeries::getCount).orElse(1) + 1));
+      // Short circuit domain incomplete unavailable events
+      if (existingEvent.getSeries().getCount() > 5 && (DOMAIN_INCOMPLETE == eventData.eventItem
+          || DOMAIN_UNAVAILABLE == eventData.eventItem)) {
+        return getNext();
+      }
       return RequestBuilder.EVENT.update(existingEvent,
           new ReplaceEventResponseStep(this, existingEvent, getNext()));
     }

operator/src/main/java/oracle/kubernetes/operator/steps/ReadHealthStep.java

@@ -191,7 +191,10 @@ static final class ReadHealthWithHttpStep extends Step {
     @Override
     public @Nonnull Result apply(Packet packet) {
       ReadHealthProcessing processing = new ReadHealthProcessing(packet, service, pod);
-      if (processing.getWlsServerConfig() == null) {
+
+      if (processing.getWlsServerConfig() == null
+              || "false".equalsIgnoreCase(processing.getWlsDomainConfig().getRestfulAPIEnabled())) {
+        LOGGER.fine("Skipping read health request because wls server config is null or restful API is disabled");
         return doNext(packet);
       }
       return doNext(createRequestStep(processing.createRequest(), new RecordHealthStep(getNext())), packet);

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/WlsDomainConfig.java

@@ -30,6 +30,8 @@ public class WlsDomainConfig implements WlsDomain {
 
   private String adminServerName;
 
+  private String restfulAPIEnabled;
+
   // Contains all configured WLS clusters in the WLS domain
   private List<WlsClusterConfig> configuredClusters = new ArrayList<>();
   // Contains all statically configured WLS servers in the WLS domain
@@ -62,6 +64,7 @@ public WlsDomainConfig(String name) {
   public WlsDomainConfig(
       String name,
       String adminServerName,
+      String restfulAPIEnabled,
       Map<String, WlsClusterConfig> wlsClusterConfigs,
       Map<String, WlsServerConfig> wlsServerConfigs,
       Map<String, WlsServerConfig> wlsServerTemplates) {
@@ -72,6 +75,7 @@ public WlsDomainConfig(
         wlsServerTemplates != null ? new ArrayList<>(wlsServerTemplates.values()) : null;
     this.name = name;
     this.adminServerName = adminServerName;
+    this.restfulAPIEnabled = restfulAPIEnabled;
     // set domainConfig for each WlsClusterConfig
     for (WlsClusterConfig wlsClusterConfig : this.configuredClusters) {
       wlsClusterConfig.setWlsDomainConfig(this);
@@ -113,6 +117,18 @@ public void setAdminServerName(String adminServerName) {
     this.adminServerName = adminServerName;
   }
 
+  /**
+   * Return whether restful management api is enabled.
+   * @return "true" if enabled, otherwise "false"
+   */
+  public String getRestfulAPIEnabled() {
+    return this.restfulAPIEnabled;
+  }
+
+  public void setRestfulAPIEnabled(String restfulAPIEnabled) {
+    this.restfulAPIEnabled = restfulAPIEnabled;
+  }
+
   /**
    * Returns all cluster configurations found in the WLS domain.
    *
@@ -354,6 +370,7 @@ public String toString() {
     return new ToStringBuilder(this)
         .append("name", name)
         .append("adminServerName", adminServerName)
+        .append("restfulAPIEnabled", restfulAPIEnabled)
         .append("configuredClusters", configuredClusters)
         .append("servers", servers)
         .append("serverTemplates", serverTemplates)
@@ -366,6 +383,7 @@ public int hashCode() {
         new HashCodeBuilder()
             .append(name)
             .append(adminServerName)
+            .append(restfulAPIEnabled)
             .append(configuredClusters)
             .append(servers)
             .append(serverTemplates);
@@ -385,6 +403,7 @@ public boolean equals(Object other) {
         new EqualsBuilder()
             .append(name, rhs.name)
             .append(adminServerName, rhs.adminServerName)
+            .append(restfulAPIEnabled, rhs.restfulAPIEnabled)
             .append(configuredClusters, rhs.configuredClusters)
             .append(servers, rhs.servers)
             .append(serverTemplates, rhs.serverTemplates);

operator/src/main/resources/scripts/introspectDomain.py

@@ -194,6 +194,10 @@ def open(self):
     readDomain(self.getDomainHome())
     self.domain = cmo
     self.DOMAIN_NAME = self.getDomain().getName()
+    self.RESTAPI_ENABLED = "true"
+    mgmtsvc = self.getDomain().getRestfulManagementServices()
+    if mgmtsvc != None and not mgmtsvc.isEnabled():
+      self.RESTAPI_ENABLED = "false"
 
     # this should only be done for model in image case
     if self.DOMAIN_SOURCE_TYPE == "FromModel" or self.INIT_DOMAIN_ON_PV is not None:
@@ -816,6 +820,7 @@ def addDomain(self):
     self.indent()
     self.writeln("name: " + self.name(self.env.getDomain()))
     self.writeln("adminServerName: " + self.quote(self.env.getDomain().getAdminServerName()))
+    self.writeln('restfulAPIEnabled: ' + self.env.RESTAPI_ENABLED)
     self.addConfiguredClusters()
     self.addServerTemplates()
     self.addNonClusteredServers()

operator/src/test/java/oracle/kubernetes/operator/utils/WlsDomainConfigSupport.java

@@ -19,6 +19,7 @@ public class WlsDomainConfigSupport {
   public static final Integer DEFAULT_LISTEN_PORT = 7001;
   private final String domain;
   private String adminServerName;
+  private String restfulAPIEnabled;
   private final Map<String, WlsClusterConfig> wlsClusters = new HashMap<>();
   private final Map<String, WlsServerConfig> wlsServers = new HashMap<>();
   private final Map<String, WlsServerConfig> templates = new HashMap<>();
@@ -56,6 +57,11 @@ public WlsDomainConfigSupport withAdminServerName(String adminServerName) {
     return this;
   }
 
+  public WlsDomainConfigSupport withRestfulAPIEnabled(String restfulAPIEnabled) {
+    setAdminServerName(restfulAPIEnabled);
+    return this;
+  }
+
   public void setAdminServerName(String adminServerName) {
     this.adminServerName = adminServerName;
   }
@@ -209,7 +215,7 @@ public WlsDomainConfig createDomainConfig() {
       }
     }
     return new WlsDomainConfig(
-        domain, adminServerName, wlsClusters, wlsServers, templates);
+        domain, adminServerName, restfulAPIEnabled, wlsClusters, wlsServers, templates);
   }
 
   static class ServerConfigBuilder {