revise according to Mark's comments.

Author: davidzl

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

@@ -136,7 +136,7 @@ createDomainScriptName: create-domain-job.sh
 createDomainFilesDir: wlst
 
 # istioEnabled specifies whether or not it is deployed under Istio.
-istioEnabled: true
+istioEnabled: false
 
 # istioReadinessPort specifies the WebLogic port for readiness probe which is used under Istio.
-istioReadinessPort: 8777
+istioReadinessPort: 8888

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wlst/istio-fix-domain.py

@@ -1,4 +1,4 @@
-# Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright 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.
 
 def getEnvVar(var):
@@ -69,9 +69,14 @@ def getEnvVar(var):
 set('TwoWaySslEnabled', false)
 set('ClientCertificateEnforced', false)
 
-cd('/Servers/%s/NetworkAccessPoints/T3Channel' % admin_server_name)
-set('ListenAddress', '127.0.0.1')
+cd('/Servers/' + admin_server_name)
+delete('T3Channel', 'NetworkAccessPoint')
+create('istio-T3Channel', 'NetworkAccessPoint')
+cd('/Servers/%s/NetworkAccessPoints/istio-T3Channel' % admin_server_name)
+set('PublicPort', t3_channel_port)
 set('PublicAddress', domain_uid + '-' + admin_server_name)
+set('ListenAddress', '127.0.0.1')
+set('ListenPort', t3_channel_port)
 
 templateName = cluster_name + "-template"
 cd('/ServerTemplates/%s' % templateName)

model/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainSpec.java

@@ -505,13 +505,23 @@ public void setConfigOverrideSecrets(@Nullable List<String> overridesSecretNames
     this.configOverrideSecrets = overridesSecretNames;
   }
 
+  /**
+   * Test if the domain is deployed under Istio environment.
+   *
+   * @return istioEnabled
+   */
   boolean istioEnabled() {
     return Optional.ofNullable(experimental)
         .map(e -> e.getIstio())
         .map(i -> i.getEnabled())
         .orElse(false);
   }
 
+  /**
+   * The WebLogic readiness port used under Istio environment.
+   *
+   * @return readinessPort
+   */
   int getIstioReadinessPort() {
     return Optional.ofNullable(experimental)
         .map(e -> e.getIstio())

model/src/main/java/oracle/kubernetes/weblogic/domain/model/Istio.java

@@ -12,11 +12,11 @@
 public class Istio {
 
   @Description(
-      "True, if this domain is deployed under an Istio service mesh. Defaults to true. Not required.")
-  private Boolean enabled = true;
+      "True, if this domain is deployed under an Istio service mesh. Defaults to false. Not required.")
+  private Boolean enabled = false;
 
   @Description("The WebLogic readiness port for Istio. Defaults to 8888. Not required.")
-  private Integer readinessPort = 8666;
+  private Integer readinessPort = 8888;
 
   /**
    * True, if this domain is deployed under an Istio service mesh.
@@ -37,7 +37,7 @@ public void setEnabled(Boolean enabled) {
   }
 
   /**
-   * Get the readyness port.
+   * Get the readiness port.
    *
    * @return the readiness port.
    */

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

@@ -111,7 +111,8 @@ static V1beta1CustomResourceDefinition createModel(KubernetesVersion version) {
 
     static V1ObjectMeta createMetadata() {
       return new V1ObjectMeta()
-          .name(KubernetesConstants.CRD_NAME);
+          .name(KubernetesConstants.CRD_NAME)
+          .putLabelsItem(LabelConstants.RESOURCE_VERSION_LABEL, DEFAULT_OPERATOR_VERSION);
     }
 
     static V1beta1CustomResourceDefinitionSpec createSpec(KubernetesVersion version) {

operator/src/main/resources/scripts/introspectDomain.py

@@ -853,13 +853,13 @@ def customizeNetworkAccessPoint(self, nap, listen_address):
     # FWIW there's theoretically no need to 'add' or 'replace' when empty
     #   since the runtime default is the server listen-address.
     nap_name=nap.getName()
-    if not (nap.getListenAddress() is None) and len(nap.getListenAddress()) > 0 and not (nap_name.startswith('istio-')) and not (nap_name == 'T3Channel'):
-      self.writeln("<d:network-access-point>")
-      self.indent()
-      self.writeln("<d:name>" + nap_name + "</d:name>")
-      self.writeListenAddress("force a replace",listen_address)
-      self.undent()
-      self.writeln("</d:network-access-point>")
+    if not (nap.getListenAddress() is None) and len(nap.getListenAddress()) > 0 and not (nap_name.startswith('istio-')):
+        self.writeln("<d:network-access-point>")
+        self.indent()
+        self.writeln("<d:name>" + nap_name + "</d:name>")
+        self.writeListenAddress("force a replace",listen_address)
+        self.undent()
+        self.writeln("</d:network-access-point>")
 
   def getLogOrNone(self,server):
     try: