make istio object in Domain yaml work

Author: davidzl

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

@@ -47,8 +47,6 @@ 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:
@@ -78,4 +76,7 @@ spec:
   # The number of managed servers to start for unlisted clusters
   # replicas: 1
   # 
-  istioEnabled: %ISTIO_ENABLED%
+  experimental:
+    istio:
+      enabled: %ISTIO_ENABLED%
+      readinessPort: %ISTIO_READINESS_PORT%

kubernetes/samples/scripts/common/utility.sh

@@ -369,6 +369,7 @@ function createFiles {
     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}
@@ -425,6 +426,7 @@ function createFiles {
   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
 

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

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

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

@@ -73,6 +73,8 @@ spec:
               value: "%DOMAIN_ROOT_DIR%/logs/%DOMAIN_UID%"
             - name: ISTIO_ENABLED
               value: "%ISTIO_ENABLED%"
+            - name: ISTIO_READINESS_PORT
+              value: "%ISTIO_READINESS_PORT%"
       volumes:
         - name: create-weblogic-sample-domain-job-cm-volume
           configMap:

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

@@ -10,8 +10,6 @@ export DOMAIN_HOME=${DOMAIN_HOME_DIR}
 # Create the domain
 wlst.sh -skipWLSModuleScanning ${CREATE_DOMAIN_SCRIPT_DIR}/create-domain.py
 
-echo "###### ISTIO_ENABLED=${ISTIO_ENABLED}"
-
 if [ "${ISTIO_ENABLED}" == "true" ]; then
   wlst.sh -skipWLSModuleScanning ${CREATE_DOMAIN_SCRIPT_DIR}/istio-fix-domain.py
 fi

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

@@ -24,6 +24,7 @@ def getEnvVar(var):
 managed_server_name_base_svc = getEnvVar("MANAGED_SERVER_NAME_BASE_SVC")
 domain_logs                  = getEnvVar("DOMAIN_LOGS_DIR")
 script_dir                   = getEnvVar("CREATE_DOMAIN_SCRIPT_DIR")
+istio_readiness_port         = int(getEnvVar("ISTIO_READINESS_PORT"))
 
 # Update Domain for Istio
 readDomain(domain_path)
@@ -34,7 +35,7 @@ def getEnvVar(var):
 set('Protocol', 'http')
 set('ListenAddress', '127.0.0.1')
 set('PublicAddress', domain_uid + '-' + admin_server_name)
-set('ListenPort', 8888)
+set('ListenPort', istio_readiness_port)
 set('HttpEnabledForThisProtocol', true)
 set('TunnelingEnabled', false)
 set('OutboundEnabled', false)
@@ -79,7 +80,7 @@ def getEnvVar(var):
 set('Protocol', 'http')
 set('ListenAddress', '127.0.0.1')
 set('PublicAddress', domain_uid + '-' + managed_server_name_base + '${id}')
-set('ListenPort', 8888)
+set('ListenPort', istio_readiness_port)
 set('HttpEnabledForThisProtocol', true)
 set('TunnelingEnabled', false)
 set('OutboundEnabled', false)

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

@@ -369,6 +369,10 @@ public boolean istioEnabled() {
     return spec.istioEnabled();
   }
 
+  public int getIstioReadinessPort() {
+    return spec.getIstioReadinessPort();
+  }
+
   /**
    * Returns the domain home.
    *

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

@@ -508,7 +508,15 @@ public void setConfigOverrideSecrets(@Nullable List<String> overridesSecretNames
   boolean istioEnabled() {
     return Optional.ofNullable(experimental)
         .map(e -> e.getIstio())
-        .map(i -> i.getIstioEnabled()).orElse(false);
+        .map(i -> i.getEnabled())
+        .orElse(false);
+  }
+
+  int getIstioReadinessPort() {
+    return Optional.ofNullable(experimental)
+        .map(e -> e.getIstio())
+        .map(i -> i.getReadinessPort())
+        .orElse(8888);
   }
 
   @Override

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

@@ -11,25 +11,47 @@
 
 public class Istio {
 
-  @Description("True, if this domain is deployed under an Istio service mesh. Defaults to true. Not required.")
-  private Boolean istioEnabled = true;
+  @Description(
+      "True, if this domain is deployed under an Istio service mesh. Defaults to true. Not required.")
+  private Boolean enabled = true;
+
+  @Description("The WebLogic readiness port for Istio. Defaults to 8888. Not required.")
+  private Integer readinessPort = 8666;
 
   /**
    * True, if this domain is deployed under an Istio service mesh.
    *
    * @return True, if this domain is deployed under an Istio service mesh.
    */
-  public Boolean getIstioEnabled() {
-    return this.istioEnabled;
+  public Boolean getEnabled() {
+    return this.enabled;
   }
 
   /**
    * Sets the Istio enabled status.
    *
-   * @param istioEnabled True, if this domain is deployed under an Istio service mesh.
+   * @param enabled True, if this domain is deployed under an Istio service mesh.
+   */
+  public void setEnabled(Boolean enabled) {
+    this.enabled = enabled;
+  }
+
+  /**
+   * Get the readyness port.
+   *
+   * @return the readiness port.
    */
-  public void setIstioEnabled(Boolean istioEnabled) {
-    this.istioEnabled = istioEnabled;
+  public Integer getReadinessPort() {
+    return this.readinessPort;
+  }
+
+  /**
+   * Sets the Istio readiness port.
+   *
+   * @param readinessPort the Istio readiness port.
+   */
+  public void setReadinessPort(Integer readinessPort) {
+    this.readinessPort = readinessPort;
   }
 
   /**
@@ -39,25 +61,23 @@ public void setIstioEnabled(Boolean istioEnabled) {
    * @return this
    */
   public Istio withIstioEnabled(Boolean istioEnabled) {
-    this.istioEnabled = istioEnabled;
+    this.enabled = istioEnabled;
     return this;
   }
 
-
   @Override
   public String toString() {
     ToStringBuilder builder =
         new ToStringBuilder(this)
-            .append("istioEnabled", istioEnabled);
+            .append("enabled", enabled)
+            .append("readinessPort", readinessPort);
 
     return builder.toString();
   }
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder =
-        new HashCodeBuilder()
-            .append(istioEnabled);
+    HashCodeBuilder builder = new HashCodeBuilder().append(enabled).append(readinessPort);
 
     return builder.toHashCode();
   }
@@ -74,7 +94,9 @@ public boolean equals(Object other) {
     Istio rhs = ((Istio) other);
     EqualsBuilder builder =
         new EqualsBuilder()
-            .append(istioEnabled, rhs.istioEnabled);
+            .append(enabled, rhs.enabled)
+            .append("readinessPort", rhs.readinessPort);
+    ;
 
     return builder.isEquals();
   }

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

@@ -626,9 +626,11 @@ private V1Probe createReadinessProbe(TuningParameters.PodTuning tuning) {
         .periodSeconds(getReadinessProbePeriodSeconds(tuning))
         .failureThreshold(FAILURE_THRESHOLD);
     try {
-      boolean istioEnabled = Boolean.valueOf(System.getenv("ISTIO_ENABLED"));
+      boolean istioEnabled = getDomain().istioEnabled();
       if (istioEnabled) {
-        readinessProbe = readinessProbe.httpGet(httpGetAction(READINESS_PATH, 8888, false));
+        int istioReadinessPort = getDomain().getIstioReadinessPort();
+        readinessProbe =
+            readinessProbe.httpGet(httpGetAction(READINESS_PATH, istioReadinessPort, false));
       } else {
         readinessProbe =
             readinessProbe.httpGet(