Remove new schema elements

rjeberhard · rjeberhard · commit cac071d5a4d2 · 2020-05-17T22:11:53.000-04:00
diff --git a/docs/charts/index.yaml b/docs/charts/index.yaml
@@ -2,83 +2,83 @@ apiVersion: v1
 entries:
   weblogic-operator:
   - apiVersion: v1
-    created: "2020-05-15T16:54:20.429278-04:00"
+    created: "2020-05-17T22:08:28.342182-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: 5f4cd8f4f3282b52b5e90a1169f26986e8272671845053606ade9c855fb04151
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.0-rc1.tgz
     version: 3.0.0-rc1
   - apiVersion: v1
-    created: "2020-05-15T16:54:20.4271-04:00"
+    created: "2020-05-17T22:08:28.340391-04:00"
     description: Helm chart for configuring the WebLogic operator.
-    digest: c8a648d4f510f346af67134383b913502c431c2d4abb016b266da60ed9f06afc
+    digest: cf0b011ce86b9f8808d0367253f84e1dcd325c862fe6a67a5205c0fb5eaeda63
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.6.0.tgz
     version: 2.6.0
   - apiVersion: v1
-    created: "2020-05-15T16:54:20.426209-04:00"
+    created: "2020-05-17T22:08:28.338351-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: fe41421b7dc45dc8a3b2888d3a626a37f5d3c8e1fa292fb6699deedc5e1db33d
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.5.0.tgz
     version: 2.5.0
   - apiVersion: v1
-    created: "2020-05-15T16:54:20.424437-04:00"
+    created: "2020-05-17T22:08:28.336814-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: b36bd32083f67453a62d089a2c09ce38e6655d88ac8a7b38691230c55c40e672
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.4.0.tgz
     version: 2.4.0
   - apiVersion: v1
-    created: "2020-05-15T16:54:20.422439-04:00"
+    created: "2020-05-17T22:08:28.334973-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: a3eafe4c2c6ff49384e56421201e59a3737d651af8d5b605b87a19eb1f6f1dc3
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.1.tgz
     version: 2.3.1
   - apiVersion: v1
-    created: "2020-05-15T16:54:20.418447-04:00"
+    created: "2020-05-17T22:08:28.330917-04:00"
     description: Helm chart for configuring the WebLogic operator.
     digest: cbc6caaa6eb28e3c7e906ede14b2ae511a0b35fc12a8e3ab629155b09993e8b2
     name: weblogic-operator
     urls:
     - https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.0.tgz
     version: 2.3.0
   - apiVersion: v1
-    created: "2020-05-15T16:54:20.415442-04:00"
+    created: "2020-05-17T22:08:28.325929-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
   - apiVersion: v1
-    created: "2020-05-15T16:54:20.413075-04:00"
+    created: "2020-05-17T22:08:28.324297-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
   - apiVersion: v1
-    created: "2020-05-15T16:54:20.411139-04:00"
+    created: "2020-05-17T22:08:28.322835-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"
   - apiVersion: v1
-    created: "2020-05-15T16:54:20.407669-04:00"
+    created: "2020-05-17T22:08:28.321141-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: "2020-05-15T16:54:20.405551-04:00"
+generated: "2020-05-17T22:08:28.319178-04:00"
diff --git a/docs/charts/weblogic-operator-2.6.0.tgz b/docs/charts/weblogic-operator-2.6.0.tgz
diff --git a/docs/domains/Domain.json b/docs/domains/Domain.json
@@ -109,10 +109,6 @@
           "description": "The name of this cluster. Required",
           "type": "string"
         },
-        "allowReplicasBelowMinDynClusterSize": {
-          "description": "If true (the default), then the number of replicas is allowed to drop below the minimum dynamic cluster size configured in the WebLogic domain home configuration. Otherwise, the operator will ensure that the number of replicas is not less than the minimum dynamic cluster setting. This setting applies to dynamic clusters only.",
-          "type": "boolean"
-        },
         "serverPod": {
           "description": "Configuration affecting server pods.",
           "$ref": "#/definitions/ServerPod"
diff --git a/docs/domains/Domain.md b/docs/domains/Domain.md
@@ -74,7 +74,6 @@ An element representing a cluster in the domain configuration.
 
 | Name | Type | Description |
 | --- | --- | --- |
-| `allowReplicasBelowMinDynClusterSize` | Boolean | If true (the default), then the number of replicas is allowed to drop below the minimum dynamic cluster size configured in the WebLogic domain home configuration. Otherwise, the operator will ensure that the number of replicas is not less than the minimum dynamic cluster setting. This setting applies to dynamic clusters only. |
 | `clusterName` | string | The name of this cluster. Required |
 | `clusterService` | [Kubernetes Resource](#kubernetes-resource) | Customization affecting ClusterIP Kubernetes services for the WebLogic cluster. |
 | `maxUnavailable` | number | The maximum number of cluster members that can be temporarily unavailable. Defaults to 1. |
diff --git a/docs/domains/index.html b/docs/domains/index.html
@@ -1029,10 +1029,6 @@
           "description": "The name of this cluster. Required",
           "type": "string"
         },
-        "allowReplicasBelowMinDynClusterSize": {
-          "description": "If true (the default), then the number of replicas is allowed to drop below the minimum dynamic cluster size configured in the WebLogic domain home configuration. Otherwise, the operator will ensure that the number of replicas is not less than the minimum dynamic cluster setting. This setting applies to dynamic clusters only.",
-          "type": "boolean"
-        },
         "serverPod": {
           "description": "Configuration affecting server pods.",
           "$ref": "#/definitions/ServerPod"
diff --git a/kubernetes/crd/domain-crd.yaml b/kubernetes/crd/domain-crd.yaml
@@ -15804,14 +15804,6 @@ spec:
                     clusterName:
                       description: The name of this cluster. Required
                       type: string
-                    allowReplicasBelowMinDynClusterSize:
-                      description: If true (the default), then the number of replicas
-                        is allowed to drop below the minimum dynamic cluster size
-                        configured in the WebLogic domain home configuration. Otherwise,
-                        the operator will ensure that the number of replicas is not
-                        less than the minimum dynamic cluster setting. This setting
-                        applies to dynamic clusters only.
-                      type: boolean
                     serverPod:
                       description: Configuration affecting server pods.
                       type: object
diff --git a/kubernetes/crd/domain-v1beta1-crd.yaml b/kubernetes/crd/domain-v1beta1-crd.yaml
@@ -15489,14 +15489,6 @@ spec:
                   clusterName:
                     description: The name of this cluster. Required
                     type: string
-                  allowReplicasBelowMinDynClusterSize:
-                    description: If true (the default), then the number of replicas
-                      is allowed to drop below the minimum dynamic cluster size configured
-                      in the WebLogic domain home configuration. Otherwise, the operator
-                      will ensure that the number of replicas is not less than the
-                      minimum dynamic cluster setting. This setting applies to dynamic
-                      clusters only.
-                    type: boolean
                   serverPod:
                     description: Configuration affecting server pods.
                     type: object
diff --git a/operator/src/main/java/oracle/kubernetes/weblogic/domain/ClusterConfigurator.java b/operator/src/main/java/oracle/kubernetes/weblogic/domain/ClusterConfigurator.java
@@ -128,6 +128,4 @@ ClusterConfigurator withLivenessProbeSettings(
   ClusterConfigurator withToleration(V1Toleration toleration);
 
   ClusterConfigurator withPrecreateServerService(boolean precreateServerService);
-
-  ClusterConfigurator withAllowReplicasBelowDynClusterSize(boolean allowReplicasBelowDynClusterSize);
 }
diff --git a/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/Cluster.java b/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/Cluster.java
@@ -4,7 +4,6 @@
 package oracle.kubernetes.weblogic.domain.model;
 
 import java.util.Map;
-import java.util.Optional;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -59,15 +58,6 @@ public class Cluster extends BaseConfiguration implements Comparable<Cluster> {
   @Expose
   private KubernetesResource clusterService = new KubernetesResource();
 
-  /** Whether to allow the number of replicas to drop below the minimum dynamic cluster
-   *  size configured in the WebLogic domain home configuration. Default is true. */
-  @Description("If true (the default), then the number of replicas is allowed to drop below the "
-      + "minimum dynamic cluster size configured in the WebLogic domain home configuration. "
-      + "Otherwise, the operator will ensure that the number of replicas is not less than "
-      + "the minimum dynamic cluster setting. This setting applies to dynamic clusters only."
-  )
-  private Boolean allowReplicasBelowMinDynClusterSize;
-
   protected Cluster getConfiguration() {
     Cluster configuration = new Cluster();
     configuration.fillInFrom(this);
@@ -104,12 +94,7 @@ public void setReplicas(Integer replicas) {
    *     configured in the WebLogic domain home configuration.
    */
   public boolean isAllowReplicasBelowMinDynClusterSize() {
-    return Optional.ofNullable(allowReplicasBelowMinDynClusterSize)
-        .orElse(KubernetesConstants.DEFAULT_ALLOW_REPLICAS_BELOW_MIN_DYN_CLUSTER_SIZE);
-  }
-
-  public void setAllowReplicasBelowMinDynClusterSize(boolean value) {
-    allowReplicasBelowMinDynClusterSize = value;
+    return KubernetesConstants.DEFAULT_ALLOW_REPLICAS_BELOW_MIN_DYN_CLUSTER_SIZE;
   }
 
   @Nullable
@@ -172,7 +157,6 @@ public String toString() {
         .append("serverStartPolicy", serverStartPolicy)
         .append("clusterService", clusterService)
         .append("maxUnavailable", maxUnavailable)
-        .append("allowReplicasBelowMinDynClusterSize", allowReplicasBelowMinDynClusterSize)
         .toString();
   }
 
@@ -195,7 +179,6 @@ public boolean equals(Object o) {
         .append(serverStartPolicy, cluster.serverStartPolicy)
         .append(clusterService, cluster.clusterService)
         .append(maxUnavailable, cluster.maxUnavailable)
-        .append(allowReplicasBelowMinDynClusterSize, cluster.allowReplicasBelowMinDynClusterSize)
         .isEquals();
   }
 
@@ -208,7 +191,6 @@ public int hashCode() {
         .append(serverStartPolicy)
         .append(clusterService)
         .append(maxUnavailable)
-        .append(allowReplicasBelowMinDynClusterSize)
         .toHashCode();
   }
 
diff --git a/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainCommonConfigurator.java b/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainCommonConfigurator.java
@@ -641,12 +641,6 @@ public ClusterConfigurator withNodeName(String nodeName) {
       return this;
     }
 
-    @Override
-    public ClusterConfigurator withAllowReplicasBelowDynClusterSize(boolean allowReplicasBelowDynClusterSize) {
-      cluster.setAllowReplicasBelowMinDynClusterSize(allowReplicasBelowDynClusterSize);
-      return this;
-    }
-
     @Override
     public ClusterConfigurator withSchedulerName(String schedulerName) {
       getDomainSpec().setSchedulerName(schedulerName);
diff --git a/operator/src/test/java/oracle/kubernetes/operator/steps/ManagedServersUpStepTest.java b/operator/src/test/java/oracle/kubernetes/operator/steps/ManagedServersUpStepTest.java
@@ -550,19 +550,6 @@ public void whenClusterStartupDefinedWithPreCreateServerService_allServersDown_a
     assertThat(getServers(), empty());
   }
 
-  @Test
-  public void whenReplicasLessThanMinDynClusterSize_setReplicaCountToMinClusterSize() {
-    startNoServers();
-    setCluster1Replicas(0);
-    setCluster1AllowReplicasBelowMinDynClusterSize(false);
-
-    addDynamicWlsCluster("cluster1", 2, 5,"ms1", "ms2", "ms3", "ms4", "ms5");
-
-    invokeStep();
-
-    assertThat(2, equalTo(domain.getReplicaCount("cluster1")));
-  }
-
   @Test
   public void whenReplicasLessThanMinDynClusterSize_allowBelowMin_doNotChangeReplicaCount() {
     startNoServers();
@@ -575,19 +562,6 @@ public void whenReplicasLessThanMinDynClusterSize_allowBelowMin_doNotChangeRepli
     assertThat(0, equalTo(domain.getReplicaCount("cluster1")));
   }
 
-  @Test
-  public void whenReplicasMoreThanMinDynClusterSize_doNotChangeReplicaCount() {
-    startNoServers();
-    setCluster1Replicas(3);
-    setCluster1AllowReplicasBelowMinDynClusterSize(false);
-
-    addDynamicWlsCluster("cluster1", 2, 5,"ms1", "ms2", "ms3", "ms4", "ms5");
-
-    invokeStep();
-
-    assertThat(3, equalTo(domain.getReplicaCount("cluster1")));
-  }
-
   private void assertStoppingServers(Step step, String... servers) {
     assertThat(((ServerDownIteratorStep) step).getServersToStop(), containsInAnyOrder(servers));
   }
@@ -619,10 +593,6 @@ private void setCluster1Replicas(int replicas) {
     configurator.configureCluster("cluster1").withReplicas(replicas);
   }
 
-  private void setCluster1AllowReplicasBelowMinDynClusterSize(boolean allowReplicasBelowMinDynClusterSize) {
-    configurator.configureCluster("cluster1").withAllowReplicasBelowDynClusterSize(allowReplicasBelowMinDynClusterSize);
-  }
-
   private void configureServers(String... serverNames) {
     for (String serverName : serverNames) {
       configureServerToStart(serverName);
diff --git a/operator/src/test/java/oracle/kubernetes/weblogic/domain/DomainTestBase.java b/operator/src/test/java/oracle/kubernetes/weblogic/domain/DomainTestBase.java
@@ -319,13 +319,6 @@ public void afterMaxUnavailableSetForCluster_canReadIt() {
     assertThat(domain.getMaxUnavailable("cluster1"), equalTo(5));
   }
 
-  @Test
-  public void afterAllowReplicasBelowMinDynamicClusterSizeSetForCluster_canReadIt() {
-    configureCluster("cluster1").withAllowReplicasBelowDynClusterSize(false);
-
-    assertThat(domain.isAllowReplicasBelowMinDynClusterSize("cluster1"), equalTo(false));
-  }
-
   @Test
   public void whenNotSpecified_allowReplicasBelowMinDynamicClusterSizeHasDefault() {
     configureCluster("cluster1");

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,4 @@ ClusterConfigurator withLivenessProbeSettings(`
`128`	`128`	`ClusterConfigurator withToleration(V1Toleration toleration);`
`129`	`129`
`130`	`130`	`ClusterConfigurator withPrecreateServerService(boolean precreateServerService);`
`131`		`-`
`132`		`- ClusterConfigurator withAllowReplicasBelowDynClusterSize(boolean allowReplicasBelowDynClusterSize);`
`133`	`131`	`}`