Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into feature/java-integration-tests

Author: vanajamukkara

kubernetes/samples/scripts/delete-weblogic-domain-resources.sh

@@ -14,14 +14,13 @@
 
 script="${BASH_SOURCE[0]}"
 scriptDir="$( cd "$( dirname "${script}" )" && pwd )"
-source ${scriptDir}/internal/utility.sh
+source ${scriptDir}/../../internal/utility.sh
 
 function usage {
 cat << EOF
   Usage:
 
     $(basename $0) -d domain-uid,domain-uid,... [-s max-seconds] [-t]
-    $(basename $0) -d all [-s max-seconds] [-t]
     $(basename $0) -h
 
   Perform a best-effort delete of the kubernetes resources for
@@ -62,7 +61,6 @@ EOF
 #
 # Usage:
 #   getDomainResources domainA,domainB,... outfilename
-#   getDomainResources all outfilename
 #
 # Internal helper function
 #

model/src/main/java/oracle/kubernetes/weblogic/domain/AdminServerConfigurator.java

@@ -16,4 +16,8 @@ public interface AdminServerConfigurator extends ServerConfigurator {
   AdminServerConfigurator withExportedNetworkAccessPoints(String... names);
 
   ExportedNetworkAccessPoint configureExportedNetworkAccessPoint(String channelName);
+
+  AdminServerConfigurator withNodePortLabel(String name, String value);
+
+  AdminServerConfigurator withNodePortAnnotation(String name, String value);
 }

model/src/main/java/oracle/kubernetes/weblogic/domain/ClusterConfigurator.java

@@ -43,4 +43,8 @@ ClusterConfigurator withLivenessProbeSettings(
   ClusterConfigurator withPodLabel(String name, String value);
 
   ClusterConfigurator withPodAnnotation(String name, String value);
+
+  ClusterConfigurator withServiceLabel(String name, String value);
+
+  ClusterConfigurator withServiceAnnotation(String name, String value);
 }

model/src/main/java/oracle/kubernetes/weblogic/domain/DomainConfigurator.java

@@ -37,7 +37,7 @@ protected DomainConfigurator(Domain domain) {
   /**
    * Sets the home for the domain.
    *
-   * @param home the home of the domain
+   * @param domainHome the home of the domain
    * @return this object
    */
   public DomainConfigurator withDomainHome(String domainHome) {
@@ -46,7 +46,7 @@ public DomainConfigurator withDomainHome(String domainHome) {
   }
 
   /**
-   * @param homeInImage
+   * @param domainHomeInImage
    * @return
    */
   public DomainConfigurator withDomainHomeInImage(boolean domainHomeInImage) {
@@ -110,6 +110,28 @@ public DomainConfigurator withDefaultImagePullSecrets(
     return this;
   }
 
+  /**
+   * Sets the log home value
+   *
+   * @param logHome the log home value
+   * @return this object
+   */
+  public DomainConfigurator withLogHome(String logHome) {
+    getDomainSpec().setLogHome(logHome);
+    return this;
+  }
+
+  /**
+   * Sets the log home enabled flag
+   *
+   * @param logHomeEnabled true if log home is enabled, false otherwise
+   * @return this object
+   */
+  public DomainConfigurator withLogHomeEnabled(boolean logHomeEnabled) {
+    getDomainSpec().setLogHomeEnabled(logHomeEnabled);
+    return this;
+  }
+
   /**
    * Configures the domain to use a persistent volume claim defined before the domain is created.
    *

model/src/main/java/oracle/kubernetes/weblogic/domain/ServerConfigurator.java

@@ -41,4 +41,8 @@ ServerConfigurator withReadinessProbeSettings(
   ServerConfigurator withPodLabel(String name, String value);
 
   ServerConfigurator withPodAnnotation(String name, String value);
+
+  ServerConfigurator withServiceLabel(String name, String value);
+
+  ServerConfigurator withServiceAnnotation(String name, String value);
 }

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/AdminServer.java

@@ -52,6 +52,8 @@ public String toString() {
     return new ToStringBuilder(this)
         .appendSuper(super.toString())
         .append("exportedNetworkAccessPoints", exportedNetworkAccessPoints)
+        .append("nodePortLabels", nodePortLabels)
+        .append("nodePortAnnotations", nodePortAnnotations)
         .toString();
   }
 
@@ -66,6 +68,8 @@ public boolean equals(Object o) {
     return new EqualsBuilder()
         .appendSuper(super.equals(o))
         .append(exportedNetworkAccessPoints, that.exportedNetworkAccessPoints)
+        .append(nodePortLabels, that.nodePortLabels)
+        .append(nodePortAnnotations, that.nodePortAnnotations)
         .isEquals();
   }
 
@@ -74,6 +78,20 @@ public int hashCode() {
     return new HashCodeBuilder(17, 37)
         .appendSuper(super.hashCode())
         .append(exportedNetworkAccessPoints)
+        .append(nodePortLabels)
+        .append(nodePortAnnotations)
         .toHashCode();
   }
+
+  private Map<String, String> nodePortLabels = new HashMap<>();
+
+  private Map<String, String> nodePortAnnotations = new HashMap<>();
+
+  void addNodePortLabels(String name, String value) {
+    nodePortLabels.put(name, value);
+  }
+
+  void addNodePortAnnotations(String name, String value) {
+    nodePortAnnotations.put(name, value);
+  }
 }

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/BaseConfiguration.java

@@ -194,6 +194,22 @@ void addPodAnnotations(String name, String value) {
     serverPod.addPodAnnotations(name, value);
   }
 
+  public Map<String, String> getServiceLabels() {
+    return serverPod.getServiceLabels();
+  }
+
+  void addServiceLabels(String name, String value) {
+    serverPod.addServiceLabel(name, value);
+  }
+
+  public Map<String, String> getServiceAnnotations() {
+    return serverPod.getServiceAnnotations();
+  }
+
+  void addServiceAnnotations(String name, String value) {
+    serverPod.addServiceAnnotations(name, value);
+  }
+
   @Override
   public String toString() {
     return new ToStringBuilder(this)

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainSpec.java

@@ -34,6 +34,9 @@ public class DomainSpec extends BaseConfiguration {
   /** The pattern for computing the default persistent volume claim name. */
   private static final String PVC_NAME_PATTERN = "%s-weblogic-domain-pvc";
 
+  /** The pattern for computing the default shared logs directory. */
+  private static final String LOG_HOME_DEFAULT_PATTERN = "/shared/logs/%s";
+
   /** Domain unique identifier. Must be unique across the Kubernetes cluster. (Required) */
   @SerializedName("domainUID")
   @Expose
@@ -95,6 +98,19 @@ public class DomainSpec extends BaseConfiguration {
   @Expose
   private String logHome;
 
+  /**
+   * Whether the log home is enabled.
+   *
+   * @since 2.0
+   */
+  @SerializedName("logHomeEnabled")
+  @Expose
+  @Description(
+      "Specified whether the log home folder is enabled (Not required). "
+          + "Defaults to true if domainHomeInImage is false. "
+          + "Defaults to false if domainHomeInImage is true. ")
+  private Boolean logHomeEnabled; // Boolean object, null if unspecified
+
   /** Whether to include the server .out file to the pod's stdout. Default is true. */
   @SerializedName("includeServerOutInPodLog")
   @Expose
@@ -157,7 +173,9 @@ public class DomainSpec extends BaseConfiguration {
    */
   @SerializedName("domainHomeInImage")
   @Expose
-  private boolean domainHomeInImage;
+  @Description(
+      "Flag indicating whether the domain home is part of the image. Default value is true. ")
+  private boolean domainHomeInImage = true;
 
   /** The definition of the storage used for this domain. */
   @SerializedName("storage")
@@ -461,7 +479,7 @@ public void setImagePullSecrets(@Nullable List<V1LocalObjectReference> imagePull
    *     server .out files in.
    */
   public String getLogHome() {
-    return logHome;
+    return Optional.ofNullable(logHome).orElse(String.format(LOG_HOME_DEFAULT_PATTERN, domainUID));
   }
 
   public void setLogHome(String logHome) {
@@ -473,6 +491,29 @@ public DomainSpec withLogHome(String logHome) {
     return this;
   }
 
+  /**
+   * Log home enabled
+   *
+   * @since 2.0
+   * @return log home enabled
+   */
+  public boolean getLogHomeEnabled() {
+    if (logHomeEnabled == null) {
+      return !isDomainHomeInImage();
+    }
+    return logHomeEnabled.booleanValue();
+  }
+
+  /**
+   * Log home enabled
+   *
+   * @since 2.0
+   * @param logHomeEnabled log home enabled
+   */
+  public void setLogHomeEnabled(boolean logHomeEnabled) {
+    this.logHomeEnabled = new Boolean(logHomeEnabled);
+  }
+
   /**
    * Whether to include server .out to the pod's stdout
    *
@@ -641,6 +682,7 @@ public String toString() {
             .append("clusters", clusters)
             .append("replicas", replicas)
             .append("logHome", logHome)
+            .append("logHomeEnabled", logHomeEnabled)
             .append("includeServerOutInPodLog", includeServerOutInPodLog)
             .append("configOverrides", configOverrides)
             .append("configOverrideSecrets", configOverrideSecrets);
@@ -669,6 +711,7 @@ public int hashCode() {
             .append(clusters)
             .append(replicas)
             .append(logHome)
+            .append(logHomeEnabled)
             .append(includeServerOutInPodLog)
             .append(configOverrides)
             .append(configOverrideSecrets);
@@ -701,6 +744,7 @@ public boolean equals(Object other) {
             .append(clusters, rhs.clusters)
             .append(replicas, rhs.replicas)
             .append(logHome, rhs.logHome)
+            .append(logHomeEnabled, rhs.logHomeEnabled)
             .append(includeServerOutInPodLog, rhs.includeServerOutInPodLog)
             .append(configOverrides, rhs.configOverrides)
             .append(configOverrideSecrets, rhs.configOverrideSecrets);

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainV2Configurator.java

@@ -136,6 +136,18 @@ public AdminServerConfigurator withNodePort(int nodePort) {
       return this;
     }
 
+    @Override
+    public AdminServerConfigurator withNodePortLabel(String name, String value) {
+      adminServer.addNodePortLabels(name, value);
+      return this;
+    }
+
+    @Override
+    public AdminServerConfigurator withNodePortAnnotation(String name, String value) {
+      adminServer.addNodePortAnnotations(name, value);
+      return this;
+    }
+
     @Override
     public AdminServerConfigurator withExportedNetworkAccessPoints(String... names) {
       for (String name : names) {
@@ -304,6 +316,18 @@ public ServerConfigurator withPodAnnotation(String name, String value) {
       server.addPodAnnotations(name, value);
       return this;
     }
+
+    @Override
+    public ServerConfigurator withServiceLabel(String name, String value) {
+      server.addServiceLabels(name, value);
+      return this;
+    }
+
+    @Override
+    public ServerConfigurator withServiceAnnotation(String name, String value) {
+      server.addServiceAnnotations(name, value);
+      return this;
+    }
   }
 
   @Override
@@ -436,5 +460,17 @@ public ClusterConfigurator withPodAnnotation(String name, String value) {
       cluster.addPodAnnotations(name, value);
       return this;
     }
+
+    @Override
+    public ClusterConfigurator withServiceLabel(String name, String value) {
+      cluster.addServiceLabels(name, value);
+      return this;
+    }
+
+    @Override
+    public ClusterConfigurator withServiceAnnotation(String name, String value) {
+      cluster.addServiceAnnotations(name, value);
+      return this;
+    }
   }
 }