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

Author: vanajamukkara

kubernetes/samples/scripts/common/utility.sh

@@ -207,9 +207,10 @@ function getKubernetesClusterIP {
   local SVR_ADDR=`eval ${SVR_ADDR_CMD}`
 
   # Server address is expected to be of the form http://address:port.  Delimit
-  # string on the colon to obtain the address.  Leave the "//" on the resulting string.
+  # string on the colon to obtain the address. 
   local array=(${SVR_ADDR//:/ })
-  K8S_IP="${array[1]}"
+  K8S_IP="${array[1]/\/\//}"
+
 }
 
 #
@@ -245,6 +246,11 @@ function createFiles {
   if [ "${exposeAdminT3Channel}" = true ]; then
     exposeAdminT3ChannelPrefix="${enabledPrefix}"
     exposeAnyChannelPrefix="${enabledPrefix}"
+    # set t3PublicAddress if not set
+    if [ -z "${t3PublicAddress}" ]; then
+      getKubernetesClusterIP
+      t3PublicAddress="${K8S_IP}"
+    fi
   else
     exposeAdminT3ChannelPrefix="${disabledPrefix}"
   fi

kubernetes/samples/scripts/common/validate.sh

@@ -342,7 +342,6 @@ function validateCommonInputs {
     clusterName \
     managedServerNameBase \
     namespace \
-    t3PublicAddress \
     includeServerOutInPodLog \
     version
 

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

@@ -129,7 +129,7 @@ The following parameters can be provided in the inputs file.
 | `productionModeEnabled` | Boolean indicating if production mode is enabled for the domain. | `true` |
 | `serverStartPolicy` | Determines which WebLogic Servers will be started up. Legal values are `NEVER`, `IF_NEEDED`, `ADMIN_ONLY`. | `IF_NEEDED` |
 | `t3ChannelPort` | Port for the T3 channel of the NetworkAccessPoint. | `30012` |
-| `t3PublicAddress` | Public address for the T3 channel.  This should be set to the public address of the Kubernetes cluster.  This would normally be a load balancer address. <p/>For development environments only: In a single server (all-in-one) Kubernetes deployment, this may be set to the address of the master, or at the very least, it must be set to the address of one of the worker nodes. | `kubernetes` |
+| `t3PublicAddress` | Public address for the T3 channel.  This should be set to the public address of the Kubernetes cluster.  This would normally be a load balancer address. <p/>For development environments only: In a single server (all-in-one) Kubernetes deployment, this may be set to the address of the master, or at the very least, it must be set to the address of one of the worker nodes. |  If not provided, the script will attempt to set it to the IP address of the kubernetes cluster |
 | `weblogicCredentialsSecretName` | Name of the Kubernetes secret for the Administration Server's user name and password. | `domain1-weblogic-credentials` |
 
 Note that the names of the Kubernetes resources in the generated YAML files may be formed with the value of some of the properties specified in the `create-inputs.yaml` file. Those properties include the `adminServerName`, `clusterName` and `managedServerNameBase`. If those values contain any characters that are invalid in a Kubernetes service name, those characters are converted to valid values in the generated YAML files. For example, an uppercase letter is converted to a lowercase letter and an underscore `("_")` is converted to a hyphen `("-")`.

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml

@@ -92,7 +92,7 @@ t3ChannelPort: 30012
 # kubernetes server address, which you can get by running "kubectl cluster-info".  If this
 # value is not set to that address, WLST will not be able to connect from outside the
 # kubernetes cluster.
-t3PublicAddress: kubernetes
+#t3PublicAddress: 
 
 # Boolean to indicate if the channel should be exposed as a service
 exposeAdminT3Channel: false

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

@@ -219,10 +219,10 @@ function printSummary {
   echo "Domain ${domainName} was created and will be started by the WebLogic Kubernetes Operator"
   echo ""
   if [ "${exposeAdminNodePort}" = true ]; then
-    echo "Administration console access is available at http:${K8S_IP}:${adminNodePort}/console"
+    echo "Administration console access is available at http://${K8S_IP}:${adminNodePort}/console"
   fi
   if [ "${exposeAdminT3Channel}" = true ]; then
-    echo "T3 access is available at t3:${K8S_IP}:${t3ChannelPort}"
+    echo "T3 access is available at t3://${K8S_IP}:${t3ChannelPort}"
   fi
   echo "The following files were generated:"
   echo "  ${domainOutputDir}/create-domain-inputs.yaml"

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/README.md

@@ -96,7 +96,7 @@ The following parameters can be provided in the inputs file.
 | `productionModeEnabled` | Boolean indicating if production mode is enabled for the domain. | `true` |
 | `serverStartPolicy` | Determines which WebLogic Servers will be started up. Legal values are `NEVER`, `IF_NEEDED`, `ADMIN_ONLY`. | `IF_NEEDED` |
 | `t3ChannelPort` | Port for the T3 channel of the NetworkAccessPoint. | `30012` |
-| `t3PublicAddress` | Public address for the T3 channel.  This should be set to the public address of the Kubernetes cluster.  This would normally be a load balancer address. <p/>For development environments only: In a single server (all-in-one) Kubernetes deployment, this may be set to the address of the master, or at the very least, it must be set to the address of one of the worker nodes. | `kubernetes` |
+| `t3PublicAddress` | Public address for the T3 channel.  This should be set to the public address of the Kubernetes cluster.  This would normally be a load balancer address. <p/>For development environments only: In a single server (all-in-one) Kubernetes deployment, this may be set to the address of the master, or at the very least, it must be set to the address of one of the worker nodes. | If not provided, the script will attempt to set it to the IP address of the kubernetes cluster |
 | `weblogicCredentialsSecretName` | Name of the Kubernetes secret for the Administration Server's username and password. If not specified, the value is derived from the `domainUID` as `<domainUID>-weblogic-credentials`. | `domain1-weblogic-credentials` |
 | `weblogicImagePullSecretName` | Name of the Kubernetes secret for the Docker Store, used to pull the WebLogic Server image. | `docker-store-secret` |
 

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml

@@ -76,7 +76,7 @@ t3ChannelPort: 30012
 # kubernetes server address, which you can get by running "kubectl cluster-info".  If this
 # value is not set to that address, WLST will not be able to connect from outside the
 # kubernetes cluster.
-t3PublicAddress: kubernetes
+#t3PublicAddress: 
 
 # Boolean to indicate if the channel should be exposed as a service
 exposeAdminT3Channel: false

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain.sh

@@ -243,10 +243,10 @@ function printSummary {
   echo "Domain ${domainName} was created and will be started by the WebLogic Kubernetes Operator"
   echo ""
   if [ "${exposeAdminNodePort}" = true ]; then
-    echo "Administration console access is available at http:${K8S_IP}:${adminNodePort}/console"
+    echo "Administration console access is available at http://${K8S_IP}:${adminNodePort}/console"
   fi
   if [ "${exposeAdminT3Channel}" = true ]; then
-    echo "T3 access is available at t3:${K8S_IP}:${t3ChannelPort}"
+    echo "T3 access is available at t3://${K8S_IP}:${t3ChannelPort}"
   fi
   echo "The following files were generated:"
   echo "  ${domainOutputDir}/create-domain-inputs.yaml"

site/quickstart.md

@@ -183,7 +183,7 @@ respectively, as shown in the example.
 
 1. The secret that you create for the credentials.
 2. The properties files in the sample project you choose to create the Docker image from.
-3. The parameters you supply to the `createDomain.sh` script.
+3. The parameters you supply to the `create-domain.sh` script.
 
 If you specify the `-e` option, the script will generate the
 Kubernetes YAML files *and* apply them to your cluster.  If you omit the `-e` option, the