Skip to content

Commit cffb0a4

Browse files
committed
Only include domainHome in CRD if specified on command line, or in model
1 parent 78ee75a commit cffb0a4

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

core/src/main/targetconfigs/templates/vz-application-v1.yaml.mustache

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2022, 2024, 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
apiVersion: core.oam.dev/v1alpha2
@@ -52,9 +52,14 @@ spec:
5252
spec:
5353
domainUID: {{{domainUid}}}
5454

55-
# WebLogic Image Tool provides domainHome, domainHomeSourceType, and imageName
55+
{{#domainHome}}
56+
# The WebLogic Domain Home
5657
domainHome: '{{{domainHome}}}'
58+
{{/domainHome}}
59+
5760
domainHomeSourceType: {{{domainHomeSourceType}}}
61+
62+
# WebLogic Image Tool provides imageName
5863
image: '{{{imageName}}}'
5964

6065
imagePullSecrets:

core/src/main/targetconfigs/templates/wko-domain-v4.yaml.mustache

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022, Oracle and/or its affiliates.
1+
# Copyright (c) 2022, 2024 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
apiVersion: "weblogic.oracle/v9"
@@ -9,8 +9,10 @@ metadata:
99
labels:
1010
weblogic.domainUID: {{{domainUid}}}
1111
spec:
12+
{{#domainHome}}
1213
# The WebLogic Domain Home
1314
domainHome: '{{{domainHome}}}'
15+
{{/domainHome}}
1416

1517
# The domain home source type
1618
# Set to PersistentVolume for domain-in-pv, Image for domain-in-image, or FromModel for model-in-image

core/src/main/targetconfigs/templates/wko-domain.yaml.mustache

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022, Oracle and/or its affiliates.
1+
# Copyright (c) 2022, 2024 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
apiVersion: "weblogic.oracle/v8"
@@ -9,8 +9,10 @@ metadata:
99
labels:
1010
weblogic.domainUID: {{{domainUid}}}
1111
spec:
12+
{{#domainHome}}
1213
# The WebLogic Domain Home
1314
domainHome: '{{{domainHome}}}'
15+
{{/domainHome}}
1416

1517
# The domain home source type
1618
# Set to PersistentVolume for domain-in-pv, Image for domain-in-image, or FromModel for model-in-image

0 commit comments

Comments
 (0)