remove machines configuration

Author: alai8

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

@@ -188,7 +188,7 @@ data:
     # Create a cluster
     # ======================
     cd('/')
-    create(cluster_name, 'Cluster')
+    cl=create(cluster_name, 'Cluster')
 
     if cluster_type == "CONFIGURED":
 
@@ -232,10 +232,10 @@ data:
       set('ServerNamePrefix', "%MANAGED_SERVER_NAME_BASE%")
       set('DynamicClusterSize', number_of_ms)
       set('MaxDynamicClusterSize', 800)
-      set('CalculatedMachineNames', true)
+      #set('CalculatedMachineNames', true)
       set('CalculatedListenPorts', false)
-      machineNameExpression = '%DOMAIN_UID%-%s-machine*' % cluster_name
-      set('MachineNameMatchExpression', machineNameExpression)
+      #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/ConfigMapHelper.java

@@ -66,7 +66,7 @@ public class ConfigMapHelper {
           "  cp /shared/domain/$3/bin/startNodeManager.sh ${srvr_nmdir}\n" +
           "\n" +
           "  # Edit the start nodemanager script to use the home for the server\n" +
-          "  sed -i -e \"s:/shared/domain/$3/nodemanager:/u01/nodemanager:g\" /startNodeManager.sh\n" +
+          "  sed -i -e \"s:/shared/domain/$3/nodemanager:/u01/nodemanager:g\" ${srvr_nmdir}/startNodeManager.sh\n" +
           "\n" +
           "  # Create startup.properties file\n" +
           "  datadir=${DOMAIN_HOME}/servers/$2/data/nodemanager\n" +
@@ -99,8 +99,8 @@ public class ConfigMapHelper {
           "}\n" +
           "\n" +
           "# Check for stale state file and remove if found\"\n" +
-          "if [ -f ${stateFile} ]; then\n" +
-          "  echo \"Removing stale file ${stateFile}\"\n" +
+          "if [ -f \"$stateFile\" ]; then\n" +
+          "  echo \"Removing stale file $stateFile\"\n" +
           "  rm ${stateFile}\n" +
           "fi\n" +
           "\n" +
@@ -205,6 +205,7 @@ public class ConfigMapHelper {
           "\n" +
           "service_name = domain_uid + \"-\" + server_name\n" +
           "\n" +
+    /* Commented out as we are not configuring machines for servers
           "# Update node manager listen address\n" +
           "if admin_server_url is not None:\n" +
           "  connect(admin_username, admin_password, admin_server_url)\n" +
@@ -231,6 +232,7 @@ public class ConfigMapHelper {
           "      cancelEdit('y')\n" +
           "  disconnect()\n" +
           "\n" +
+     */
           "# Connect to nodemanager and start server\n" +
           "try:\n" +
           "  nmConnect(admin_username, admin_password, service_name,  '5556', domain_name, domain_path, 'plain')\n" +

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

@@ -639,14 +639,15 @@ protected V1Pod computeManagedPodConfig(TuningParameters configMapHelper, Packet
       V1ContainerPort containerPort = new V1ContainerPort();
       containerPort.setContainerPort(scan.getListenPort());
       containerPort.setProtocol("TCP");
-      containerPort.setName("weblogic");
+//      containerPort.setName("weblogic"); // commented out as we are not exposing node manager port
       container.addPortsItem(containerPort);
 
-      V1ContainerPort nmPort = new V1ContainerPort();
-      nmPort.setContainerPort(5556);
-      nmPort.setProtocol("TCP");
-      nmPort.setName("node-manager");
-      container.addPortsItem(nmPort);
+      // 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();

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

@@ -228,7 +228,8 @@ public void validateReplicas(Integer replicas, String machineNamePrefix,
     // 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() || !verifyMachinesConfigured(machineNamePrefix, replicas)) {
+        if (replicas > getDynamicClusterSize() ) {
           suggestedConfigUpdates.add(new DynamicClusterSizeConfigUpdate(this, Math.max(replicas, getDynamicClusterSize())));
         }
       }

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

@@ -562,12 +562,13 @@ private static boolean updateDynamicClusterSizeWithServiceURL(final WlsClusterCo
 
     boolean result = false;
     // Create machine(s)
-    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));
-    }
+    // 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(

operator/src/test/java/oracle/kubernetes/operator/create/CreateDomainGeneratedFilesBaseTest.java

@@ -317,6 +317,7 @@ protected void assertThatActualCreateDomainPyIsCorrect(String actualCreateDomain
         cmo.setProductionModeEnabled(%PRODUCTION_MODE_ENABLED%)
         asbpFile=open('%s/servers/%ADMIN_SERVER_NAME%/security/boot.properties' % domain_path, 'w+')
           secdir='%s/servers/%MANAGED_SERVER_NAME_BASE%%s/security' % (domain_path, index+1)
+        set('ServerNamePrefix', '%MANAGED_SERVER_NAME_BASE%")
     */
     assertThat(
       actualCreateDomainPy,
@@ -332,7 +333,8 @@ protected void assertThatActualCreateDomainPyIsCorrect(String actualCreateDomain
         "number_of_ms *= " + getInputs().getConfiguredManagedServerCount(),
         "set\\('ListenPort', " + getInputs().getAdminPort() + "\\)",
         "set\\('PublicPort', " + getInputs().getT3ChannelPort() + "\\)",
-        "set\\('PublicAddress', '" + getInputs().getT3PublicAddress() + "'\\)"));
+        "set\\('PublicAddress', '" + getInputs().getT3PublicAddress() + "'\\)",
+        "set\\('ServerNamePrefix', \"" + getInputs().getManagedServerNameBase() + "\"\\)"));
      // TBD should we check anything else?
   }
 

operator/src/test/java/oracle/kubernetes/operator/create/PodHelperConfigTest.java

@@ -404,8 +404,6 @@ private V1Pod getDesiredManagedServerPodConfigForDefaults(String image, String i
     pod.getMetadata()
       .putLabelsItem(CLUSTERNAME_LABEL, CLUSTER_NAME);
     pod.getSpec().getContainers().get(0).addCommandItem(ADMIN_SERVER_NAME).addCommandItem(String.valueOf(ADMIN_SERVER_PORT));
-    pod.getSpec().getContainers().get(0).getPorts().get(0).setName("weblogic");
-    pod.getSpec().getContainers().get(0).addPortsItem(new V1ContainerPort().protocol("TCP").containerPort(5556).name("node-manager"));
     return pod;
   }
 

operator/src/test/java/oracle/kubernetes/operator/wlsconfig/WlsClusterConfigTest.java

@@ -11,6 +11,7 @@
 import oracle.kubernetes.operator.logging.LoggingFactory;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.lang.reflect.Field;
@@ -234,6 +235,7 @@ public void verifyValidateClusterStartupDoNotSuggestsUpdateToDynamicClusterIfRep
     assertEquals(0, suggestedConfigUpdates.size());
   }
 
+  @Ignore // we are currently not suggesting updates based on number of machines
   @Test
   public void verifyValidateClusterStartupSuggestsUpdateToDynamicClusterIfNotEnoughMachines() throws Exception {
     WlsDynamicServersConfig wlsDynamicServersConfig = createDynamicServersConfig(2, 1, "ms-", "cluster1");
@@ -259,6 +261,7 @@ public void verifyValidateClusterStartupSuggestsUpdateToDynamicClusterIfNotEnoug
     assertEquals(2, configUpdate.targetClusterSize);
   }
 
+  @Ignore // we are currently not suggesting updates based on number of machines
   @Test
   public void verifyValidateClusterStartupDoNotLowerClusterSizeIfNotEnoughMachines() throws Exception {
     WlsDynamicServersConfig wlsDynamicServersConfig = createDynamicServersConfig(2, 1, "ms-", "cluster1");
@@ -285,6 +288,7 @@ public void verifyValidateClusterStartupDoNotLowerClusterSizeIfNotEnoughMachines
     assertEquals(2, configUpdate.targetClusterSize);
   }
 
+  @Ignore // we are currently not suggesting updates based on number of machines
   @Test
   public void verifyValidateClusterStartupDoNotSuggestUpdateToDynamicClusterIfEnoughMachines() throws Exception {
     WlsDynamicServersConfig wlsDynamicServersConfig = createDynamicServersConfig(1, 1, "ms-", "cluster1");