Skip to content

Commit 381cbd0

Browse files
committed
use configuredManagedServerCount for dynamic cluster size. Remove unused log message
1 parent 5d4aefc commit 381cbd0

File tree

4 files changed

+1
-5
lines changed

4 files changed

+1
-5
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ data:
119119
domain_path = os.environ.get("DOMAIN_HOME")
120120
cluster_name = "%CLUSTER_NAME%"
121121
number_of_ms = %CONFIGURED_MANAGED_SERVER_COUNT%
122-
initial_replicas = %INITIAL_MANAGED_SERVER_REPLICAS%
123122
cluster_type = "%CLUSTER_TYPE%"
124123
125124
print('domain_path : [%s]' % domain_path);
@@ -231,7 +230,7 @@ data:
231230
cd('DynamicServers/%s' % cluster_name)
232231
set('ServerTemplate', st1)
233232
set('ServerNamePrefix', "%MANAGED_SERVER_NAME_BASE%")
234-
set('DynamicClusterSize', initial_replicas)
233+
set('DynamicClusterSize', number_of_ms)
235234
set('MaxDynamicClusterSize', number_of_ms)
236235
set('CalculatedListenPorts', false)
237236
set('Id', 1)

kubernetes/internal/create-weblogic-domain.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,6 @@ function createYamlFiles {
456456
sed -i -e "s:%ADMIN_SERVER_NAME%:${adminServerName}:g" ${jobOutput}
457457
sed -i -e "s:%ADMIN_PORT%:${adminPort}:g" ${jobOutput}
458458
sed -i -e "s:%CONFIGURED_MANAGED_SERVER_COUNT%:${configuredManagedServerCount}:g" ${jobOutput}
459-
sed -i -e "s:%INITIAL_MANAGED_SERVER_REPLICAS%:${initialManagedServerReplicas}:g" ${jobOutput}
460459
sed -i -e "s:%MANAGED_SERVER_NAME_BASE%:${managedServerNameBase}:g" ${jobOutput}
461460
sed -i -e "s:%MANAGED_SERVER_PORT%:${managedServerPort}:g" ${jobOutput}
462461
sed -i -e "s:%T3_CHANNEL_PORT%:${t3ChannelPort}:g" ${jobOutput}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,5 +141,4 @@ private MessageKeys() {}
141141
public static final String WLS_UPDATE_CLUSTER_SIZE_INVALID_CLUSTER = "WLSKO-0131";
142142
public static final String WLS_CLUSTER_SIZE_UPDATED = "WLSKO-0132";
143143
public static final String WLS_SERVER_TEMPLATE_NOT_FOUND = "WLSKO-0133";
144-
public static final String WLS_CREATING_MACHINE = "WLSKO-0134";
145144
}

operator/src/main/resources/Operator.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,3 @@ WLSKO-0130=Failed to update WebLogic dynamic cluster size for cluster {0} within
132132
WLSKO-0131=Failed to update WebLogic dynamic cluster size for cluster {0}. Cluster is not a dynamic cluster
133133
WLSKO-0132=Updated cluster size for WebLogic dynamic cluster {0} to {1}. Time taken {2} ms
134134
WLSKO-0133=Cannot find WebLogic server template with name {0} which is referenced by WebLogic cluster {1}
135-
WLSKO-0134=Creating WebLogic machine named {0}

0 commit comments

Comments
 (0)