Merge branch 'develop' into owls-70853-remove-configured-cluster

Author: rjeberhard

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/README.md

@@ -8,8 +8,7 @@ Before you begin, read this guide, [Domain Resource](../../../../../site/domain-
 
 The following prerequisites must be handled prior to running the create domain script:
 * The WDT sample requires that `JAVA_HOME` is set to a Java JDK version 1.8 or later.
-* Make sure that the WebLogic operator is running.
-* The operator requires WebLogic Server 12.2.1.3.0 with patch 28076014 applied. Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how to create one. If a different `domainHomeImageBase` (see Configuration table below) is specified, the specified image needs to be built locally or pulled from a repository.
+* The operator requires WebLogic Server 12.2.1.3.0 with patch 28076014 applied. Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how to create one.
 * Create a Kubernetes namespace for the domain unless the intention is to use the default namespace.
 * If logHomeOnPV is enabled, create the Kubernetes persistent volume where the log home will be hosted, and the Kubernetes persistent volume claim for the domain in the same Kubernates namespace. For samples to create a PV and PVC, see [Create sample PV and PVC](../../create-weblogic-domain-pv-pvc/README.md).
 * Create a Kubernetes secret for the WebLogic administrator credentials that contains the fields `username` and `password`, and make sure that the secret name matches the value specified for `weblogicCredentialsSecretName` (see Configuration table below). For example:

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

@@ -266,7 +266,11 @@ String getImageName() {
   }
 
   String getImagePullPolicy() {
-    return KubernetesConstants.IFNOTPRESENT_IMAGEPULLPOLICY;
+    String imagePullPolicy = getDomain().getSpec().getImagePullPolicy();
+    if (imagePullPolicy == null) {
+      imagePullPolicy = KubernetesConstants.IFNOTPRESENT_IMAGEPULLPOLICY;
+    }
+    return imagePullPolicy;
   }
 
   protected List<String> getContainerCommand() {

site/domains.md

@@ -67,15 +67,15 @@ running in Kubernetes.
   configuration overrides.  This occurs if the domain resource `logHomeEnabled` field is explicitly set to `true`, or if `logHomeEnabled` isn't set
   and `domainHomeInImage` is explicitly set to `false`.   When overriding, the log location will be the location specified by the `logHome` setting.
 * _Listen Address Configuration:_  Channel listen addresses in a configuration either must be left completely unset (for example, not set to anything), or must be set to the exact required value, which will be in the form of the `domainUID`
-  followed by a hyphen and then the server name (with all lower case, underscores converted to dashes).  For example `domain1-admin-server`. This includes default, SSL, admin, and custom channels.
+  followed by a hyphen and then the server name (with all lower case, underscores converted to hyphens).  For example `domain1-admin-server`. This includes default, SSL, admin, and custom channels.
 * _Listen Address Overrides:_  The operator will automatically override all WebLogic domain default,
   SSL, admin, or custom channel listen addresses (using situational configuration overrides).  These will become `domainUID` followed by a
-  hyphen and then the server name, all lower case, and underscores converted to dashes.  For example, if `domainUID=domain1` and
+  hyphen and then the server name, all lower case, and underscores converted to hyphens.  For example, if `domainUID=domain1` and
   the WebLogic server name is `Admin_Server`, then its listen address becomes `domain1-admin-server`.
 * _Domain, Cluster, Server, and Network-Access-Point Names:_ WebLogic domain, cluster, server, and network-access-point (channel)
   names must contain only the characters `A-Z`, `a-z`, `0-9`, `-`, or `_`.  This ensures that they can be converted to
   meet Kubernetes resource and DNS1123 naming requirements.  (When generating pod and service names, the operator will convert
-  configured names to lower case and substitute a dash (`-`) for each underscore (`_`).)
+  configured names to lower case and substitute a hyphen (`-`) for each underscore (`_`).)
 * _Node Ports:_ If you choose to expose any WebLogic channels outside the Kubernetes cluster via a `NodePort`, for example, the
   administration port or a T3 channel to allow WLST access, you need to ensure that you allocate each channel a
   unique port number across the entire Kubernetes cluster.  If you expose the administration port in each WebLogic domain in