Merge branch 'feature/dynamic-cluster' of https://github.com/oracle/weblogic-kubernetes-operator into feature/dynamic-cluster

Author: alai8

kubernetes/internal/create-weblogic-domain-job-template.yaml

@@ -231,11 +231,8 @@ data:
       set('ServerTemplate', st1)
       set('ServerNamePrefix', "%MANAGED_SERVER_NAME_BASE%")
       set('DynamicClusterSize', number_of_ms)
-      set('MaxDynamicClusterSize', 800)
-      #set('CalculatedMachineNames', true)
+      set('MaxDynamicClusterSize', number_of_ms)
       set('CalculatedListenPorts', false)
-      #machineNameExpression = '%DOMAIN_UID%-%s-machine*' % cluster_name
-      #set('MachineNameMatchExpression', machineNameExpression)
       set('Id', 1)
 
       print('Done setting attributes for Dynamic Cluster: %s' % cluster_name);

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

@@ -639,16 +639,8 @@ protected V1Pod computeManagedPodConfig(TuningParameters configMapHelper, Packet
       V1ContainerPort containerPort = new V1ContainerPort();
       containerPort.setContainerPort(scan.getListenPort());
       containerPort.setProtocol("TCP");
-//      containerPort.setName("weblogic"); // commented out as we are not exposing node manager port
       container.addPortsItem(containerPort);
 
-      // Commented out as we are not exposing node manager port
-//      V1ContainerPort nmPort = new V1ContainerPort();
-//      nmPort.setContainerPort(5556);
-//      nmPort.setProtocol("TCP");
-//      nmPort.setName("node-manager");
-//      container.addPortsItem(nmPort);
-
       V1Lifecycle lifecycle = new V1Lifecycle();
       V1Handler preStop = new V1Handler();
       V1ExecAction exec = new V1ExecAction();

operator/src/main/java/oracle/kubernetes/operator/logging/MessageKeys.java

@@ -141,5 +141,4 @@ private MessageKeys() {}
   public static final String WLS_UPDATE_CLUSTER_SIZE_INVALID_CLUSTER = "WLSKO-0131";
   public static final String WLS_CLUSTER_SIZE_UPDATED = "WLSKO-0132";
   public static final String WLS_SERVER_TEMPLATE_NOT_FOUND = "WLSKO-0133";
-  public static final String WLS_CREATING_MACHINE = "WLSKO-0134";
 }

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/Util.java

@@ -171,14 +171,11 @@ public int getMaxDynamicClusterSize() {
    * It is the responsibility of the caller to persist the changes to ClusterStartup to kubernetes.
    *
    * @param clusterStartup The ClusterStartup to be validated against the WLS configuration
-   * @param machineNamePrefix Optional, if this is not null, also validate whether the WebLogic domain already contains
-   *                          all the machines that will be used by the dynamic cluster
    * @param suggestedConfigUpdates A List containing suggested WebLogic configuration update to be filled in by this
    *                              method. Optional.
    * @return true if the DomainSpec has been updated, false otherwise
    */
   public boolean validateClusterStartup(ClusterStartup clusterStartup,
-                                        String machineNamePrefix,
                                         List<ConfigUpdate> suggestedConfigUpdates) {
     LOGGER.entering();
 
@@ -190,7 +187,7 @@ public boolean validateClusterStartup(ClusterStartup clusterStartup,
     }
 
     // Warns if replicas is larger than the number of servers configured in the cluster
-    validateReplicas(clusterStartup.getReplicas(), machineNamePrefix,"clusterStartup", suggestedConfigUpdates);
+    validateReplicas(clusterStartup.getReplicas(),"clusterStartup", suggestedConfigUpdates);
 
     LOGGER.exiting(modified);
 
@@ -204,34 +201,33 @@ public boolean validateClusterStartup(ClusterStartup clusterStartup,
    *
    * @param replicas The configured replicas value for this cluster in the kubernetes weblogic domain spec
    *                 for this cluster
-   * @param machineNamePrefix Optional, if this is not null, also validate whether the WebLogic domain already contains
-   *                          all the machines that will be used by the dynamic cluster
    * @param source The name of the section in the domain spec where the replicas is specified,
    *               for logging purposes
    * @param suggestedConfigUpdates A List containing suggested WebLogic configuration update to be filled in by this
    *                               method. Optional.
    */
-  public void validateReplicas(Integer replicas, String machineNamePrefix,
+  public void validateReplicas(Integer replicas,
                                String source, List<ConfigUpdate> suggestedConfigUpdates) {
     if (replicas == null) {
       return;
     }
-    // log warning if replicas is too large and cluster only contains statically configured servers
-    if (!hasDynamicServers() && replicas > getClusterSize()) {
-      LOGGER.warning(MessageKeys.REPLICA_MORE_THAN_WLS_SERVERS, source, clusterName, replicas, getClusterSize());
+    // log warning if replicas is too large and cluster
+    int maxClusterSize = getClusterSize();
+    if (hasDynamicServers()) {
+      maxClusterSize += getMaxDynamicClusterSize();
+    }
+    if (replicas > maxClusterSize) {
+      LOGGER.warning(MessageKeys.REPLICA_MORE_THAN_WLS_SERVERS, source, clusterName, replicas, maxClusterSize);
     }
     // recommend updating WLS dynamic cluster size and machines if requested to recommend
     // updates, ie, suggestedConfigUpdates is not null, and if replicas value is larger than
-    // the current dynamic cluster size, or if some of the machines to be used for the dynamic
-    // servers are not yet configured.
+    // the current dynamic cluster size.
     //
     // Note: Never reduce the value of dynamicClusterSize even during scale down
-    if (suggestedConfigUpdates != null) {
-      if (hasDynamicServers()) {
-//        if (replicas > getDynamicClusterSize() || !verifyMachinesConfigured(machineNamePrefix, replicas)) {
-        if (replicas > getDynamicClusterSize() ) {
-          suggestedConfigUpdates.add(new DynamicClusterSizeConfigUpdate(this, Math.max(replicas, getDynamicClusterSize())));
-        }
+    if (suggestedConfigUpdates != null && hasDynamicServers()) {
+      if (replicas > getDynamicClusterSize() && getDynamicClusterSize() < getMaxDynamicClusterSize()) {
+        // increase dynamic cluster size to satisfy replicas, but only up to the configured max dynamic cluster size
+        suggestedConfigUpdates.add(new DynamicClusterSizeConfigUpdate(this, Math.min(replicas, getMaxDynamicClusterSize())));
       }
     }
   }
@@ -329,17 +325,14 @@ public String getUpdateDynamicClusterSizeUrl() {
 
   /**
    * Return the payload used in the REST request for updating the dynamic cluster size. It will
-   * be used to update the cluster size and if necessary, the max cluster size of the dynamic servers
-   * of this cluster.
+   * be used to update the cluster size of the dynamic servers of this cluster.
    *
    * @param clusterSize Desired dynamic cluster size
    * @return A string containing the payload to be used in the REST request for updating the dynamic
    * cluster size to the specified value.
    */
   public String getUpdateDynamicClusterSizePayload(final int clusterSize) {
-    return "{ dynamicClusterSize: " + clusterSize + ", " +
-            " maxDynamicClusterSize: " + (clusterSize > getMaxDynamicClusterSize()? clusterSize: getMaxDynamicClusterSize()) +
-            " }";
+    return "{ dynamicClusterSize: " + clusterSize + " }";
   }
 
   @Override

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/WlsClusterConfig.java

@@ -306,7 +306,7 @@ public boolean validate(DomainSpec domainSpec, List<ConfigUpdate> suggestedConfi
         if (clusterName != null) {
           WlsClusterConfig wlsClusterConfig = getClusterConfig(clusterName);
           updated |= wlsClusterConfig.validateClusterStartup(clusterStartup,
-            Util.getMachineNamePrefix(domainSpec, wlsClusterConfig), suggestedConfigUpdates);
+            suggestedConfigUpdates);
         }
       }
     }
@@ -318,7 +318,6 @@ public boolean validate(DomainSpec domainSpec, List<ConfigUpdate> suggestedConfi
       if (clusterConfigs != null && clusterConfigs.size() == 1) {
         for (WlsClusterConfig wlsClusterConfig : clusterConfigs) {
           wlsClusterConfig.validateReplicas(domainSpec.getReplicas(),
-            Util.getMachineNamePrefix(domainSpec, wlsClusterConfig),
             "domainSpec",
             suggestedConfigUpdates);
         }

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/WlsDomainConfig.java

@@ -210,12 +210,8 @@ public NextAction apply(Packet packet) {
 
           String serviceURL = HttpClient.getServiceURL(info.getAdmin().getService().get());
 
-          Domain dom = info.getDomain();
-          DomainSpec domainSpec = dom.getSpec();
-          String machineNamePrefix = Util.getMachineNamePrefix(domainSpec, wlsClusterConfig);
-
           boolean successful = updateDynamicClusterSizeWithServiceURL(wlsClusterConfig,
-                  machineNamePrefix, targetClusterSize, httpClient, serviceURL);
+                  targetClusterSize, httpClient, serviceURL);
 
           if (successful) {
             LOGGER.info(MessageKeys.WLS_CLUSTER_SIZE_UPDATED, clusterName, targetClusterSize, (System.currentTimeMillis() - startTime));
@@ -471,37 +467,11 @@ private String executePostUrlWithRetry(final String url, final String payload, f
     return jsonResult;
   }
 
-  /**
-   * Method called by the Callable that is submitted from the updateDynamicClusterSize method for updating the
-   * WLS dynamic cluster size configuration.
-   *
-   * @param wlsClusterConfig The WlsClusterConfig object of the WLS cluster whose cluster size needs to be updated. The
-   *                         caller should make sure that the cluster is a dynamic cluster.
-   * @param machineNamePrefix Prefix of names of new machines to be created
-   * @param targetClusterSize The target dynamic cluster size
-   * @return true if the request to update the cluster size is successful, false if it was not successful
-   */
-
-  private boolean doUpdateDynamicClusterSize(final WlsClusterConfig wlsClusterConfig,
-                                             final String machineNamePrefix,
-                                             final int targetClusterSize) throws Exception {
-    LOGGER.entering();
-
-    String serviceURL = connectAndGetServiceURL();
-
-    boolean result = updateDynamicClusterSizeWithServiceURL(wlsClusterConfig, machineNamePrefix,
-            targetClusterSize, httpClient, serviceURL);
-
-    LOGGER.exiting(result);
-    return result;
-  }
-
   /**
    * Static method to update the WebLogic dynamic cluster size configuration.
    *
    * @param wlsClusterConfig The WlsClusterConfig object of the WLS cluster whose cluster size needs to be updated. The
    *                         caller should make sure that the cluster is a dynamic cluster.
-   * @param machineNamePrefix Prefix of names of new machines to be created
    * @param targetClusterSize The target dynamic cluster size
    * @param httpClient HttpClient object for issuing the REST request
    * @param serviceURL service URL of the WebLogic admin server
@@ -510,22 +480,12 @@ private boolean doUpdateDynamicClusterSize(final WlsClusterConfig wlsClusterConf
    */
 
   private static boolean updateDynamicClusterSizeWithServiceURL(final WlsClusterConfig wlsClusterConfig,
-                                                                final String machineNamePrefix,
                                                                 final int targetClusterSize,
                                                                 final HttpClient httpClient,
                                                                 final String serviceURL) {
     LOGGER.entering();
 
     boolean result = false;
-    // Create machine(s)
-    // Commented out as we are not configuring machines for servers
-//    String newMachineNames[] = wlsClusterConfig.getMachineNamesForDynamicServers(machineNamePrefix, targetClusterSize);
-//    for (String machineName: newMachineNames) {
-//      LOGGER.info(MessageKeys.WLS_CREATING_MACHINE, machineName);
-//      httpClient.executePostUrlOnServiceClusterIP(WlsMachineConfig.getCreateUrl(),
-//              serviceURL, WlsMachineConfig.getCreatePayload(machineName));
-//    }
-
     // Update the dynamic cluster size of the WebLogic cluster
     String jsonResult = httpClient.executePostUrlOnServiceClusterIP(
             wlsClusterConfig.getUpdateDynamicClusterSizeUrl(),

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/WlsRetriever.java

@@ -132,4 +132,3 @@ WLSKO-0130=Failed to update WebLogic dynamic cluster size for cluster {0} within
 WLSKO-0131=Failed to update WebLogic dynamic cluster size for cluster {0}. Cluster is not a dynamic cluster
 WLSKO-0132=Updated cluster size for WebLogic dynamic cluster {0} to {1}. Time taken {2} ms
 WLSKO-0133=Cannot find WebLogic server template with name {0} which is referenced by WebLogic cluster {1}
-WLSKO-0134=Creating WebLogic machine named {0}