Merge branch 'master' into remove-as-node-port

Signed-off-by: Dongbo Xiao <[email protected]>

Author: doxiao

site/creating-domain.md

@@ -258,7 +258,6 @@ Metadata:
 Spec:
   Admin Secret:
     Name:  domain1-weblogic-credentials
-  As Env:
   As Name:  admin-server
   As Port:  7001
   Cluster Startup:

src-generated-swagger/main/java/oracle/kubernetes/operator/domain/model/oracle/kubernetes/weblogic/domain/v1/DomainSpec.java

@@ -49,9 +49,6 @@ public class DomainSpec {
   @SerializedName("asPort")
   private Integer asPort = null;
 
-  @SerializedName("asEnv")
-  private List<io.kubernetes.client.models.V1EnvVar> asEnv = null;
-
   @SerializedName("exportT3Channels")
   private List<String> exportT3Channels = null;
 
@@ -205,33 +202,9 @@ public void setAsPort(Integer asPort) {
     this.asPort = asPort;
   }
 
-  public DomainSpec asEnv(List<io.kubernetes.client.models.V1EnvVar> asEnv) {
-    this.asEnv = asEnv;
-    return this;
-  }
-
-  public DomainSpec addAsEnvItem(io.kubernetes.client.models.V1EnvVar asEnvItem) {
-    if (this.asEnv == null) {
-      this.asEnv = new ArrayList<io.kubernetes.client.models.V1EnvVar>();
-    }
-    this.asEnv.add(asEnvItem);
     return this;
   }
 
-  /**
-   * Environment variables for use in starting the administration server.
-   * 
-   * @return asEnv
-   **/
-  @ApiModelProperty(value = "Environment variables for use in starting the administration server.")
-  public List<io.kubernetes.client.models.V1EnvVar> getAsEnv() {
-    return asEnv;
-  }
-
-  public void setAsEnv(List<io.kubernetes.client.models.V1EnvVar> asEnv) {
-    this.asEnv = asEnv;
-  }
-
   public DomainSpec exportT3Channels(List<String> exportT3Channels) {
     this.exportT3Channels = exportT3Channels;
     return this;
@@ -384,7 +357,6 @@ public boolean equals(java.lang.Object o) {
         && Objects.equals(this.adminSecret, oracleKubernetesWeblogicDomainV1DomainSpec.adminSecret)
         && Objects.equals(this.asName, oracleKubernetesWeblogicDomainV1DomainSpec.asName)
         && Objects.equals(this.asPort, oracleKubernetesWeblogicDomainV1DomainSpec.asPort)
-        && Objects.equals(this.asEnv, oracleKubernetesWeblogicDomainV1DomainSpec.asEnv)
         && Objects.equals(this.exportT3Channels, oracleKubernetesWeblogicDomainV1DomainSpec.exportT3Channels)
         && Objects.equals(this.startupControl, oracleKubernetesWeblogicDomainV1DomainSpec.startupControl)
         && Objects.equals(this.serverStartup, oracleKubernetesWeblogicDomainV1DomainSpec.serverStartup)
@@ -394,7 +366,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(domainUID, domainName, image, imagePullPolicy, adminSecret, asName, asPort, asEnv,
+    return Objects.hash(domainUID, domainName, image, imagePullPolicy, adminSecret, asName, asPort, 
         exportT3Channels, startupControl, serverStartup, clusterStartup, replicas);
   }
 
@@ -410,7 +382,6 @@ public String toString() {
     sb.append("    adminSecret: ").append(toIndentedString(adminSecret)).append("\n");
     sb.append("    asName: ").append(toIndentedString(asName)).append("\n");
     sb.append("    asPort: ").append(toIndentedString(asPort)).append("\n");
-    sb.append("    asEnv: ").append(toIndentedString(asEnv)).append("\n");
     sb.append("    exportT3Channels: ").append(toIndentedString(exportT3Channels)).append("\n");
     sb.append("    startupControl: ").append(toIndentedString(startupControl)).append("\n");
     sb.append("    serverStartup: ").append(toIndentedString(serverStartup)).append("\n");

src/integration-tests/bash/archive.sh

@@ -24,20 +24,23 @@ function fail {
 function archive {
   local SOURCE_DIR="${1?}"
   local ARCHIVE_DIR="${2?}"
-  local ARCHIVE="$ARCHIVE_DIR/IntSuite.`date '+%Y%m%d%H%M%S'`.tar.gz"
+  local ARCHIVE_FILE="IntSuite.`date '+%Y%m%d%H%M%S'`.tar.gz"
+  local ARCHIVE="$ARCHIVE_DIR/$ARCHIVE_FILE"
+  local OUTFILE="/tmp/$ARCHIVE_FILE"
 
-  trace About to archive a copy of \'$SOURCE_DIR\' to \'$ARCHIVE\'.
+  trace About to archive \'$SOURCE_DIR\'.
 
   [ ! -d "$SOURCE_DIR" ] && fail Could not archive, could not find source directory \'$SOURCE_DIR\'.
 
   mkdir -p $ARCHIVE_DIR || fail Could not archive, could not create target directory \'$ARCHIVE_DIR\'.
 
-  tar -czf $ARCHIVE $SOURCE_DIR 2>&1 
-  [ $? -eq 0 ] || fail "Could not archive, 'tar -czf $ARCHIVE $SOURCE_DIR' command failed."
+  tar -czf $ARCHIVE $SOURCE_DIR > $OUTFILE 2>&1 
+  [ $? -eq 0 ] || fail "Could not archive, 'tar -czf $ARCHIVE $SOURCE_DIR' command failed: `cat $OUTFILE`"
+  rm -f $OUTFILE
 
   find $ARCHIVE_DIR -maxdepth 1 -name "IntSuite*tar.gz" | sort -r | awk '{ if (NR>5) print $NF }' | xargs rm -f
 
-  trace Archived copy of \'$SOURCE_DIR\' to \'$ARCHIVE\'.
+  trace Archived to \'$ARCHIVE\'.
 }
 
 archive "$1" "$2"

src/integration-tests/bash/job.sh

@@ -26,7 +26,7 @@ JOB_NAME="weblogic-command-job"
 
 # Customizable env vars.  See run.sh for an explanation.
 
-echo "@@ Begin command job.  Job name='$JOB_NAME'.  Command='$*'."
+echo "@@ Begin kubernetes job to run a command.  Job name='$JOB_NAME'.  Command='$*'."
 
 echo "@@ At script entry:  RESULT_ROOT='$RESULT_ROOT'"
 echo "@@ At script entry:  PV_ROOT='$PV_ROOT'"
@@ -103,15 +103,7 @@ function launchCommandJob {
       break
     fi
 
-    local pods=$(kubectl get pods  --show-all --selector=job-name=$JOB_NAME --output=jsonpath={.items..metadata.name})
-    local pod_status="unknown"
-    local pod
-    for pod in $pods; do
-      pod_status=`kubectl get pods --show-all --selector=job-name=$JOB_NAME | grep "$JOB_NAME" | awk '{ print $3 }'`
-      if [ "$pod_status" = "Completed" -o "$pod_status" = "Error" -o "$pod_status" = "ErrImagePull" ]; then
-        break
-      fi
-    done
+    local pod_status=`kubectl get pods --show-all --selector=job-name=$JOB_NAME | grep "$JOB_NAME" | awk '{ print $3 }'`
 
     if [ "$pod_status" = "Completed" ]; then
       echo "@@ Success.  job_status=$job_status pod_status=$pod_status"
@@ -140,10 +132,10 @@ function launchCommandJob {
   for pod in $pods; do
     echo @@
     echo "@@ Calling 'kubectl get pod $pod'"
-    kubectl get pod $pod 2>&1 
+    kubectl get pod $pod 2>&1
     echo @@
     echo "@@ Calling 'kubectl logs pod $pod'"
-    kubectl logs $pod 2>&1 
+    kubectl logs $pod 2>&1
     echo @@
   done