Skip to content

Commit 6648972

Browse files
committed
Message clean-up
1 parent 8eb87a5 commit 6648972

File tree

6 files changed

+38
-60
lines changed

6 files changed

+38
-60
lines changed

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017, 2024, Oracle and/or its affiliates.
1+
// Copyright (c) 2017, 2025, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.kubernetes.common.logging;
@@ -10,7 +10,6 @@
1010
public class MessageKeys {
1111
public static final String OPERATOR_STARTED = "WLSKO-0000";
1212
public static final String CREATING_API_CLIENT = "WLSKO-0001";
13-
public static final String K8S_MASTER_URL = "WLSKO-0002";
1413
public static final String ENABLED_FEATURES = "WLSKO-0003";
1514
public static final String OPERATOR_SHUTTING_DOWN = "WLSKO-0005";
1615
public static final String EXCEPTION = "WLSKO-0006";
@@ -53,15 +52,13 @@ public class MessageKeys {
5352
public static final String VERIFY_K8S_MIN_VERSION = "WLSKO-0074";
5453
public static final String DOMAIN_UID_UNIQUENESS_FAILED = "WLSKO-0076";
5554
public static final String PV_NOT_FOUND_FOR_DOMAIN_UID = "WLSKO-0077";
56-
public static final String PV_ACCESS_MODE_FAILED = "WLSKO-0078";
5755
public static final String K8S_VERSION_CHECK = "WLSKO-0079";
5856
public static final String K8S_VERSION_CHECK_FAILURE = "WLSKO-0080";
5957
public static final String HTTP_METHOD_FAILED = "WLSKO-0081";
6058
public static final String NOT_STARTING_DOMAINUID_THREAD = "WLSKO-0082";
6159
public static final String OP_CONFIG_NAMESPACE = "WLSKO-0083";
6260
public static final String OP_CONFIG_DOMAIN_NAMESPACES = "WLSKO-0084";
6361
public static final String OP_CONFIG_SERVICE_ACCOUNT = "WLSKO-0085";
64-
public static final String WAITING_FOR_POD_READY = "WLSKO-0087";
6562
public static final String POD_IS_READY = "WLSKO-0088";
6663
public static final String POD_IS_FAILED = "WLSKO-0089";
6764
public static final String WATCH_EVENT = "WLSKO-0101";
@@ -84,7 +81,6 @@ public class MessageKeys {
8481
public static final String SCRIPT_LOADED = "WLSKO-0134";
8582
public static final String JOB_IS_FAILED = "WLSKO-0136";
8683
public static final String JOB_DELETED = "WLSKO-0137";
87-
public static final String WAITING_FOR_JOB_READY = "WLSKO-0138";
8884
public static final String JOB_CREATED = "WLSKO-0139";
8985
public static final String JOB_IS_COMPLETE = "WLSKO-0140";
9086
public static final String CANNOT_PARSE_TOPOLOGY = "WLSKO-0141";
@@ -103,7 +99,6 @@ public class MessageKeys {
10399
public static final String NO_INTERNAL_CERTIFICATE = "WLSKO-162";
104100
public static final String NO_EXTERNAL_CERTIFICATE = "WLSKO-163";
105101
public static final String CALL_FAILED = "WLSKO-0168";
106-
public static final String JOB_CREATION_TIMESTAMP_MESSAGE = "WLSKO-0169";
107102
public static final String NAMESPACE_IS_MISSING = "WLSKO-0171";
108103
public static final String CM_PATCHED = "WLSKO-0172";
109104
public static final String REPLACE_CRD_FAILED = "WLSKO-0173";
@@ -123,11 +118,8 @@ public class MessageKeys {
123118
public static final String END_MANAGING_NAMESPACE = "WLSKO-0187";
124119
public static final String HTTP_REQUEST_GOT_THROWABLE = "WLSKO-0189";
125120
public static final String DOMAIN_ROLL_START = "WLSKO-0190";
126-
public static final String EXECUTE_MAKE_RIGHT_DOMAIN = "WLSKO-0192";
127-
public static final String LOG_WAITING_COUNT = "WLSKO-0193";
128121
public static final String INTERNAL_IDENTITY_INITIALIZATION_FAILED = "WLSKO-0194";
129122
public static final String DOMAIN_FATAL_ERROR = "WLSKO-0195";
130-
public static final String DUMP_BREADCRUMBS = "WLSKO-0198";
131123
public static final String BEGIN_SERVER_SHUTDOWN_REST = "WLSKO-0199";
132124
public static final String SERVER_SHUTDOWN_REST_SUCCESS = "WLSKO-0200";
133125
public static final String SERVER_SHUTDOWN_REST_FAILURE = "WLSKO-0201";
@@ -157,7 +149,6 @@ public class MessageKeys {
157149
public static final String PV_EXISTS = "WLSKO-0235";
158150
public static final String PVC_EXISTS = "WLSKO-0236";
159151
public static final String PVC_IS_BOUND = "WLSKO-0237";
160-
public static final String WAITING_FOR_PVC_TO_BIND = "WLSKO-0238";
161152
public static final String PVC_NOT_BOUND_ERROR = "WLSKO-0239";
162153
public static final String FLUENTBIT_CONFIGMAP_CREATED = "WLSKO-0240";
163154
public static final String FLUENTBIT_CONFIGMAP_REPLACED = "WLSKO-0241";
@@ -265,7 +256,7 @@ public class MessageKeys {
265256
public static final String CLUSTER_INCOMPLETE_EVENT_PATTERN = "WLSEO-0037";
266257
public static final String PERSISTENT_VOLUME_CLAIM_EVENT_ERROR = "WLSEO-0038";
267258
public static final String PERSISTENT_VOLUME_CLAIM_EVENT_SUGGESTION = "WLSEO-0039";
268-
public static final String PERSISTENT_VOUME_CLAIM_BOUND_EVENT_PATTERN = "WLSEO-0040";
259+
public static final String PERSISTENT_VOLUME_CLAIM_BOUND_EVENT_PATTERN = "WLSEO-0040";
269260

270261
// Webhook messages
271262
public static final String WEBHOOK_STARTED = "WLSWH-0001";

common/src/main/resources/Operator.properties

Lines changed: 33 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
WLSKO-0000=Oracle WebLogic Kubernetes Operator, version: {0}, implementation: {1}, build time: {2}
22
WLSKO-0001=Creating API Client
3-
WLSKO-0002=The Kubernetes Master URL is set to {0}
43
WLSKO-0003=The following optional operator features are enabled: {0}
54
WLSKO-0005=The Oracle WebLogic Kubernetes Operator is shutting down
65
WLSKO-0006=Exception thrown {0}
@@ -44,15 +43,13 @@ WLSKO-0073=Kubernetes minimum version check failed. Supported versions are {0},
4443
WLSKO-0074=Verifying Kubernetes minimum version
4544
WLSKO-0076=WebLogic domain UID uniqueness check failed. Domain UID {0} exists in domains named {1} and {2}
4645
WLSKO-0077=Persistent volume not found for domain named {0} with domain UID {1}
47-
WLSKO-0078=Persistent volume named {0} for domain named {1} with domain UID {2} does not have access mode of {3}
4846
WLSKO-0079=Kubernetes version is: {0}
4947
WLSKO-0080=Failure reading Kubernetes version. Exception thrown: {0}
5048
WLSKO-0081=HTTP {0} method on URL {1} failed with return code {2}.
5149
WLSKO-0082=Watch event ignored for domain with domain UID {0} because no change to domain specification.
5250
WLSKO-0083=Operator namespace is: {0}
5351
WLSKO-0084=Operator domain namespaces are: {0}
5452
WLSKO-0085=Operator service account is: {0}
55-
WLSKO-0087=Waiting for pod {0} to be ready
5653
WLSKO-0088=Pod {0} is ready
5754
WLSKO-0089=Pod {0} has failed
5855
WLSKO-0101=Watch event: {0}, object: {1}
@@ -75,25 +72,24 @@ WLSKO-0133=Cannot find WebLogic server template with name {0} which is reference
7572
WLSKO-0134=Loading scripts into domain control config map for namespace: {0}
7673
WLSKO-0136=Job {0} has failed
7774
WLSKO-0137=Job for domain with domainUID {0} in namespace {1} and with job name {2} deleted
78-
WLSKO-0138=Waiting for job {0} to be complete
7975
WLSKO-0139=Domain introspector job {0} created
8076
WLSKO-0140=Job {0} is completed with status: {1}
8177
WLSKO-0141=Failed to parse WebLogic Domain topology due to exception: {0}
8278
WLSKO-0142=Failed to parse results from domain introspector for domain {0} due to exception: {1}
8379
WLSKO-0143=Failed to parse file {0} from domain introspector for domain {1} due to exception: {2}
84-
WLSKO-0145=Replacing pod {0}
80+
WLSKO-0145=Replacing Pod {0}
8581
WLSKO-0146=Replica request of {0} exceeds the maximum dynamic server count of {1} configured for cluster {2}
86-
WLSKO-0148=Current Pod dump [{0}] vs expected pod [{1}].
87-
WLSKO-0150=Creating external channel service for WebLogic domain with UID: {0}.
88-
WLSKO-0151=Replacing external channel service for WebLogic domain with UID: {0}.
89-
WLSKO-0152=Existing external channel service is correct for WebLogic domain with UID: {0}.
82+
WLSKO-0148=Current Pod dump [{0}] vs expected Pod [{1}].
83+
WLSKO-0150=Creating external channel Service for WebLogic domain with UID: {0}.
84+
WLSKO-0151=Replacing external channel Service for WebLogic domain with UID: {0}.
85+
WLSKO-0152=Existing external channel Service is correct for WebLogic domain with UID: {0}.
9086
WLSKO-0153=Failed to read health information from server {0}. Unable to connect to server.
9187
WLSKO-0154=Job {0} failed due to reason: DeadlineExceeded. \
9288
ActiveDeadlineSeconds of the job is configured with {1} seconds. \
9389
The job was started {2} seconds ago. \
9490
Ensure all domain dependencies have been deployed \
9591
(any secrets, config-maps, PVs, and PVCs that the domain resource references). \
96-
Use kubectl describe for the job and its pod for more job failure information. \
92+
Use kubectl describe for the job and its Pod for more job failure information. \
9793
The job may be retried by the operator with longer `ActiveDeadlineSeconds` value in each subsequent retry. \
9894
Use `domain.spec.configuration.introspectorJobActiveDeadlineSeconds` to increase the job \
9995
timeout interval if the job still fails after the retries are exhausted. \
@@ -103,14 +99,13 @@ WLSKO-0157=Domain {0} is not valid: {1}
10399
WLSKO-162=Unable to read internal certificate at path {0}
104100
WLSKO-163=No external certificate configured for REST endpoint. Endpoint will be disabled.
105101
WLSKO-0168={0}: {1}
106-
WLSKO-0169=Job {0} is created at {1}
107102
WLSKO-0171=Namespace {0} is in operator's domain namespaces list but doesn't exist
108103
WLSKO-0173=Replace custom resource definition failed: {0}
109104
WLSKO-0174=Create custom resource definition failed: {0}
110105
WLSKO-0175=Job {0} in namespace {1} failed with status {2}. Check log messages \
111-
copied from the introspector pod {3} log for additional information.
106+
copied from the introspector Pod {3} log for additional information.
112107
WLSKO-0176=Job {1} in namespace {0} failed, job details are {2}
113-
WLSKO-0177=Pod {0} in namespace {1} failed, the pod status is {2}
108+
WLSKO-0177=Pod {0} in namespace {1} failed, the Pod status is {2}
114109
WLSKO-0178=Operator cannot proceed, as the Custom Resource Definition for ''domains.weblogic.oracle'' or ''clusters.weblogic.oracle'' is not installed.
115110
WLSKO-0179=Pod {0} in namespace {1} detected as stuck, and force-deleted
116111
WLSKO-0180=Creating event: {0}
@@ -122,19 +117,16 @@ WLSKO-0185=Patching Pod Disruption Budget for WebLogic domain with UID: {0}. Clu
122117
WLSKO-0186=Start managing namespace {0}
123118
WLSKO-0187=Stop managing namespace {0}
124119
WLSKO-0189=HTTP request method {0} to {1} failed with exception {2}.
125-
WLSKO-0190=Rolling restart of WebLogic domain server pods started.
126-
WLSKO-0192=Executing make right domain operation, recheck count for server {0} is {1}.
127-
WLSKO-0193=Waiting for server {0} to start, recheck count is {1}.
120+
WLSKO-0190=Rolling restart of WebLogic domain server Pods started.
128121
WLSKO-0194=Internal identity initialization step failed with exception {0}.
129122
WLSKO-0195=The operator failed after retrying for {0,number,#} minutes. \
130123
This time limit may be specified in spec.failureRetryLimitMinutes. \
131124
Please resolve the error and then update 'domain.spec.introspectVersion' to force another retry.
132-
WLSKO-0198={0} Fiber {1}
133-
WLSKO-0199=WL pod shutdown: Initiating shutdown of WebLogic server {0} via REST interface.
134-
WLSKO-0200=WL pod shutdown: Successfully shutdown WebLogic server {0} via REST interface.
135-
WLSKO-0201=WL pod shutdown: Failed to shut down WebLogic server {0} via REST interface with response: {1}.
136-
WLSKO-0203=WL pod shutdown: Failed to shut down WebLogic server {0} via REST interface due to exception: {1}.
137-
WLSKO-0204=WL pod shutdown: Retry shutdown of WebLogic server {0} via REST interface.
125+
WLSKO-0199=WLS Pod shutdown: Initiating shutdown of WebLogic server {0} via REST interface.
126+
WLSKO-0200=WLS Pod shutdown: Successfully shutdown WebLogic server {0} via REST interface.
127+
WLSKO-0201=WLS Pod shutdown: Failed to shut down WebLogic server {0} via REST interface with response: {1}.
128+
WLSKO-0203=WLS Pod shutdown: Failed to shut down WebLogic server {0} via REST interface due to exception: {1}.
129+
WLSKO-0204=WLS Pod shutdown: Retry shutdown of WebLogic server {0} via REST interface.
138130
WLSKO-0213=InputFile: {0} does not exist or could not be read.
139131
WLSKO-0214=The output dir {0} specified by ''-d'' does not exist or could not be read.
140132
WLSKO-0215=The output file {0} already exists, remove it and try again. \
@@ -146,12 +138,12 @@ WLSKO-0218=Domain custom resource converter: Name of the converted file. If not
146138
file name by appending "__converted." and the input file extension to the base name of the input file name.
147139
WLSKO-0219=Enable overwriting the existing output file, if any.
148140
WLSKO-0220=Successfully generated upgraded domain custom resource file ''{0}''.
149-
WLSKO-0222=Introspection job fluentd container in the introspector pod {0} namespace {1} has been terminated. \
150-
Exit Code: {2} Reason: {3} Message {4}. Check the pod's fluentd container log for details
141+
WLSKO-0222=Introspection job fluentd container in the introspector Pod {0} namespace {1} has been terminated. \
142+
Exit Code: {2} Reason: {3} Message {4}. Check the Pod's Fluentd container log for details
151143
WLSKO-0223=When fluentdSpecification is specified in the domain spec, a secret containing elastic search credentials \
152144
must be specified in {0}
153-
WLSKO-0224=Fluentd configmap created.
154-
WLSKO-0225=Fluentd configmap replaced.
145+
WLSKO-0224=Fluentd ConfigMap created.
146+
WLSKO-0225=Fluentd ConfigMap replaced.
155147
WLSKO-0226=Pod {0} was evicted due to {1}; validating domain
156148
WLSKO-0227=Pod {0} was evicted due to {1} but the operator is configured not to restart it.
157149
WLSKO-0228=Watch event triggered for WebLogic Cluster {0} in WebLogic Domain with UID: {1}.
@@ -165,10 +157,9 @@ WLSKO-0234=Creating Persistent Volume Claim with name {0} for WebLogic domain wi
165157
WLSKO-0235=Persistent volume with name {0} already exists for WebLogic domain with UID: {1}.
166158
WLSKO-0236=Persistent volume Claim with name {0} already exists for WebLogic domain with UID: {1}.
167159
WLSKO-0237=Persistent volume Claim ''{0}'' is bound.
168-
WLSKO-0238=Waiting for Persistent volume Claim ''{0}'' to be bound.
169160
WLSKO-0239=PersistentVolumeClaim ''{0}'' is not bound; the status phase is ''{1}''.
170-
WLSKO-0240=Fluentbit configmap created.
171-
WLSKO-0241=Fluentbit configmap replaced.
161+
WLSKO-0240=Fluentbit ConfigMap created.
162+
WLSKO-0241=Fluentbit ConfigMap replaced.
172163

173164
# Domain status messages
174165

@@ -194,7 +185,7 @@ WLSDO-0018=The combination of UID ''{0}'' and server name ''{1}'' exceeds maximu
194185
WLSDO-0019=The combination of UID ''{0}'' and admin server name ''{1}'' exceeds maximum allowed length ''{2}''.
195186
WLSDO-0020=Online WebLogic configuration updates complete \
196187
but there are pending non-dynamic changes that require \
197-
pod restarts to take effect. The changes are:
188+
Pod restarts to take effect. The changes are:
198189
WLSDO-0021=DomainUID ''{0}'' server ''{1}'' does not have a port available for the operator to send REST calls. \
199190
The default listen port and SSL port are disabled, the admin port is not configured and there is no channel with admin privileges.
200191
WLSDO-0027=The Monitoring Exporter port {0,number,#} specified by ''spec.monitoringExporter.port'' conflicts with a port in WebLogic Server instance ''{1}''.
@@ -205,25 +196,25 @@ WLSDO-0031=Container port name ''{2}'' for domain with domainUID ''{0}'' and con
205196
WLSDO-0032=Network channel name ''{2}'' for domain with domainUID ''{0}'' and server with \
206197
name ''{1}'' exceeds maximum allowed length ''{3}''. Please specify a shorter channel name.
207198
WLSDO-0033=Failure invoking ''{0}'' on {1} {2} in namespace {3}: {4}
208-
WLSDO-0034=Failure on pod ''{0}'' in namespace ''{1}'': {2}
199+
WLSDO-0034=Failure on Pod ''{0}'' in namespace ''{1}'': {2}
209200
WLSDO-0035={0} replicas specified for cluster ''{1}'' which has a maximum cluster size of {2}
210201
WLSDO-0036=The domain is configured with one or more auxiliary images and the mountPath ''{0}'' for auxiliary image is \
211202
already in use.
212203
WLSDO-0037=More than one auxiliary image under ''spec.configuration.model.auxiliaryImages'' sets a ''sourceWDTInstallHome'' value. \
213204
The 'sourceWDTInstallHome' value must be set for only one auxiliary image.
214205
WLSDO-0038=The wdtInstallHome ''{0}'' is invalid. The wdtInstallHome must be outside the directory for the modelHome ''{1}''
215206
WLSDO-0039=The modelHome ''{1}'' is invalid. The modelHome must be outside the directory for the wdtInstallHome ''{0}''
216-
WLSDO-0040=One or more server pods that are supposed to be available failed. Check the server status in the domain status, \
217-
the server pod status and logs, and WebLogic Server logs for possible reasons."
218-
WLSDO-0041=One or more server pods that are supposed to be available are not ready within the period of time \
207+
WLSDO-0040=One or more server Pods that are supposed to be available failed. Check the server status in the domain status, \
208+
the server Pod status and logs, and WebLogic Server logs for possible reasons."
209+
WLSDO-0041=One or more server Pods that are supposed to be available are not ready within the period of time \
219210
defined in 'serverPod.maxReadyWaitTimeSeconds' under "domain.spec', 'domain.adminServer', 'managedServer', or 'domain.cluster'. \
220-
Check the server status in the domain status, the server pod status and logs, and WebLogic Server logs for possible reasons. \
211+
Check the server status in the domain status, the server Pod status and logs, and WebLogic Server logs for possible reasons. \
221212
Adjust the value of 'serverPod.maxReadyWaitTimeSeconds' setting if needed."
222213
WLSDO-0042=Pod was evicted
223214
WLSDO-0043=Pod spec has changed
224-
WLSDO-0044=One or more server pods that are supposed to be available did not start within the period of time \
215+
WLSDO-0044=One or more server Pods that are supposed to be available did not start within the period of time \
225216
defined in 'serverPod.maxPendingWaitTimeSeconds' under "domain.spec', 'domain.adminServer', 'managedServer', or 'domain.cluster'. \
226-
Check the server status in the domain status, the server pod status and logs, and WebLogic Server logs for possible reasons. \
217+
Check the server status in the domain status, the server Pod status and logs, and WebLogic Server logs for possible reasons. \
227218
One common cause of this issue is a problem pulling the WebLogicServer image. \
228219
Adjust the value of 'serverPod.maxPendingWaitTimeSeconds' setting if needed."
229220
WLSDO-0045=Cannot reference cluster resource ''{0}'' because it is used by ''{1}''
@@ -263,7 +254,7 @@ WLSDO-0064=When ''spec.configuration.initializeDomainOnPV'' is specified to auto
263254
WLSDO-0065=The OPSS wallet password secret ''{0}'' is specified but the required ''walletPassword'' key is missing \
264255
in the specified secret ''{1}''.
265256
WLSDO-0066=Pod ''{0}'' is Unschedulable, reason: ''{1}''
266-
WLSDO-0067=One or more pods in the domain cannot be scheduled. Please check individual pod status for details.
257+
WLSDO-0067=One or more Pods in the domain cannot be scheduled. Please check individual Pod status for details.
267258

268259
oneEnvVar=variable
269260
multipleEnvVars=variables
@@ -287,19 +278,19 @@ WLSEO-0008=Domain {0} is incomplete for one or more of the following reasons: th
287278
there are pending server shutdowns, or not all servers expected to be running are ready \
288279
and at their target image, auxiliary images, restart version, and introspect version.
289280
WLSEO-0009=Domain {0} encountered some failures before, and those failures have been resolved.
290-
WLSEO-0010=Replacing pod {0} because: {1}.
281+
WLSEO-0010=Replacing Pod {0} because: {1}.
291282
WLSEO-0011=Start managing namespace {0}.
292283
WLSEO-0012=Stop managing namespace {0}.
293284
WLSEO-0013=Started watching namespace {0}.
294285
WLSEO-0014=Stopped watching namespace {0}.
295286
WLSEO-0015=Start managing namespace {0} failed due to an authorization error.
296-
WLSEO-0016=Rolling restart WebLogic server pods in domain {0} because: {1}.
287+
WLSEO-0016=Rolling restart WebLogic server Pods in domain {0} because: {1}.
297288
WLSEO-0017=Rolling restart of domain {0} completed.
298289
WLSEO-0018=Domain validation error
299290
WLSEO-0019=Domain resource and WebLogic domain configuration mismatch error
300291
WLSEO-0020=Introspection error
301292
WLSEO-0021=Kubernetes Api call error
302-
WLSEO-0022=Server pod error
293+
WLSEO-0022=Server Pod error
303294
WLSEO-0023=Replicas too high
304295
WLSEO-0024=Internal error
305296
WLSEO-0025=Domain processing is aborted
@@ -314,7 +305,7 @@ WLSEO-0031=Cluster resource {0} was created.
314305
WLSEO-0032=Cluster resource {0} was deleted.
315306
WLSEO-0033=Cluster resource {0} was changed.
316307
WLSEO-0034=Cluster {0} is available: a sufficient number of its servers have reached the ready state.
317-
WLSEO-0035=Cluster {0} is complete because all of the following are true: there is no failure detected, \
308+
WLSEO-0035=Cluster {0} is complete because all the following are true: there is no failure detected, \
318309
there are no pending server shutdowns, and all servers expected to be running are ready \
319310
and at their target image, auxiliary images, restart version, and introspect version.
320311
WLSEO-0036=Cluster {0} is unavailable: an insufficient number of its servers that are expected to be running are ready.";

0 commit comments

Comments
 (0)