Move Istio to Experimental

Author: rjeberhard

docs/domains/Domain.json

@@ -249,9 +249,9 @@
           "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"
+        "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.",
@@ -362,6 +362,15 @@
         }
       }
     },
+    "Experimental": {
+      "type": "object",
+      "properties": {
+        "istio": {
+          "description": "Istio service mesh integration configuration.",
+          "$ref": "#/definitions/Istio"
+        }
+      }
+    },
     "Istio": {
       "type": "object",
       "properties": {

docs/domains/Domain.md

@@ -23,11 +23,11 @@ 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. |
 | `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. |
@@ -82,11 +82,11 @@ 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
+### Experimental
 
 | Name | Type | Description |
 | --- | --- | --- |
-| `istioEnabled` | Boolean | True, if this domain is deployed under an Istio service mesh. Defaults to true. Not required. |
+| `istio` | [Istio](#istio) | Istio service mesh integration configuration. |
 
 ### Managed Server
 
@@ -175,6 +175,12 @@ 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 |
+| --- | --- | --- |
+| `istioEnabled` | Boolean | True, if this domain is deployed under an Istio service mesh. Defaults to true. Not required. |
+
 ### Probe Tuning
 
 | Name | Type | Description |

docs/domains/index.html

@@ -1169,9 +1169,9 @@
           "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"
+        "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.",
@@ -1282,6 +1282,15 @@
         }
       }
     },
+    "Experimental": {
+      "type": "object",
+      "properties": {
+        "istio": {
+          "description": "Istio service mesh integration configuration.",
+          "$ref": "#/definitions/Istio"
+        }
+      }
+    },
     "Istio": {
       "type": "object",
       "properties": {

integration-tests/src/test/resources/OperatorIT.properties

@@ -10,4 +10,4 @@ waitTimePod=10
 weblogicImageTag = 12.2.1.3
 weblogicImageName = container-registry.oracle.com/middleware/weblogic
 OCR_SERVER="container-registry.oracle.com"
-DOMAIN_API_VERSION = weblogic.oracle/v4
+DOMAIN_API_VERSION = weblogic.oracle/v5

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

@@ -4,7 +4,7 @@
 #
 # This is an example of how to define a Domain resource.
 #
-apiVersion: "weblogic.oracle/v4"
+apiVersion: "weblogic.oracle/v5"
 kind: Domain
 metadata:
   name: %DOMAIN_UID%

kubernetes/samples/scripts/create-weblogic-domain/manually-create-domain/domain.yaml

@@ -5,7 +5,7 @@
 # This is an example of how to define a Domain resource.  Please read through the comments which explain
 # what updates are needed.
 #
-apiVersion: "weblogic.oracle/v4"
+apiVersion: "weblogic.oracle/v5"
 kind: Domain
 metadata:
   # Update this with the `domainUID` of your domain:

model/src/main/java/oracle/kubernetes/operator/KubernetesConstants.java

@@ -22,8 +22,8 @@ public interface KubernetesConstants {
   String DOMAIN_PLURAL = "domains";
   String DOMAIN_SINGULAR = "domain";
   String DOMAIN_SHORT = "dom";
-  String DOMAIN_VERSION = "v4";
-  String[] DOMAIN_ALTERNATE_VERSIONS = {"v2", "v3"};
+  String DOMAIN_VERSION = "v5";
+  String[] DOMAIN_ALTERNATE_VERSIONS = {"v2", "v3", "v4"};
 
   boolean DEFAULT_INCLUDE_SERVER_OUT_IN_POD_LOG = true;
 

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

@@ -196,8 +196,8 @@ public class DomainSpec extends BaseConfiguration {
   @Description("Configuration for the clusters.")
   protected List<Cluster> clusters = new ArrayList<>();
 
-  @Description("Istio service mesh integration configuration.")
-  private Istio istio;
+  @Description("Experimental feature configurations.")
+  private Experimental experimental;
 
   /**
    * Adds a Cluster to the DomainSpec.
@@ -506,36 +506,9 @@ public void setConfigOverrideSecrets(@Nullable List<String> overridesSecretNames
   }
 
   boolean istioEnabled() {
-    return Optional.ofNullable(istio).map(i -> i.getIstioEnabled()).orElse(false);
-  }
-
-  /**
-   * Istio service mesh integration configuration.
-   *
-   * @return Istio service mesh integration configuration.
-   */
-  public Istio getIstio() {
-    return this.istio;
-  }
-
-  /**
-   * Istio service mesh integration configuration.
-   *
-   * @param istio Istio service mesh integration configuration.
-   */
-  public void setIstio(Istio istio) {
-    this.istio = istio;
-  }
-
-  /**
-   * Istio service mesh integration configuration.
-   *
-   * @param istio Istio service mesh integration configuration.
-   * @return this
-   */
-  public DomainSpec withIstio(Istio istio) {
-    this.istio = istio;
-    return this;
+    return Optional.ofNullable(experimental)
+        .map(e -> e.getIstio())
+        .map(i -> i.getIstioEnabled()).orElse(false);
   }
 
   @Override
@@ -560,7 +533,7 @@ public String toString() {
             .append("includeServerOutInPodLog", includeServerOutInPodLog)
             .append("configOverrides", configOverrides)
             .append("configOverrideSecrets", configOverrideSecrets)
-            .append("istio", istio);
+            .append("experimental", experimental);
 
     return builder.toString();
   }
@@ -587,7 +560,7 @@ public int hashCode() {
             .append(includeServerOutInPodLog)
             .append(configOverrides)
             .append(configOverrideSecrets)
-            .append(istio);
+            .append(experimental);
 
     return builder.toHashCode();
   }
@@ -622,7 +595,7 @@ public boolean equals(Object other) {
             .append(includeServerOutInPodLog, rhs.includeServerOutInPodLog)
             .append(configOverrides, rhs.configOverrides)
             .append(configOverrideSecrets, rhs.configOverrideSecrets)
-            .append(istio, rhs.istio);
+            .append(experimental, rhs.experimental);
 
     return builder.isEquals();
   }

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

@@ -0,0 +1,80 @@
+// 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.
+
+package oracle.kubernetes.weblogic.domain.model;
+
+import oracle.kubernetes.json.Description;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+public class Experimental {
+
+  @Description("Istio service mesh integration configuration.")
+  private Istio istio;
+
+  /**
+   * Istio service mesh integration configuration.
+   *
+   * @return Istio service mesh integration configuration.
+   */
+  public Istio getIstio() {
+    return this.istio;
+  }
+
+  /**
+   * Istio service mesh integration configuration.
+   *
+   * @param istio Istio service mesh integration configuration.
+   */
+  public void setIstio(Istio istio) {
+    this.istio = istio;
+  }
+
+  /**
+   * Istio service mesh integration configuration.
+   *
+   * @param istio Istio service mesh integration configuration.
+   * @return this
+   */
+  public Experimental withIstio(Istio istio) {
+    this.istio = istio;
+    return this;
+  }
+
+  @Override
+  public String toString() {
+    ToStringBuilder builder =
+        new ToStringBuilder(this)
+            .append("istio", istio);
+
+    return builder.toString();
+  }
+
+  @Override
+  public int hashCode() {
+    HashCodeBuilder builder =
+        new HashCodeBuilder()
+            .append(istio);
+
+    return builder.toHashCode();
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    if (other == this) {
+      return true;
+    }
+    if (!(other instanceof Experimental)) {
+      return false;
+    }
+
+    Experimental rhs = ((Experimental) other);
+    EqualsBuilder builder =
+        new EqualsBuilder()
+            .append(istio, rhs.istio);
+
+    return builder.isEquals();
+  }
+}