Merge remote-tracking branch 'origin/develop' into affinity

rjeberhard · rjeberhard · commit 594417acf4b0 · 2019-08-03T18:43:50.000-04:00
diff --git a/docs-source/content/_index.md b/docs-source/content/_index.md
@@ -17,8 +17,8 @@ Oracle is finding ways for organizations using WebLogic Server to run important
 The fastest way to experience the operator is to follow the [Quick Start guide]({{< relref "/quickstart/_index.md" >}}), or you can peruse our [documentation]({{< relref "/userguide/_index.md" >}}), read our [blogs](https://blogs.oracle.com/weblogicserver/updated-weblogic-kubernetes-support-with-operator-20), or try out the [samples]({{< relref "/samples/_index.md" >}}).
 
 ***
-The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.2.1.
-This release was published on June 20, 2019.
+The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.3.0.
+This release was published on .
 ***
 
 #### Operator earlier versions
diff --git a/docs-source/content/quickstart/get-images.md b/docs-source/content/quickstart/get-images.md
@@ -19,7 +19,7 @@ and accept the license agreement for the [WebLogic Server image](https://hub.doc
 1. Pull the operator image:
 
     ```bash
-    $ docker pull oracle/weblogic-kubernetes-operator:2.2.1
+    $ docker pull oracle/weblogic-kubernetes-operator:2.3.0
     ```
 
 1. Pull the Traefik load balancer image:
diff --git a/docs-source/content/quickstart/install.md b/docs-source/content/quickstart/install.md
@@ -57,7 +57,7 @@ $ helm install stable/traefik \
     $ helm install kubernetes/charts/weblogic-operator \
       --name sample-weblogic-operator \
       --namespace sample-weblogic-operator-ns \
-      --set image=oracle/weblogic-kubernetes-operator:2.2.1 \
+      --set image=oracle/weblogic-kubernetes-operator:2.3.0 \
       --set serviceAccount=sample-weblogic-operator-sa \
       --set "domainNamespaces={}" \
       --wait
diff --git a/docs-source/content/release-notes.md b/docs-source/content/release-notes.md
@@ -8,8 +8,9 @@ draft: false
 
 | Date | Version | Introduces backward incompatibilities | Change |
 | --- | --- | --- | --- |
-| June 20, 2019 | v2.2.1 | no  | The operator now supports Kubernetes 1.14.0+.  This release is primarily a bug fix release and resolves the following issues:<br><ul><li>Servers in domains, where the domain home is on a persistent volume, would sometimes fail to start. These failures would be during the introspection phase following a full domain shutdown.  Now, the introspection script better handles the relevant error conditions.</li><li>The domain resource provides an option to <a href="https://github.com/oracle/weblogic-kubernetes-operator/blob/master/docs/domains/Domain.md#server-service">pre-create Kubernetes services</a> for WebLogic Servers that are not yet running so that the DNS addresses of these services are resolvable.  These services are now created as non-headless so that they have an IP address.</li></ul> 
-| June 6, 2019 | v2.2.0 | no  | Added support for FMW Infrastructure domains. WebLogic Server instances are now gracefully shut down by default and shutdown options are configurable. Operator is now built and runs on JDK 11. 
+|  | v2.3.0 | no  | 
+| June 20, 2019 | v2.2.1 | no  | The operator now supports Kubernetes 1.14.0+.  This release is primarily a bug fix release and resolves the following issues:<br><ul><li>Servers in domains, where the domain home is on a persistent volume, would sometimes fail to start. These failures would be during the introspection phase following a full domain shutdown.  Now, the introspection script better handles the relevant error conditions.</li><li>The domain resource provides an option to <a href="https://github.com/oracle/weblogic-kubernetes-operator/blob/master/docs/domains/Domain.md#server-service">pre-create Kubernetes services</a> for WebLogic Servers that are not yet running so that the DNS addresses of these services are resolvable.  These services are now created as non-headless so that they have an IP address.</li></ul>
+| June 6, 2019 | v2.2.0 | no  | Added support for FMW Infrastructure domains. WebLogic Server instances are now gracefully shut down by default and shutdown options are configurable. Operator is now built and runs on JDK 11.
 | April 4, 2019 | v2.1 | no  | Customers can add init and sidecar containers to generated pods.  
 | March 4, 2019 | v2.0.1 | no  | OpenShift support is now certified.  Many bug fixes, including fixes for configuration overrides, cluster services, and domain status processing.  
 | January 24, 2019 | v2.0 | yes; not compatible with 1.x releases, but is compatible with 2.0-rc2. | Final version numbers and documentation updates.  
diff --git a/docs-source/content/samples/simple/storage/_index.md b/docs-source/content/samples/simple/storage/_index.md
@@ -68,7 +68,7 @@ The PV and PVC creation inputs can be customized by editing the `create-pv-pvc-i
 
 #### Shared versus dedicated PVC
 
-By default, the `domainUID` is left empty in the inputs file, which means the generated PV and PVC will not be associated with a particular domain, but can be shared by multiple domain resources in the same Kubernetes namespaces as the PV and PVC.
+By default, the `domainUID` is left empty in the inputs file, which means the generated PV and PVC will not be associated with a particular domain, but can be shared by multiple domain resources in the same Kubernetes namespaces as the PV and PVC. If the PV/PVC is being shared across domains, then, as a best practice, you should specify a unique `baseName`.
 
 For the use cases where dedicated PV and PVC are desired for a particular domain, the `domainUID` needs to be set in the `create-pv-pvc-inputs.yaml` file. The presence of a non-empty `domainUID` in the inputs file will cause the generated PV and PVC to be associated with the specified `domainUID`. The association includes that the names of the generated YAML files and the Kubernetes PV and PVC objects are decorated with the `domainUID`, and the PV and PVC objects are also labeled with the `domainUID`.
 
diff --git a/docs-source/content/userguide/introduction/architecture.md b/docs-source/content/userguide/introduction/architecture.md
@@ -18,7 +18,7 @@ The operator is packaged in a [Docker image](https://hub.docker.com/r/oracle/web
 
 ```
 $ docker login
-$ docker pull oracle/weblogic-kubernetes-operator:2.2.1
+$ docker pull oracle/weblogic-kubernetes-operator:2.3.0
 ```
 
 For more details on acquiring the operator image and prerequisites for installing the operator, consult the [Quick Start guide]({{< relref "/quickstart/_index.md" >}}).
diff --git a/docs-source/content/userguide/managing-domains/domain-lifecycle/restarting.md b/docs-source/content/userguide/managing-domains/domain-lifecycle/restarting.md
@@ -161,7 +161,7 @@ d. Update the `image` property of the domain resource specifying the new image n
      ```
         domain:
               spec:
-                   image: oracle/weblogic-updated:2.2.1
+                   image: oracle/weblogic-updated:2.3.0
      ```
 e. The operator will now initiate a rolling restart, which will apply the updated image, for all the server pods in the domain.
 
diff --git a/docs-source/content/userguide/managing-operators/using-the-operator/using-helm.md b/docs-source/content/userguide/managing-operators/using-the-operator/using-helm.md
@@ -101,7 +101,7 @@ javaLoggingLevel:  "FINE"
 
 Specifies the Docker image containing the operator code.
 
-Defaults to `weblogic-kubernetes-operator:2.2.1`.
+Defaults to `weblogic-kubernetes-operator:2.3.0`.
 
 Example:
 ```
diff --git a/integration-tests/README.md b/integration-tests/README.md
@@ -7,8 +7,8 @@ This documentation describes the functional use cases that are covered in integr
 The tests currently run in three modes: "shared cluster", "Jenkins", and "standalone" Oracle Linux, where the mode is controlled by the `SHARED_CLUSTER` and `JENKINS` environment variables described below. The default is "standalone".
 
 * "Standalone" Oracle Linux, i.e, run the tests manually with the `mvn` command.
-* Shared cluster - http://build.weblogick8s.org:8080/job/weblogic-kubernetes-operator-quicktest/
-* Jenkins - http://wls-jenkins.us.oracle.com/view/weblogic-operator/job/weblogic-kubernetes-operator-javatest/ - Jenkins Run is restricted to Oracle Internal development process.
+* Shared cluster(remote k8s cluster) - http://build.weblogick8s.org:8080/job/weblogic-kubernetes-operator-quicktest/
+* Jenkins - http://wls-jenkins.us.oracle.com/view/weblogic-operator/job/weblogic-kubernetes-operator-javatest/ - Jenkins Run is restricted to Oracle Internal development process. 
 
 Shared cluster runs only Quick test use cases, Jenkins runs both Quick and Full test use cases.
 
@@ -183,18 +183,18 @@ K8sTestUtils - uses k8s java client api, this is used only for delete domain use
 * export WEBLOGIC_IMAGE_NAME and WEBLOGIC_IMAGE_TAG if different from container-registry.oracle.com/middleware/weblogic and 12.2.1.3
 * Setup docker access to WebLogic 12c Images 
 
- Method 1 
-  - Setup a personal account on container-registry.oracle.com
-  - Then sign in to container-registry.oracle.com and signup for access to WebLogic 12.2.1.3 images from container-registry.oracle.com/middleware/weblogic:12.2.1.3
-  - Then export the following before running the tests: 
+  * Method 1 
+    - Setup a personal account on container-registry.oracle.com
+    - Then sign in to container-registry.oracle.com and signup for access to WebLogic 12.2.1.3 images from container-registry.oracle.com/middleware/weblogic:12.2.1.3
+    - Then export the following before running the tests: 
 	```
 	export OCR_USERNAME=<ocr_username>
 	export OCR_PASSWORD=<ocr_password>
 	```
  
- Method 2 
- - Make sure the weblogic image i.e. container-registry.oracle.com/middleware/weblogic:12.2.1.3 already exists locally in a docker repository the k8s cluster can access
- - Make sure the weblogic image has patch p29135930 (required for the WebLogic Kubernetes Operator). 
+  * Method 2 
+    - Make sure the weblogic image i.e. container-registry.oracle.com/middleware/weblogic:12.2.1.3 already exists locally in a docker repository the k8s cluster can access
+    - Make sure the weblogic image has patch p29135930 (required for the WebLogic Kubernetes Operator). 
 		
 		
 * Command to run the tests: 
@@ -296,20 +296,19 @@ JUnit test results can be seen at "integration-tests/target/failsafe-reports/TES
 
 # How to run JRF domain In Operator related tests
 * Setup docker access to FMW Infrastructure 12c Image and Oracle Database 12c Image
-
- Method 1 
-  - Setup a personal account on container-registry.oracle.com
-  - Then sign in to container-registry.oracle.com and accept license for access to Oracle Database 12c Images:  **_container-registry.oracle.com/database/enterprise:12.2.0.1-slim_**
-  - And get access to FMW Infrastructure 12c Image: **_container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3_**
-  - export the following before running the tests:
+   * Method 1 
+      - Setup a personal account on container-registry.oracle.com
+      - Then sign in to container-registry.oracle.com and accept license for access to Oracle Database 12c Images:  **_container-registry.oracle.com/database/enterprise:12.2.0.1-slim_**
+      - And get access to FMW Infrastructure 12c Image: **_container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3_**
+      - export the following before running the tests:
     ```
     export REPO_USERNAME=<ocr_username>
     export REPO_PASSWORD=<ocr_password>
     export REPO_EMAIL=<ocr_email>
     ```
  
- Method 2 
- - Make sure the FMW Infrastructure image i.e. **_container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3_** and the Oracle database image i.e. **_container-registry.oracle.com/database/enterprise:12.2.0.1-slim_** already exist locally in a docker repository the k8s cluster can access
+   * Method 2 
+     - Make sure the FMW Infrastructure image i.e. **_container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3_** and the Oracle database image i.e. **_container-registry.oracle.com/database/enterprise:12.2.0.1-slim_** already exist locally in a docker repository the k8s cluster can access
 		
 * Command to run the tests: 
 ```
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java b/integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java
@@ -538,7 +538,7 @@ public void testAdminT3Channel(Domain domain) throws Exception {
 
   /**
    * Verify t3channel port by a JMS connection.
-   *
+   * This method is not used. See OWLS-76081
    * @throws Exception exception
    */
   public void testAdminT3ChannelWithJms(Domain domain) throws Exception {
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ItOperator.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ItOperator.java
@@ -468,7 +468,8 @@ public void testAutoAndCustomSitConfigOverrides() throws Exception {
       domain11 = TestUtils.createDomain(domainMap);
       domain11.verifyDomainCreated();
       testBasicUseCases(domain11);
-      testAdminT3ChannelWithJms(domain11);
+      // OWLS-76081 - commenting the below check as its not a generic usecase that works for all images, it needs wlthint3client.jar 
+      // testAdminT3ChannelWithJms(domain11);
       testCompletedSuccessfully = true;
 
     } finally {
diff --git a/integration-tests/src/test/resources/setupenv.sh b/integration-tests/src/test/resources/setupenv.sh
@@ -2,79 +2,6 @@
 # Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
-function clean_jenkins {
-  echo "Cleaning."
-  /usr/local/packages/aime/ias/run_as_root "${PROJECT_ROOT}/src/integration-tests/bash/clean_docker_k8s.sh -y"
-}
-
-function setup_jenkins {
-  echo "Setting up."
-  /usr/local/packages/aime/ias/run_as_root "sh ${PROJECT_ROOT}/src/integration-tests/bash/install_docker_k8s.sh -y -u wls -v ${K8S_VERSION}"
-  if [ $? -ne 0 ]; then
-	  echo "k8s installation is not successful"
-	  exit 1
-  fi
-  set +x
-  . ~/.dockerk8senv
-  set -x
-  id
-
-  docker images
-
-  if [ "$JRF_ENABLED" = true ] ; then
-	pull_tag_images_jrf	
-  else
-  	pull_tag_images
-  fi
-
-  export JAR_VERSION="`grep -m1 "<version>" pom.xml | cut -f2 -d">" | cut -f1 -d "<"`"
-  # create a docker image for the operator code being tested
-  docker build --build-arg http_proxy=$http_proxy --build-arg https_proxy=$https_proxy --build-arg no_proxy=$no_proxy -t "${IMAGE_NAME_OPERATOR}:${IMAGE_TAG_OPERATOR}"  --build-arg VERSION=$JAR_VERSION --no-cache=true .
-  docker tag "${IMAGE_NAME_OPERATOR}:${IMAGE_TAG_OPERATOR}" weblogic-kubernetes-operator:latest
-  
-  docker images
-    
-  echo "Helm installation starts" 
-  wget -q -O  /tmp/helm-v2.8.2-linux-amd64.tar.gz https://kubernetes-helm.storage.googleapis.com/helm-v2.8.2-linux-amd64.tar.gz
-  mkdir /tmp/helm
-  tar xzf /tmp/helm-v2.8.2-linux-amd64.tar.gz -C /tmp/helm
-  chmod +x /tmp/helm/linux-amd64/helm
-  /usr/local/packages/aime/ias/run_as_root "cp /tmp/helm/linux-amd64/helm /usr/bin/"
-  rm -rf /tmp/helm
-  helm init
-  echo "Helm is configured."
-}
-
-function docker_login {
-
-  set +x 
-  if [ -z "$DOCKER_USERNAME" ] || [ -z "$DOCKER_PASSWORD" ]; then
-        echo "DOCKER_USERNAME and DOCKER_PASSWORD not set !!!"
-	exit 1
-  fi
-  
-  if [ -n "$DOCKER_USERNAME" ] && [ -n "$DOCKER_PASSWORD" ]; then  
-	  echo "Creating Docker Secret"
-	  
-	  kubectl create secret docker-registry $IMAGE_PULL_SECRET_WEBLOGIC  \
-	    --docker-server=index.docker.io/v1/ \
-	    --docker-username=$DOCKER_USERNAME \
-	    --docker-password=$DOCKER_PASSWORD \
-            --dry-run -o yaml | kubectl apply -f -
-	  
-	  echo "Checking Secret"
-	  SECRET="`kubectl get secret $IMAGE_PULL_SECRET_WEBLOGIC | grep $IMAGE_PULL_SECRET_WEBLOGIC | wc | awk ' { print $1; }'`"
-	  if [ "$SECRET" != "1" ]; then
-	    echo "secret $IMAGE_PULL_SECRET_WEBLOGIC was not created successfully"
-	    exit 1
-	  fi
-	  # below docker pull is needed to get wlthint3client.jar from image to put in the classpath
-	  docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-  fi
-  set -x
-
-}
-
 function setup_shared_cluster {
   echo "Perform setup for running on shared cluster"
   echo "Install tiller"
@@ -103,7 +30,7 @@ function clean_shared_cluster {
 	${PROJECT_ROOT}/src/integration-tests/bash/cleanup.sh
 }
 
-function pull_tag_images {
+function create_image_pull_secret_wl {
 
   set +x 
   if [ -z "$OCR_USERNAME" ] || [ -z "$OCR_PASSWORD" ]; then
@@ -115,7 +42,6 @@ function pull_tag_images {
   
   if [ -n "$OCR_USERNAME" ] && [ -n "$OCR_PASSWORD" ]; then  
 	  echo "Creating Docker Secret"
-	  
 	  kubectl create secret docker-registry $IMAGE_PULL_SECRET_WEBLOGIC  \
 	    --docker-server=${OCR_SERVER}/ \
 	    --docker-username=$OCR_USERNAME \
@@ -128,11 +54,6 @@ function pull_tag_images {
 	    echo "secret $IMAGE_PULL_SECRET_WEBLOGIC was not created successfully"
 	    exit 1
 	  fi
-	  # below docker pull is needed to get wlthint3client.jar from image to put in the classpath
-          # echo "docker login -u $OCR_USERNAME -p $OCR_PASSWORD ${OCR_SERVER}"
-	  docker login -u $OCR_USERNAME -p $OCR_PASSWORD ${OCR_SERVER}
-          # echo "docker pull $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC"
-   	  docker pull $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC
   fi
   set -x
 }
@@ -153,7 +74,7 @@ function pull_tag_images_jrf {
   fi
 
   # reuse the create secret logic
-  pull_tag_images
+  create_image_pull_secret_wl
 
   # pull fmw infra images
   docker pull $IMAGE_NAME_FMWINFRA:$IMAGE_TAG_FMWINFRA
@@ -164,17 +85,6 @@ function pull_tag_images_jrf {
   set -x
 }
 
-function get_wlthint3client_from_image {
-  # Get wlthint3client.jar from image
-  id=$(docker create $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC)
-  docker cp $id:/u01/oracle/wlserver/server/lib/wlthint3client.jar $SCRIPTPATH
-  if [ ! "$?" = "0" ] ; then
-  	echo "Docker Copy failed for wlthint3client.jar"
-  	exit 1
-  fi
-  docker rm -v $id
-  
-}
 export OCR_SERVER="${OCR_SERVER:-container-registry.oracle.com}"
 export WLS_IMAGE_URI=/middleware/weblogic
 export SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
@@ -258,52 +168,35 @@ if [ "$SHARED_CLUSTER" = "true" ]; then
 	  	echo "When running in shared cluster option, provide DNS name or IP of a Kubernetes worker node using K8S_NODEPORT_HOST env variable"
 	  	exit 1
 	fi
-        pull_tag_images
+    create_image_pull_secret_wl
 	
   fi
   setup_shared_cluster
-  get_wlthint3client_from_image
   docker images
     
 elif [ "$JENKINS" = "true" ]; then
 
   echo "Test Suite is running on Jenkins and k8s is running locally on the same node."
+  docker images
 
-  # External customizable env vars unique to Jenkins:
-
-  export docker_pass=${docker_pass:?}
-  export M2_HOME=${M2_HOME:?}
-  export K8S_VERSION=${K8S_VERSION}
-
-  clean_jenkins
-
-  setup_jenkins
-
-  /usr/local/packages/aime/ias/run_as_root "mkdir -p $PV_ROOT"
-  /usr/local/packages/aime/ias/run_as_root "mkdir -p $RESULT_ROOT"
-
-  # 777 is needed because this script, k8s pods, and/or jobs may need access.
-
-  /usr/local/packages/aime/ias/run_as_root "mkdir -p $RESULT_ROOT/acceptance_test_tmp"
-  /usr/local/packages/aime/ias/run_as_root "chmod 777 $RESULT_ROOT/acceptance_test_tmp"
-
-  /usr/local/packages/aime/ias/run_as_root "mkdir -p $RESULT_ROOT/acceptance_test_tmp_archive"
-  /usr/local/packages/aime/ias/run_as_root "chmod 777 $RESULT_ROOT/acceptance_test_tmp_archive"
-
-  /usr/local/packages/aime/ias/run_as_root "mkdir -p $PV_ROOT/acceptance_test_pv"
-  /usr/local/packages/aime/ias/run_as_root "chmod 777 $PV_ROOT/acceptance_test_pv"
+  if [ "$JRF_ENABLED" = true ] ; then
+	pull_tag_images_jrf	
+  else
+  	create_image_pull_secret_wl
+  fi
 
-  /usr/local/packages/aime/ias/run_as_root "mkdir -p $PV_ROOT/acceptance_test_pv_archive"
-  /usr/local/packages/aime/ias/run_as_root "chmod 777 $PV_ROOT/acceptance_test_pv_archive"
+  export JAR_VERSION="`grep -m1 "<version>" pom.xml | cut -f2 -d">" | cut -f1 -d "<"`"
+  # create a docker image for the operator code being tested
+  docker build --build-arg http_proxy=$http_proxy --build-arg https_proxy=$https_proxy --build-arg no_proxy=$no_proxy -t "${IMAGE_NAME_OPERATOR}:${IMAGE_TAG_OPERATOR}"  --build-arg VERSION=$JAR_VERSION --no-cache=true .
+  docker tag "${IMAGE_NAME_OPERATOR}:${IMAGE_TAG_OPERATOR}" weblogic-kubernetes-operator:latest
   
-  if [ "$JRF_ENABLED" = false ]; then
-  	get_wlthint3client_from_image
-  fi
+  docker images
+
 else
   if [ "$JRF_ENABLED" = true ] ; then
 	pull_tag_images_jrf	
   else
-  	pull_tag_images
+  	create_image_pull_secret_wl
   fi
     
   #docker rmi -f $(docker images -q -f dangling=true)
@@ -314,8 +207,5 @@ else
   export JAR_VERSION="`grep -m1 "<version>" pom.xml | cut -f2 -d">" | cut -f1 -d "<"`"
   docker build --build-arg http_proxy=$http_proxy --build-arg https_proxy=$https_proxy --build-arg no_proxy=$no_proxy -t "${IMAGE_NAME_OPERATOR}:${IMAGE_TAG_OPERATOR}"  --build-arg VERSION=$JAR_VERSION --no-cache=true .
   docker tag "${IMAGE_NAME_OPERATOR}:${IMAGE_TAG_OPERATOR}" weblogic-kubernetes-operator:latest
-  
-  if [ "$JRF_ENABLED" = false ]; then
-  	get_wlthint3client_from_image
-  fi
+ 
 fi
diff --git a/operator/src/main/resources/scripts/introspectDomain.py b/operator/src/main/resources/scripts/introspectDomain.py
diff --git a/operator/src/main/resources/scripts/startNodeManager.sh b/operator/src/main/resources/scripts/startNodeManager.sh
diff --git a/src/integration-tests/introspector/wl-create-domain-pod.pyt b/src/integration-tests/introspector/wl-create-domain-pod.pyt
