Merge branch 'master' into feature/dynamic-cluster

Author: alai8

kubernetes/create-weblogic-domain.sh

@@ -15,7 +15,7 @@
 #
 
 script="${BASH_SOURCE[0]}"
-scriptDir="$( cd "$( dirname "${script}" )" && pwd )"
+scriptDir="$( cd "$(dirname "${script}")" > /dev/null 2>&1 ; pwd -P)"
 internalDir="${scriptDir}/internal"
 
 # This is the script that the customers use to create a domain.

kubernetes/create-weblogic-operator.sh

@@ -3,7 +3,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 script="${BASH_SOURCE[0]}"
-scriptDir="$( cd "$( dirname "${script}" )" && pwd )"
+scriptDir="$( cd "$(dirname "${script}")" > /dev/null 2>&1 ; pwd -P)"
 internalDir="${scriptDir}/internal"
 
 # This is the script that the customers use to create an operator.

site/name-changes.md

@@ -50,11 +50,11 @@ Similarly, the per-domain directory name is:
 
 #### What If I Mess Up Creating a Domain or Operator And Want To Do It Again?
 
+* Remove the resources that were created for the domain:
+  * kubernetes/delete-weblogic-domain-resources.sh yourDomainUID
 * Remove the resources that were created for the operator:
   * kubectl delete -f weblogic-operator.yaml
   * kubectl delete -f weblogic-operator-security.yaml
-* Remove the resources that were created for the domain:
-  * kubernetes/delete-weblogic-domain-resources.sh yourDomainUID
 * either remove the directory that was generated for that operator / domain, or remove the generated YAML files and the copy of the input file from it
 * make whatever changes you need in your inputs file
 * re-run the create script

src/test/scripts/unit-test-create-weblogic-domain.sh

@@ -8,7 +8,7 @@
 # create domain script that generates the yaml files.
 
 script="${BASH_SOURCE[0]}"
-scriptDir="$( cd "$( dirname "${script}" )" && pwd )"
+scriptDir="$( cd "$(dirname "${script}")" > /dev/null 2>&1 ; pwd -P)"
 kubernetesDir="${scriptDir}/../../../kubernetes"
 internalDir="${kubernetesDir}/internal"
 

src/test/scripts/unit-test-create-weblogic-operator.sh

@@ -12,7 +12,7 @@
 # used to actually run the operator.
 
 script="${BASH_SOURCE[0]}"
-scriptDir="$( cd "$( dirname "${script}" )" && pwd )"
+scriptDir="$( cd "$(dirname "${script}")" > /dev/null 2>&1 ; pwd -P)"
 kubernetesDir="${scriptDir}/../../../kubernetes"
 internalDir="${kubernetesDir}/internal"
 

src/test/scripts/unit-test-generate-weblogic-operator-cert.sh

@@ -18,7 +18,8 @@ if [ ! $# -eq 1 ]; then
   exit 1
 fi
 
-script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+script_dir="$( cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 ; pwd -P)"
+
 
 CERT_DIR="${script_dir}/weblogic-operator-cert"
 OP_PREFIX="weblogic-operator"