Skip to content

Commit b831a67

Browse files
committed
remove version from domain templates and move liveness thread start to after initialization completes sucessfully
1 parent 628b816 commit b831a67

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

kubernetes/samples/scripts/common/domain-template.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#
44
# This is an example of how to define a Domain resource.
55
#
6-
apiVersion: "weblogic.oracle/v4"
76
kind: Domain
87
metadata:
98
name: %DOMAIN_UID%

kubernetes/samples/scripts/create-weblogic-domain/manually-create-domain/domain.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# This is an example of how to define a Domain resource. Please read through the comments which explain
55
# what updates are needed.
66
#
7-
apiVersion: "weblogic.oracle/v4"
87
kind: Domain
98
metadata:
109
# Update this with the `domainUID` of your domain:

operator/src/main/java/oracle/kubernetes/operator/Main.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,6 @@ public static void main(String[] args) {
174174
LOGGER.warning(MessageKeys.EXCEPTION, e);
175175
}
176176

177-
// start liveness thread
178-
startLivenessThread();
179-
180177
try {
181178
engine.getExecutor().execute(Main::begin);
182179

@@ -226,6 +223,11 @@ private static void completeBegin() {
226223
.scheduleWithFixedDelay(
227224
recheckDomains(), recheckInterval, recheckInterval, TimeUnit.SECONDS);
228225

226+
// Wait until all other initialization is done before starting liveness thread
227+
228+
// start liveness thread
229+
startLivenessThread();
230+
229231
} catch (Throwable e) {
230232
LOGGER.warning(MessageKeys.EXCEPTION, e);
231233
}

0 commit comments

Comments
 (0)