Make Istio configuration top-level object

Author: rjeberhard

docs/charts/index.yaml

@@ -1,39 +1,39 @@
 apiVersion: v1
 entries:
   weblogic-operator:
-  - created: 2019-06-21T17:07:47.254382-04:00
+  - created: "2019-07-17T10:01:27.787018-04:00"
     description: Helm chart for configuring the WebLogic operator.
-    digest: 0af0ca39bf33b38d82a22a21c32e1cb3da3f78d841ba2c4cfaa4c0e743d3b9b3
+    digest: 464a6970a589e344f5b0c2f66c10f263e086b96bbf9241e876eee94a41792578
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.0.tgz
     version: 2.3.0
-  - created: 2019-06-21T17:07:47.252194-04:00
+  - created: "2019-07-17T10:01:27.784751-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-06-21T17:07:47.250143-04:00
+  - created: "2019-07-17T10:01:27.782976-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-06-21T17:07:47.246971-04:00
+  - created: "2019-07-17T10:01:27.781223-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-06-21T17:07:47.245138-04:00
+  - created: "2019-07-17T10:01:27.778847-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-06-21T17:07:47.24317-04:00
+generated: "2019-07-17T10:01:27.775905-04:00"

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"
         },
+        "istio": {
+          "description": "Istio service mesh integration configuration.",
+          "$ref": "#/definitions/Istio"
+        },
         "serverStartPolicy": {
           "description": "The strategy for deciding whether to start a server. Legal values are ADMIN_ONLY, NEVER, or IF_NEEDED.",
           "type": "string",
@@ -298,18 +302,18 @@
           "description": "If true (the default), the server .out file will be included in the pod\u0027s stdout.",
           "type": "boolean"
         },
-        "clusters": {
-          "description": "Configuration for the clusters.",
+        "managedServers": {
+          "description": "Configuration for individual Managed Servers.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/Cluster"
+            "$ref": "#/definitions/ManagedServer"
           }
         },
-        "managedServers": {
-          "description": "Configuration for individual Managed Servers.",
+        "clusters": {
+          "description": "Configuration for the clusters.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/ManagedServer"
+            "$ref": "#/definitions/Cluster"
           }
         }
       }
@@ -358,6 +362,15 @@
         }
       }
     },
+    "Istio": {
+      "type": "object",
+      "properties": {
+        "istioEnabled": {
+          "description": "True, if this domain is deployed under an Istio service mesh. Defaults to true. Not required.",
+          "type": "boolean"
+        }
+      }
+    },
     "KubernetesResource": {
       "type": "object",
       "properties": {

docs/domains/Domain.json

@@ -27,6 +27,7 @@ DomainSpec is a description of a domain.
 | `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. |
 | `includeServerOutInPodLog` | Boolean | If true (the default), the server .out file will be included in the pod's stdout. |
+| `istio` | [Istio](#istio) | Istio service mesh integration configuration. |
 | `logHome` | string | The in-pod name of the directory in which to store the domain, node manager, server logs, and server  *.out files |
 | `logHomeEnabled` | Boolean | Specified whether the log home folder is enabled. Not required. Defaults to true if domainHomeInImage is false. Defaults to false if domainHomeInImage is true.  |
 | `managedServers` | array of [Managed Server](#managed-server) | Configuration for individual Managed Servers. |
@@ -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. |
 
+### Istio
+
+| Name | Type | Description |
+| --- | --- | --- |
+| `istioEnabled` | Boolean | True, if this domain is deployed under an Istio service mesh. Defaults to true. Not required. |
+
 ### Managed Server
 
 ManagedServer represents the operator configuration for a single Managed Server.

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"
         },
+        "istio": {
+          "description": "Istio service mesh integration configuration.",
+          "$ref": "#/definitions/Istio"
+        },
         "serverStartPolicy": {
           "description": "The strategy for deciding whether to start a server. Legal values are ADMIN_ONLY, NEVER, or IF_NEEDED.",
           "type": "string",
@@ -1218,18 +1222,18 @@
           "description": "If true (the default), the server .out file will be included in the pod\u0027s stdout.",
           "type": "boolean"
         },
-        "clusters": {
-          "description": "Configuration for the clusters.",
+        "managedServers": {
+          "description": "Configuration for individual Managed Servers.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/Cluster"
+            "$ref": "#/definitions/ManagedServer"
           }
         },
-        "managedServers": {
-          "description": "Configuration for individual Managed Servers.",
+        "clusters": {
+          "description": "Configuration for the clusters.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/ManagedServer"
+            "$ref": "#/definitions/Cluster"
           }
         }
       }
@@ -1278,6 +1282,15 @@
         }
       }
     },
+    "Istio": {
+      "type": "object",
+      "properties": {
+        "istioEnabled": {
+          "description": "True, if this domain is deployed under an Istio service mesh. Defaults to true. Not required.",
+          "type": "boolean"
+        }
+      }
+    },
     "KubernetesResource": {
       "type": "object",
       "properties": {

docs/domains/index.html

@@ -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

@@ -96,3 +96,6 @@ 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
+
+# istioEnabled specifies whether or not it is deployed under Istio.
+istioEnabled: false

kubernetes/charts/weblogic-operator/values.yaml

@@ -47,6 +47,8 @@ spec:
       value: "%JAVA_OPTIONS%"
     - name: USER_MEM_ARGS
       value: "-XX:+UseContainerSupport -Djava.security.egd=file:/dev/./urandom "
+    - name: ISTIO_ENABLED
+      value: "%ISTIO_ENABLED%"
     %LOG_HOME_ON_PV_PREFIX%volumes:
     %LOG_HOME_ON_PV_PREFIX%- name: weblogic-domain-storage-volume
     %LOG_HOME_ON_PV_PREFIX%  persistentVolumeClaim:
@@ -75,3 +77,5 @@ spec:
     replicas: %INITIAL_MANAGED_SERVER_REPLICAS%
   # The number of managed servers to start for unlisted clusters
   # replicas: 1
+  # 
+  istioEnabled: %ISTIO_ENABLED%

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

@@ -368,6 +368,7 @@ 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}
 
     # Generate the yaml to create the kubernetes job that will delete the weblogic domain_home folder
     echo Generating ${deleteJobOutput}
@@ -423,6 +424,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_ENABLED%:${istioEnabled}:g" ${dcrOutput}
 
   if [ "${domainHomeInImage}" == "true" ]; then
 

kubernetes/samples/scripts/common/utility.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 # Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
-# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+# Licensed under the Universal Permissive License v 1.0 as shown at
+# http://oss.oracle.com/licenses/upl.
 #
 
 function exitIfError {