Merge remote-tracking branch 'origin/develop' into template-fix

Author: rjeberhard

docs/charts/weblogic-operator-2.3.0.tgz

@@ -249,6 +249,10 @@
           "description": "Domain unique identifier. Must be unique across the Kubernetes cluster. Not required. Defaults to the value of metadata.name.",
           "type": "string"
         },
+        "experimental": {
+          "description": "Experimental feature configurations.",
+          "$ref": "#/definitions/Experimental"
+        },
         "serverStartPolicy": {
           "description": "The strategy for deciding whether to start a server. Legal values are ADMIN_ONLY, NEVER, or IF_NEEDED.",
           "type": "string",
@@ -358,6 +362,28 @@
         }
       }
     },
+    "Experimental": {
+      "type": "object",
+      "properties": {
+        "istio": {
+          "description": "Istio service mesh integration configuration.",
+          "$ref": "#/definitions/Istio"
+        }
+      }
+    },
+    "Istio": {
+      "type": "object",
+      "properties": {
+        "readinessPort": {
+          "description": "The WebLogic readiness port for Istio. Defaults to 8888. Not required.",
+          "type": "number"
+        },
+        "enabled": {
+          "description": "True, if this domain is deployed under an Istio service mesh. Defaults to false. Not required.",
+          "type": "boolean"
+        }
+      }
+    },
     "KubernetesResource": {
       "type": "object",
       "properties": {

docs/domains/Domain.json

@@ -23,6 +23,7 @@ DomainSpec is a description of a domain.
 | `domainHome` | string | The folder for the WebLogic Domain. Not required. Defaults to /shared/domains/domains/domainUID if domainHomeInImage is false. Defaults to /u01/oracle/user_projects/domains/ if domainHomeInImage is true. |
 | `domainHomeInImage` | Boolean | True if this domain's home is defined in the Docker image for the domain. Defaults to true. |
 | `domainUID` | string | Domain unique identifier. Must be unique across the Kubernetes cluster. Not required. Defaults to the value of metadata.name. |
+| `experimental` | [Experimental](#experimental) | Experimental feature configurations. |
 | `image` | string | The WebLogic Docker image; required when domainHomeInImage is true; otherwise, defaults to container-registry.oracle.com/middleware/weblogic:12.2.1.3. |
 | `imagePullPolicy` | string | The image pull policy for the WebLogic Docker image. Legal values are Always, Never and IfNotPresent. Defaults to Always if image ends in :latest, IfNotPresent otherwise. |
 | `imagePullSecrets` | array of [Local Object Reference](k8s1.13.5.md#local-object-reference) | A list of image pull secrets for the WebLogic Docker image. |
@@ -81,6 +82,12 @@ An element representing a cluster in the domain configuration.
 | `serverStartPolicy` | string | The strategy for deciding whether to start a server. Legal values are NEVER, or IF_NEEDED. |
 | `serverStartState` | string | The state in which the server is to be started. Use ADMIN if server should start in the admin state. Defaults to RUNNING. |
 
+### Experimental
+
+| Name | Type | Description |
+| --- | --- | --- |
+| `istio` | [Istio](#istio) | Istio service mesh integration configuration. |
+
 ### Managed Server
 
 ManagedServer represents the operator configuration for a single Managed Server.
@@ -176,6 +183,13 @@ ServerPod describes the configuration for a Kubernetes pod for a server.
 | `annotations` | Map | The annotations to be attached to generated resources. |
 | `labels` | Map | The labels to be attached to generated resources. The label names must not start with 'weblogic.'. |
 
+### Istio
+
+| Name | Type | Description |
+| --- | --- | --- |
+| `enabled` | Boolean | True, if this domain is deployed under an Istio service mesh. Defaults to false. Not required. |
+| `readinessPort` | number | The WebLogic readiness port for Istio. Defaults to 8888. Not required. |
+
 ### Probe Tuning
 
 | Name | Type | Description |

docs/domains/Domain.md

@@ -1169,6 +1169,10 @@
           "description": "Domain unique identifier. Must be unique across the Kubernetes cluster. Not required. Defaults to the value of metadata.name.",
           "type": "string"
         },
+        "experimental": {
+          "description": "Experimental feature configurations.",
+          "$ref": "#/definitions/Experimental"
+        },
         "serverStartPolicy": {
           "description": "The strategy for deciding whether to start a server. Legal values are ADMIN_ONLY, NEVER, or IF_NEEDED.",
           "type": "string",
@@ -1278,6 +1282,28 @@
         }
       }
     },
+    "Experimental": {
+      "type": "object",
+      "properties": {
+        "istio": {
+          "description": "Istio service mesh integration configuration.",
+          "$ref": "#/definitions/Istio"
+        }
+      }
+    },
+    "Istio": {
+      "type": "object",
+      "properties": {
+        "readinessPort": {
+          "description": "The WebLogic readiness port for Istio. Defaults to 8888. Not required.",
+          "type": "number"
+        },
+        "enabled": {
+          "description": "True, if this domain is deployed under an Istio service mesh. Defaults to false. Not required.",
+          "type": "boolean"
+        }
+      }
+    },
     "KubernetesResource": {
       "type": "object",
       "properties": {

docs/domains/index.html

@@ -119,7 +119,7 @@ private static void destroyInitContdomain() throws Exception {
    * before starting the admin server pod.
    *
    * @throws Exception when domain.yaml cannot be read or modified to include the initContainers or
-   *     weblogic server pod doesn't go through initialization and ready state
+   *     WebLogic server pod doesn't go through initialization and ready state
    */
   @Test
   public void testDomainInitContainer() throws Exception {
@@ -198,7 +198,7 @@ public void testClusterInitContainer() throws Exception {
    * before starting the admin server pod.
    *
    * @throws Exception when domain.yaml cannot be read or modified to include the initContainers or
-   *     weblogic server pod doesn't go through initialization and ready state
+   *     WebLogic server pod doesn't go through initialization and ready state
    */
   @Test
   public void testMsInitContainer() throws Exception {

integration-tests/src/test/java/oracle/kubernetes/operator/ItInitContainers.java

@@ -155,10 +155,10 @@ private static void gitCloneBuildMonitoringExporter() throws Exception {
   /**
    * Utility to execute any shell scripts.
    *
-   * @srcLoc - path to the shel script
-   * @destLoc - destination path there the shell script will be executed
-   * @fileName - name of the shell script
-   * @args - args to pass to the shell script
+   * @param srcLoc - path to the shell script
+   * @param destLoc - destination path there the shell script will be executed
+   * @param fileName - name of the shell script
+   * @param args - args to pass to the shell script
    * @throws Exception if could not run the command successfully to clone from github
    */
   private static void executeShelScript(String srcLoc, String destLoc, String fileName, String args)

integration-tests/src/test/java/oracle/kubernetes/operator/ItMonitoringExporter.java

@@ -36,6 +36,8 @@ spec:
           value: "false"
         - name: "JAVA_LOGGING_LEVEL"
           value: {{ .javaLoggingLevel | quote }}
+        - name: ISTIO_ENABLED
+          value: {{ .istioEnabled | quote }}
         {{- if .remoteDebugNodePortEnabled }}
         - name: "REMOTE_DEBUG_PORT"
           value: {{ .internalDebugHttpPort | quote }}

kubernetes/charts/weblogic-operator/templates/_operator-dep.tpl

@@ -100,3 +100,7 @@ elasticSearchHost: "elasticsearch.default.svc.cluster.local"
 # elasticSearchPort specifies the port number of where elasticsearch is running.
 # This parameter is ignored if 'elkIntegrationEnabled' is false.
 elasticSearchPort: 9200
+
+# experimental
+# istioEnabled specifies whether or not it is deployed under Istio.
+istioEnabled: false

kubernetes/charts/weblogic-operator/values.yaml

@@ -75,3 +75,8 @@ 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

@@ -368,6 +368,8 @@ function createFiles {
     sed -i -e "s:%CUSTOM_RCUPREFIX%:${rcuSchemaPrefix}: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}
 
     # Generate the yaml to create the kubernetes job that will delete the weblogic domain_home folder
     echo Generating ${deleteJobOutput}
@@ -423,6 +425,8 @@ 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_ENABLED%:${istioEnabled}:g" ${dcrOutput}
+  sed -i -e "s:%ISTIO_READINESS_PORT%:${istioReadinessPort}:g" ${dcrOutput}
 
   if [ "${domainHomeInImage}" == "true" ]; then