Skip to content

Commit 2ac06a5

Browse files
committed
Minor changes to the samples documentation for the Model in Image and Domain on PV.
1 parent b3226cf commit 2ac06a5

File tree

8 files changed

+25
-26
lines changed

8 files changed

+25
-26
lines changed

documentation/4.1/content/samples/domains/domain-home-on-pv/_index.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@ description: "Sample for creating a WebLogic domain home on a persistent volume
1212
This sample demonstrates deploying a
1313
[Domain on PV]({{< relref "/managing-domains/choosing-a-model/_index.md" >}}) domain home source type
1414
with [Domain creation images]({{< relref "/managing-domains/domain-on-pv/domain-creation-images.md" >}}).
15-
The Domain on PV sample uses a WebLogic Deploy Tooling (WDT) model to specify your initial WebLogic configuration. For more information about WDT models, see [Working with model files]({{<relref "/managing-domains/working-with-wdt-models/model-files.md" >}}) in the user documentation.
15+
The Domain on PV sample uses a WebLogic Deploy Tooling (WDT) model to specify your initial WebLogic configuration.
16+
17+
WDT models are a convenient and simple alternative to WebLogic Scripting Tool (WLST) configuration scripts and templates. They compactly define a WebLogic domain using model files, variable properties files, and application archives files. The WDT model format is described in the open source, [WebLogic Deploy Tooling](https://oracle.github.io/weblogic-deploy-tooling/) GitHub project, and the required directory structure for a WDT archive is specifically discussed [here](https://oracle.github.io/weblogic-deploy-tooling/concepts/archive/).
18+
19+
For more information on Domain on PV, see the [Domain on PV]({{< relref "/managing-domains/domain-on-pv/_index.md" >}}) user documentation.
1620

1721
#### Domain on PV domain types (WLS and JRF)
1822

19-
Domain on PV is supported on two types of domains: a standard Oracle WebLogic Server domain and an Oracle Fusion Middleware Infrastructure, Java Required Files (JRF) domain. This sample demonstrates both Oracle WebLogic Server (WLS) and JRF domain types.
23+
Domain on PV is supported on two types of domains: a standard Oracle WebLogic Server (WLS) domain and an Oracle Fusion Middleware Infrastructure, Java Required Files (JRF) domain. This sample demonstrates both Oracle WebLogic Server (WLS) and JRF domain types.
2024

2125
The JRF domain path through the sample includes additional steps required for JRF: deploying an infrastructure database, initializing the database using the Repository Creation Utility (RCU) tool, referencing the infrastructure database from the WebLogic configuration, setting an Oracle Platform Security Services (OPSS) wallet password, and exporting or importing an OPSS wallet file. JRF domains may be used by Oracle products that layer on top of WebLogic Server, such as SOA and OSB.
2226

documentation/4.1/content/samples/domains/domain-home-on-pv/build-domain-creation-image.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ The archive top directory, named `wlsdeploy`, contains a directory named `applic
124124
```
125125
{{% /expand %}}
126126

127-
The application displays important details about the WebLogic Server instance that it's running on: namely its domain name, cluster name, and server name, as well as the names of any data sources that are targeted to the server. Also, you can see that application output reports that it's at version `v1`; you will update this to `v2` in a later use case that demonstrates upgrading the application.
127+
The application displays important details about the WebLogic Server instance that it's running on: namely its domain name, cluster name, and server name, as well as the names of any data sources that are targeted to the server. Also, you can see that application output reports that it's at version `v1`.
128128

129129
#### Stage a ZIP file of the archive
130130

@@ -316,7 +316,7 @@ Run the following commands to create the image and verify that it worked:
316316

317317
If you don't see the `imagetool` directory, then you missed a step in the [prerequisites]({{< relref "/samples/domains/domain-home-on-pv/prerequisites.md" >}}).
318318

319-
This command runs the WebLogic Image Tool to create the image and does the following:
319+
This command runs the WebLogic Image Tool to create the domain creation image and does the following:
320320

321321
- Builds the final container image as a layer on a small `busybox` base image.
322322
- Copies the WDT ZIP file that's referenced in the WIT cache into the image.

documentation/4.1/content/samples/domains/domain-home-on-pv/cleanup.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,6 @@ weight: 4
5353
--set "kubernetes.namespaces={traefik}"
5454
```
5555

56-
1. Delete the domain namespace.
57-
58-
```shell
59-
$ kubectl delete namespace sample-domain1-ns
60-
```
61-
6256
#### Remove the operator
6357

6458
1. Remove the operator.

documentation/4.1/content/samples/domains/domain-home-on-pv/sample.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ description: "Sample for creating a WebLogic domain home on a PV for deploying t
1111

1212
The sample demonstrates setting up a WebLogic domain with a domain home on a Kubernetes PersistentVolume (PV) (Domain on PV). This involves:
1313

14-
- Building a [domain creation image](#domain-creation-image) with:
15-
- A WDT model that describes your WebLogic domain configuration.
16-
- A WDT archive ZIP file that contains your applications.
17-
- A WDT installation that contains the binaries for running WDT.
14+
- Using the [domain creation image](#domain-creation-image) that you previously built.
1815
- Creating secrets for the domain.
1916
- Creating a Domain resource YAML file for the domain that:
2017
- References your Secrets and a WebLogic image.
@@ -343,7 +340,7 @@ Events:
343340
```
344341
{{% /expand %}}
345342

346-
In the `Status` section of the output, the available servers and clusters are listed. Note that if this command is issued very soon after the script finishes, there may be no servers available yet, or perhaps only the Administration Server but no Managed Servers. The operator will start up the Administration Server first and wait for it to become ready before starting the Managed Servers.
343+
In the `Status` section of the output, the available servers and clusters are listed. Note that if this command is issued very soon after the domain resource is applied, there may be no servers available yet, or perhaps only the Administration Server but no Managed Servers. The operator will start up the Administration Server first and wait for it to become ready before starting the Managed Servers.
347344

348345
### Verify the pods
349346

@@ -499,3 +496,7 @@ If the PVC and PV were created by the operator and you don't want to preserve th
499496
$ kubectl delete PVC sample-domain1-weblogic-sample-pvc -n sample-domain1-ns
500497
$ kubectl delete PV sample-domain1-weblogic-sample-pv
501498
```
499+
500+
#### Delete the domain namespace.
501+
502+
$ kubectl delete namespace sample-domain1-ns

documentation/4.1/content/samples/domains/model-in-image/_index.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ description: "Sample for supplying a WebLogic Deploy Tooling (WDT) model that th
1111

1212
This sample demonstrates deploying a [Model in Image]({{< relref "/managing-domains/choosing-a-model/_index.md" >}}) domain home source type
1313
with [Auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}).
14-
Unlike Domain on PV and Domain in Image, Model in Image eliminates the need to pre-create
14+
Model in Image eliminates the need to pre-create
1515
your WebLogic domain home prior to deploying your Domain YAML file.
1616
Instead, Model in Image uses a
1717
WebLogic Deploy Tooling (WDT) model to specify your WebLogic configuration.
1818

19-
WDT models are a convenient and simple alternative to WebLogic Scripting Tool (WLST) configuration scripts and templates. They compactly define a WebLogic domain using YAML files and support including application archives in a ZIP file. The WDT model format is described in the open source, [WebLogic Deploy Tooling](https://oracle.github.io/weblogic-deploy-tooling/) GitHub project, and the required directory structure for a WDT archive is specifically discussed [here](https://oracle.github.io/weblogic-deploy-tooling/concepts/archive/).
19+
WDT models are a convenient and simple alternative to WebLogic Scripting Tool (WLST) configuration scripts and templates. They compactly define a WebLogic domain using model files, variable properties files, and application archives files. The WDT model format is described in the open source, [WebLogic Deploy Tooling](https://oracle.github.io/weblogic-deploy-tooling/) GitHub project, and the required directory structure for a WDT archive is specifically discussed [here](https://oracle.github.io/weblogic-deploy-tooling/concepts/archive/).
2020

21-
Furthermore, the Model in Image auxiliary image option lets you supply your WDT artifacts
21+
Furthermore, the Model in Image auxiliary image option lets you supply your WDT model files
2222
in a small separate image separate from your WebLogic image.
2323

2424
For more information on Model in Image, see the [Model in Image]({{< relref "/managing-domains/model-in-image/_index.md" >}}) user guide. For a comparison of Model in Image to other domain home source types, see [Choose a domain home source type]({{< relref "/managing-domains/choosing-a-model/_index.md" >}}).
@@ -29,7 +29,7 @@ This sample demonstrates five Model in Image use cases:
2929

3030
- [Initial]({{< relref "/samples/domains/model-in-image/initial.md" >}}): An initial WebLogic domain with the following characteristics:
3131

32-
- Auxiliary image `model-in-image:WLS-AI-v1` with:
32+
- Auxiliary image `wdt-domain-image:WLS-v1` with:
3333
- A WebLogic Deploy Tooling (WDT) installation
3434
- A WDT archive with version `v1` of an exploded Java EE web application
3535
- A WDT model with:
@@ -67,11 +67,11 @@ This sample demonstrates five Model in Image use cases:
6767

6868
- [Update 3]({{< relref "/samples/domains/model-in-image/update3.md" >}}): Demonstrates deploying an updated auxiliary image with an updated application to the Update 1 use case domain and then restarting (rolling) its domain to propagate the change. Updates:
6969

70-
- Auxiliary image `model-in-image:WLS-AI-v2`, similar to `model-in-image:WLS-AI-v1` image with:
70+
- Auxiliary image `wdt-domain-image:WLS-v2`, similar to `wdt-domain-image:WLS-v1` image with:
7171
- An updated web application `v2` at the `myapp-v2` directory path instead of `myapp-v1`
7272
- An updated model that points to the new web application path
7373
- Domain:
74-
- Same as the Update 1 use case, except `spec.image` is `model-in-image:WLS-AI-v2`
74+
- Same as the Update 1 use case, except `spec.image` is `wdt-domain-image:WLS-v2`
7575

7676
- [Update 4]({{< relref "/samples/domains/model-in-image/update4.md" >}}): Demonstrates dynamically updating the running Update 1 or Update 3 WebLogic domain configuration without requiring a domain restart (roll). Updates:
7777

documentation/4.1/content/samples/domains/model-in-image/cleanup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ To remove the resources you have created in these samples:
4949

5050
7. Delete the images you may have created in this sample:
5151
```shell
52-
$ docker image rm model-in-image:WLS-AI-v1
52+
$ docker image rm wdt-domain-image:WLS-AI-v1
5353
```
5454
```shell
55-
$ docker image rm model-in-image:WLS-AI-v2
55+
$ docker image rm wdt-domain-image:WLS-AI-v2
5656
```
5757
```shell
5858
$ docker image rm model-in-image:JRF-AI-v1

documentation/4.1/content/samples/domains/model-in-image/initial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ weight: 2
1010

1111
In this use case, you set up an initial WebLogic domain. This involves:
1212

13-
- Creating an auxiliary image with:
13+
- Using the [auxiliary image](#auxiliary-image) that you previously created, it contains:
1414
- A WDT archive ZIP file that contains your applications.
1515
- A WDT model that describes your WebLogic configuration.
1616
- A WDT installation that contains the binaries for running WDT.
@@ -31,7 +31,7 @@ The sample uses an `auxiliary image` with the name `wdt-domain-image:WLS-v1` tha
3131

3232
### Deploy resources - Introduction
3333

34-
In this section, you will deploy the new image to namespace `sample-domain1-ns`, including the following steps:
34+
In this section, you will deploy the domain resource with the new auxliliary image to namespace `sample-domain1-ns`, including the following steps:
3535

3636
- Create a Secret containing your WebLogic administrator user name and password.
3737
- Create a Secret containing your Model in Image runtime encryption password:

documentation/4.1/content/samples/domains/model-in-image/prerequisites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ description: "Follow these prerequisite steps for WLS domain type."
2424

2525
For additional information about obtaining the operator source, see the [Developer Guide Requirements](https://oracle.github.io/weblogic-kubernetes-operator/developerguide/requirements/).
2626

27-
1. Copy the Model in Image sample to a new directory; for example, use directory /tmp/sample.
27+
1. Copy the Model in Image sample to a new directory; for example, use directory `/tmp/sample`.
2828
```
2929
$ mkdir -p /tmp/sample
3030
```

0 commit comments

Comments
 (0)