Merge branch 'develop' into owls-74699

Conflicts:
	kubernetes/samples/scripts/common/domain-template.yaml
	kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml

Author: alai8

docs/charts/index.yaml

@@ -1,39 +1,39 @@
 apiVersion: v1
 entries:
   weblogic-operator:
-  - created: "2019-07-25T14:26:55.411022-04:00"
+  - created: "2019-08-16T09:50:10.645794-04:00"
     description: Helm chart for configuring the WebLogic operator.
-    digest: 755825da5adcc30f57bca540509813aeb8d73ddd69d85e4f30b29d73696e2ee8
+    digest: cbc6caaa6eb28e3c7e906ede14b2ae511a0b35fc12a8e3ab629155b09993e8b2
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.0.tgz
     version: 2.3.0
-  - created: "2019-07-25T14:26:55.408716-04:00"
+  - created: "2019-08-16T09:50:10.643754-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 23d5a1c554fa8211cc1e86b7ade09460917cb2069e68fb4bfdddafc8db44fdcd
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.1.tgz
     version: 2.2.1
-  - created: "2019-07-25T14:26:55.407036-04:00"
+  - created: "2019-08-16T09:50:10.641237-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: bba303686cb55d84fe8c0d693a2436e7e686b028085b56e012f6381699a3911f
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.0.tgz
     version: 2.2.0
-  - created: "2019-07-25T14:26:55.405384-04:00"
+  - created: "2019-08-16T09:50:10.638374-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 391e23c0969ada5f0cd2a088ddc6f11f237f57521801ed3925db2149a8437a0d
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.1.tgz
     version: "2.1"
-  - created: "2019-07-25T14:26:55.403824-04:00"
+  - created: "2019-08-16T09:50:10.636172-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 298acda78ab73db6b7ba6f2752311bfa40c65874e03fb196b70976192211c1a5
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.0.1.tgz
     version: 2.0.1
-generated: "2019-07-25T14:26:55.401818-04:00"
+generated: "2019-08-16T09:50:10.633063-04:00"

docs/charts/weblogic-operator-2.3.0.tgz

@@ -379,7 +379,7 @@
           "type": "number"
         },
         "enabled": {
-          "description": "True, if this domain is deployed under an Istio service mesh. Defaults to false. Not required.",
+          "description": "True, if this domain is deployed under an Istio service mesh. Defaults to true when the \u0027istio\u0027 element is included. Not required.",
           "type": "boolean"
         }
       }

docs/domains/Domain.json

@@ -187,7 +187,7 @@ ServerPod describes the configuration for a Kubernetes pod for a server.
 
 | Name | Type | Description |
 | --- | --- | --- |
-| `enabled` | Boolean | True, if this domain is deployed under an Istio service mesh. Defaults to false. Not required. |
+| `enabled` | Boolean | True, if this domain is deployed under an Istio service mesh. Defaults to true when the 'istio' element is included. Not required. |
 | `readinessPort` | number | The WebLogic readiness port for Istio. Defaults to 8888. Not required. |
 
 ### Probe Tuning

docs/domains/Domain.md

@@ -1299,7 +1299,7 @@
           "type": "number"
         },
         "enabled": {
-          "description": "True, if this domain is deployed under an Istio service mesh. Defaults to false. Not required.",
+          "description": "True, if this domain is deployed under an Istio service mesh. Defaults to true when the \u0027istio\u0027 element is included. Not required.",
           "type": "boolean"
         }
       }

docs/domains/index.html

@@ -101,6 +101,6 @@ elasticSearchHost: "elasticsearch.default.svc.cluster.local"
 # This parameter is ignored if 'elkIntegrationEnabled' is false.
 elasticSearchPort: 9200
 
-# experimental
-# istioEnabled specifies whether or not it is deployed under Istio.
+# Istio service mesh support is experimental.
+# istioEnabled specifies whether or not the domain is deployed under an Istio service mesh.
 istioEnabled: false

kubernetes/charts/weblogic-operator/values.yaml

@@ -15,31 +15,47 @@ metadata:
 spec:
   # The WebLogic Domain Home
   domainHome: %DOMAIN_HOME%
+
   # If the domain home is in the image
   domainHomeInImage: %DOMAIN_HOME_IN_IMAGE%
+
   # The WebLogic Server Docker image that the Operator uses to start the domain
   image: "%WEBLOGIC_IMAGE%"
+
   # imagePullPolicy defaults to "Always" if image version is :latest
   imagePullPolicy: "%WEBLOGIC_IMAGE_PULL_POLICY%"
+
   # Identify which Secret contains the credentials for pulling an image
   %WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%imagePullSecrets:
   %WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%- name: %WEBLOGIC_IMAGE_PULL_SECRET_NAME%
+
   # Identify which Secret contains the WebLogic Admin credentials (note that there is an example of
   # how to create that Secret at the end of this file)
   webLogicCredentialsSecret: 
     name: %WEBLOGIC_CREDENTIALS_SECRET_NAME%
+
   # Whether to include the server out file into the pod's stdout, default is true
   includeServerOutInPodLog: %INCLUDE_SERVER_OUT_IN_POD_LOG%
+
   # Whether to enable log home
   %LOG_HOME_ON_PV_PREFIX%logHomeEnabled: %LOG_HOME_ENABLED%
+
   # The in-pod location for domain log, server logs, server out, and Node Manager log files
   %LOG_HOME_ON_PV_PREFIX%logHome: %LOG_HOME%
+
+  # Istio service mesh support is experimental.
+  %ISTIO_PREFIX%experimental:
+  %ISTIO_PREFIX%  istio:
+  %ISTIO_PREFIX%    enabled: %ISTIO_ENABLED%
+  %ISTIO_PREFIX%    readinessPort: %ISTIO_READINESS_PORT%
+
   # serverStartPolicy legal values are "NEVER", "IF_NEEDED", or "ADMIN_ONLY"
   # This determines which WebLogic Servers the Operator will start up when it discovers this Domain
   # - "NEVER" will not start any server in the domain
   # - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
   # - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
   serverStartPolicy: "%SERVER_START_POLICY%"
+
   serverPod:
     # an (optional) list of environment variable to be set on the servers
     env:
@@ -55,6 +71,7 @@ spec:
     %LOG_HOME_ON_PV_PREFIX%volumeMounts:
     %LOG_HOME_ON_PV_PREFIX%- mountPath: %DOMAIN_ROOT_DIR%
     %LOG_HOME_ON_PV_PREFIX%  name: weblogic-domain-storage-volume
+
   # adminServer is used to configure the desired behavior for starting the administration server.
   adminServer:
     # serverStartState legal values are "RUNNING" or "ADMIN"
@@ -68,6 +85,7 @@ spec:
     %EXPOSE_ADMIN_PORT_PREFIX%     nodePort: %ADMIN_NODE_PORT%
     # Uncomment to export the T3Channel as a service
     %EXPOSE_T3_CHANNEL_PREFIX%   - channelName: T3Channel
+
   # clusters is used to configure the desired behavior for starting member servers of a cluster.  
   # If you use this entry, then the rules will be applied to ALL servers that are members of the named clusters.
   clusters:
@@ -76,8 +94,4 @@ spec:
     replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
   # The number of managed servers to start for unlisted clusters
   # replicas: 1
-  # 
-  experimental:
-    istio:
-      enabled: %ISTIO_ENABLED%
-      readinessPort: %ISTIO_READINESS_PORT%
+

kubernetes/samples/scripts/common/domain-template.yaml

@@ -298,6 +298,12 @@ function createFiles {
     exposeAdminNodePortPrefix="${disabledPrefix}"
   fi
 
+  if [ "${istioEnabled}" == "true" ]; then
+    istioPrefix="${enabledPrefix}"
+  else
+    istioPrefix="${disabledPrefix}"
+  fi
+
   # For some parameters, use the default value if not defined.
   if [ -z "${domainPVMountPath}" ]; then
     domainPVMountPath="/shared"
@@ -402,10 +408,12 @@ function createFiles {
     # extra entries for FMW Infra domains
     sed -i -e "s:%RCU_CREDENTIALS_SECRET_NAME%:${rcuCredentialsSecret}:g" ${createJobOutput}
     sed -i -e "s:%CUSTOM_RCUPREFIX%:${rcuSchemaPrefix}:g" ${createJobOutput}
-    sed -i -e "s|%CUSTOM_CONNECTION_STRING%|${rcuDatabaseURL}|g" ${createJobOutput}
+    sed -i -e "s:%CUSTOM_CONNECTION_STRING%:${rcuDatabaseURL}|g" ${createJobOutput}
     sed -i -e "s:%EXPOSE_T3_CHANNEL_PREFIX%:${exposeAdminT3Channel}:g" ${createJobOutput}
-    sed -i -e "s|%ISTIO_ENABLED%|${istioEnabled}|g" ${createJobOutput}
-    sed -i -e "s|%ISTIO_READINESS_PORT%|${istioReadinessPort}|g" ${createJobOutput}
+    # entries for Istio
+    sed -i -e "s:%ISTIO_PREFIX%:${istioPrefix}:g" ${createJobOutput}
+    sed -i -e "s:%ISTIO_ENABLED%:${istioEnabled}|g" ${createJobOutput}
+    sed -i -e "s:%ISTIO_READINESS_PORT%:${istioReadinessPort}|g" ${createJobOutput}
 
     # Generate the yaml to create the kubernetes job that will delete the weblogic domain_home folder
     echo Generating ${deleteJobOutput}
@@ -461,6 +469,7 @@ function createFiles {
   sed -i -e "s:%EXPOSE_T3_CHANNEL_PREFIX%:${exposeAdminT3ChannelPrefix}:g" ${dcrOutput}
   sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${dcrOutput}
   sed -i -e "s:%INITIAL_MANAGED_SERVER_REPLICAS%:${initialManagedServerReplicas}:g" ${dcrOutput}
+  sed -i -e "s:%ISTIO_PREFIX%:${istioPrefix}:g" ${dcrOutput}
   sed -i -e "s:%ISTIO_ENABLED%:${istioEnabled}:g" ${dcrOutput}
   sed -i -e "s:%ISTIO_READINESS_PORT%:${istioReadinessPort}:g" ${dcrOutput}
 

kubernetes/samples/scripts/common/utility.sh

@@ -147,10 +147,10 @@ createDomainFilesDir: wlst
 # serverPodMemoryLimit: "1Gi"
 # serverPodCpuLimit: "1000m"
 
-# experimental
+# Istio service mesh support is experimental.
 # istioEnabled specifies whether or not it is deployed under Istio.
 istioEnabled: false
 
-# experimental
-# istioReadinessPort specifies the WebLogic port for readiness probe which is used under Istio.
+# Istio service mesh support is experimental.
+# istioReadinessPort specifies the WebLogic NAP port for use by the readiness probe
 istioReadinessPort: 8888

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

@@ -12,8 +12,9 @@
 public class Istio {
 
   @Description(
-      "True, if this domain is deployed under an Istio service mesh. Defaults to false. Not required.")
-  private Boolean enabled = false;
+      "True, if this domain is deployed under an Istio service mesh. "
+          + "Defaults to true when the 'istio' element is included. Not required.")
+  private Boolean enabled = true;
 
   @Description("The WebLogic readiness port for Istio. Defaults to 8888. Not required.")
   private Integer readinessPort = 8888;