Skip to content

Commit 07cb586

Browse files
authored
Fix the Verrazzano template (#914)
* update vz template to use VerrazzanoWebLogicWorkload * remove hosts from IngressTrait
1 parent af64eaf commit 07cb586

File tree

1 file changed

+52
-55
lines changed

1 file changed

+52
-55
lines changed

core/src/main/targetconfigs/vz/vz-application.yaml

Lines changed: 52 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ spec:
2323
kind: IngressTrait
2424
spec:
2525
rules:
26-
- hosts:
27-
- "{{{domainPrefix}}}-appconf.{{{domainUid}}}.example.com"
2826
{{#hasApplications}}
29-
paths:
27+
- paths:
3028
{{/hasApplications}}
3129
{{#applications}}
3230
# application {{{applicationName}}}
@@ -42,74 +40,73 @@ metadata:
4240
namespace: {{{namespace}}}
4341
spec:
4442
workload:
45-
apiVersion: weblogic.oracle/v8
46-
kind: Domain
47-
metadata:
48-
name: {{{domainPrefix}}}-domain
49-
namespace: {{{namespace}}}
43+
apiVersion: oam.verrazzano.io/v1alpha1
44+
kind: VerrazzanoWebLogicWorkload
5045
spec:
51-
domainUID: {{{domainUid}}}
46+
template:
47+
metadata:
48+
name: {{{domainPrefix}}}-domain
49+
namespace: {{{namespace}}}
50+
spec:
51+
domainUID: {{{domainUid}}}
5252

53-
# WebLogic Image Tool provides domainHome, domainHomeSourceType, and imageName
54-
domainHome: {{{domainHome}}}
55-
domainHomeSourceType: {{{domainHomeSourceType}}}
56-
image: {{{imageName}}}
53+
# WebLogic Image Tool provides domainHome, domainHomeSourceType, and imageName
54+
domainHome: {{{domainHome}}}
55+
domainHomeSourceType: {{{domainHomeSourceType}}}
56+
image: {{{imageName}}}
5757

58-
imagePullSecrets:
59-
- name: {{{domainPrefix}}}-registry-credentials
60-
logHomeEnabled: true
61-
includeServerOutInPodLog: true
62-
webLogicCredentialsSecret:
63-
name: {{{webLogicCredentialsSecret}}}
64-
configuration:
65-
istio:
66-
enabled: false
67-
introspectorJobActiveDeadlineSeconds: 900
68-
model:
69-
configMap: {{{domainPrefix}}}-configmap
70-
domainType: {{{domainType}}}
58+
imagePullSecrets:
59+
- name: {{{domainPrefix}}}-registry-credentials
60+
includeServerOutInPodLog: true
61+
webLogicCredentialsSecret:
62+
name: {{{webLogicCredentialsSecret}}}
63+
configuration:
64+
introspectorJobActiveDeadlineSeconds: 900
65+
model:
66+
configMap: {{{domainPrefix}}}-configmap
67+
domainType: {{{domainType}}}
7168

72-
# WebLogic Image Tool provides modelHome
73-
modelHome: {{{modelHome}}}
69+
# WebLogic Image Tool provides modelHome
70+
modelHome: {{{modelHome}}}
7471

75-
# encryption for the WDT model and the SystemSerializedIni.data file.
76-
# used only for model-in-image deployment, can be removed for other types.
77-
runtimeEncryptionSecret: {{{runtimeEncryptionSecret}}}
72+
# encryption for the WDT model and the SystemSerializedIni.data file.
73+
# used only for model-in-image deployment, can be removed for other types.
74+
runtimeEncryptionSecret: {{{runtimeEncryptionSecret}}}
7875
{{#hasAdditionalSecrets}}
7976

80-
secrets:
77+
secrets:
8178
{{/hasAdditionalSecrets}}
8279
{{#additionalSecrets}}
83-
- {{{additionalSecretName}}}
80+
- {{{additionalSecretName}}}
8481
{{/additionalSecrets}}
8582
{{#hasClusters}}
8683

87-
clusters:
84+
clusters:
8885
{{/hasClusters}}
8986
{{#clusters}}
90-
- clusterName: {{{clusterName}}}
91-
serverPod:
92-
affinity:
93-
podAntiAffinity:
94-
preferredDuringSchedulingIgnoredDuringExecution:
95-
- weight: 100
96-
podAffinityTerm:
97-
labelSelector:
98-
matchExpressions:
99-
- key: "weblogic.clusterName"
100-
operator: In
101-
values:
102-
- $(CLUSTER_NAME)
103-
topologyKey: "kubernetes.io/hostname"
104-
replicas: {{{replicas}}}
87+
- clusterName: {{{clusterName}}}
88+
serverPod:
89+
affinity:
90+
podAntiAffinity:
91+
preferredDuringSchedulingIgnoredDuringExecution:
92+
- weight: 100
93+
podAffinityTerm:
94+
labelSelector:
95+
matchExpressions:
96+
- key: "weblogic.clusterName"
97+
operator: In
98+
values:
99+
- $(CLUSTER_NAME)
100+
topologyKey: "kubernetes.io/hostname"
101+
replicas: {{{replicas}}}
105102
{{/clusters}}
106103

107-
serverPod:
108-
env:
109-
- name: JAVA_OPTIONS
110-
value: "-Dweblogic.StdoutDebugEnabled=false"
111-
- name: USER_MEM_ARGS
112-
value: "-Djava.security.egd=file:/dev/./urandom -Xms64m -Xmx256m "
104+
serverPod:
105+
env:
106+
- name: JAVA_OPTIONS
107+
value: "-Dweblogic.StdoutDebugEnabled=false"
108+
- name: USER_MEM_ARGS
109+
value: "-Djava.security.egd=file:/dev/./urandom -Xms64m -Xmx256m "
113110
---
114111
apiVersion: core.oam.dev/v1alpha2
115112
kind: Component

0 commit comments

Comments
 (0)