Skip to content

Commit 015701b

Browse files
committed
Delete useless code and update the document
1 parent b40400a commit 015701b

File tree

2 files changed

+17
-28
lines changed

2 files changed

+17
-28
lines changed

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/README.md

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,7 @@ metadata:
114114
labels:
115115
weblogic.resourceVersion: domain-v2
116116
weblogic.domainUID: domain1
117-
weblogic.domainName: domain1
118117
spec:
119-
# The domainUID must be unique across the entire Kubernetes Cluster. Each WebLogic Domain must
120-
# have its own unique domainUID. This does not have to be the same as the Domain Name. It is allowed
121-
# to have multiple Domains with the same Domain Name, but they MUST have different domainUID's.
122-
# The domainUID is also used to identify the Persistent Volume that belongs to/with this Domain.
123-
domainUID: domain1
124-
# The WebLogic Domain Name
125-
domainName: domain1
126118
# The WebLogic Domain Home
127119
domainHome: /u01/oracle/user_projects/domains/domain1
128120
# If the domain home is in the image
@@ -135,10 +127,6 @@ spec:
135127
# how to create that Secret at the end of this file)
136128
adminSecret:
137129
name: domain1-weblogic-credentials
138-
# The name of the Admin Server
139-
asName: "admin-server"
140-
# The Admin Server's ListenPort
141-
asPort: 7001
142130
# Whether to include the server out file into the pod's stdout, default is true
143131
includeServerOutInPodLog: true
144132
# serverStartPolicy legal values are "NEVER", "ALWAYS", "IF_NEEDED", or "ADMIN_ONLY"
@@ -191,19 +179,18 @@ Here is an example of the output of this command:
191179
$ kubectl describe domain domain1
192180
Name: domain1
193181
Namespace: default
194-
Labels: weblogic.domainName=domain1
195-
weblogic.domainUID=domain1
182+
Labels: weblogic.domainUID=domain1
196183
weblogic.resourceVersion=domain-v2
197184
Annotations: <none>
198185
API Version: weblogic.oracle/v2
199186
Kind: Domain
200187
Metadata:
201188
Cluster Name:
202-
Creation Timestamp: 2018-12-10T23:36:23Z
189+
Creation Timestamp: 2018-12-11T01:33:27Z
203190
Generation: 1
204-
Resource Version: 726255
191+
Resource Version: 46624
205192
Self Link: /apis/weblogic.oracle/v2/namespaces/default/domains/domain1
206-
UID: 67b7437c-fcd4-11e8-b751-fa163e855ac8
193+
UID: c1f7be60-fce4-11e8-bc6c-0021f6985fb7
207194
Spec:
208195
Admin Secret:
209196
Name: domain1-weblogic-credentials
@@ -228,8 +215,6 @@ Spec:
228215
Volume Mounts:
229216
Volumes:
230217
Server Start State: RUNNING
231-
As Name: admin-server
232-
As Port: 7001
233218
Clusters:
234219
Cluster - 1:
235220
Replicas: 2
@@ -252,8 +237,6 @@ Spec:
252237
Server Start State: RUNNING
253238
Domain Home: /u01/oracle/user_projects/domains/domain1
254239
Domain Home In Image: true
255-
Domain Name: domain1
256-
Domain UID: domain1
257240
Image: 12213-domain-home-in-image:latest
258241
Image Pull Policy: Never
259242
Include Server Out In Pod Log: true
@@ -277,27 +260,35 @@ Spec:
277260
Server Start Policy: IF_NEEDED
278261
Status:
279262
Conditions:
280-
Last Transition Time: 2018-12-10T23:37:47.599Z
263+
Last Transition Time: 2018-12-11T01:35:23.652Z
281264
Reason: ServersReady
282265
Status: True
283266
Type: Available
284267
Servers:
285268
Health:
286-
Activation Time: 2018-12-10T23:37:25.738Z
269+
Activation Time: 2018-12-11T01:34:59.546Z
287270
Overall Health: ok
288271
Subsystems:
289272
Node Name: xxxxxxxx
290273
Server Name: admin-server
291274
State: RUNNING
292275
Cluster Name: cluster-1
276+
Health:
277+
Activation Time: 2018-12-11T01:36:46.132Z
278+
Overall Health: ok
279+
Subsystems:
293280
Node Name: xxxxxxxx
294281
Server Name: managed-server1
295-
State:
282+
State: RUNNING
296283
Cluster Name: cluster-1
284+
Health:
285+
Activation Time: 2018-12-11T01:36:47.865Z
286+
Overall Health: ok
287+
Subsystems:
297288
Node Name: xxxxxxxx
298289
Server Name: managed-server2
299-
State:
300-
Start Time: 2018-12-10T23:36:23.908Z
290+
State: RUNNING
291+
Start Time: 2018-12-11T01:33:27.339Z
301292
Events: <none>
302293
```
303294

kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,6 @@ function createFiles {
330330
fi
331331

332332
domainHome="/u01/oracle/user_projects/domains/${domainName}"
333-
runtimeProperties="${scriptDir}/docker-images/OracleWebLogic/samples/12213-domain-home-in-image/properties/docker_run"
334333

335334
if [ -z "${weblogicCredentialsSecretName}" ]; then
336335
weblogicCredentialsSecretName="${domainUID}-weblogic-credentials"
@@ -350,7 +349,6 @@ function createFiles {
350349
sed -i -e "s:%ADMIN_NODE_PORT%:${adminNodePort}:g" ${dcrOutput}
351350
sed -i -e "s:%EXPOSE_T3_CHANNEL_PREFIX%:${exposeAdminT3ChannelPrefix}:g" ${dcrOutput}
352351
sed -i -e "s:%JAVA_OPTIONS%:${javaOptions}:g" ${dcrOutput}
353-
sed -i -e "s:%RUNTIME_PROPERTIES%:${runtimeProperties}:g" ${dcrOutput}
354352
sed -i -e "s:%CLUSTER_NAME%:${clusterName}:g" ${dcrOutput}
355353
sed -i -e "s:%INITIAL_MANAGED_SERVER_REPLICAS%:${initialManagedServerReplicas}:g" ${dcrOutput}
356354

0 commit comments

Comments
 (0)