Skip to content

Commit 9e7ae6c

Browse files
committed
Minor updates to remove work "-AI" from domain resources.
1 parent f96621c commit 9e7ae6c

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ 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 wdt-domain-image:WLS-AI-v1
52+
$ docker image rm wdt-domain-image:WLS-v1
5353
```
5454
```shell
55-
$ docker image rm wdt-domain-image:WLS-AI-v2
55+
$ docker image rm wdt-domain-image:WLS-v2
5656
```

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ weight: 2
66

77
{{< table_of_contents >}}
88

9+
{{% notice note %}}
10+
**Before you begin**: Perform the steps in [Prerequisites]({{< relref "/samples/domains/model-in-image/prerequisites.md" >}}) and then create a Model in Image `auxiliary image` by completing the steps in [Auxiliary image creation]({{< relref "/samples/domains/model-in-image/auxiliary-image-creation.md" >}}).
11+
{{% /notice %}}
12+
913
### Overview
1014

1115
In this use case, you set up an initial WebLogic domain. This involves:
@@ -16,10 +20,6 @@ In this use case, you set up an initial WebLogic domain. This involves:
1620

1721
After the Domain is deployed, the operator starts an 'introspector job' that converts your models into a WebLogic configuration, and then passes this configuration to each WebLogic Server in the domain.
1822

19-
{{% notice note %}}
20-
**Before you begin**: Perform the steps in [Prerequisites]({{< relref "/samples/domains/model-in-image/prerequisites.md" >}}) and then create a Model in Image `auxiliary image` by completing the steps in [Auxiliary image creation]({{< relref "/samples/domains/model-in-image/auxiliary-image-creation.md" >}}).
21-
{{% /notice %}}
22-
2323
### Auxiliary image
2424

2525
The sample uses an `auxiliary image` with the name `wdt-domain-image:WLS-v1` that you created in the [Auxiliary image creation]({{< relref "/samples/domains/model-in-image/auxiliary-image-creation.md" >}}) step. The WDT model files in this auxiliary image define the WebLogic domain configuration. The image contains:
@@ -83,7 +83,7 @@ Run the following `kubectl` commands to deploy the required secrets:
8383

8484
Now, you create a Domain YAML file. A Domain is the key resource that tells the operator how to deploy a WebLogic domain.
8585

86-
Copy the contents of the [domain resource YAML file](https://raw.githubusercontent.com/oracle/weblogic-kubernetes-operator/{{< latestMinorVersion >}}/kubernetes/samples/scripts/create-weblogic-domain/model-in-image/domain-resources/WLS/mii-initial-d1-WLS-v1.yaml) file to a file called `/tmp/sample/mii-initial-domain.yaml` or similar. Alternatively, you can use the file `/tmp/sample/domain-resources/WLS-AI/mii-initial-d1-WLS-AI-v1.yaml` that is included in the sample source.
86+
Copy the contents of the [domain resource YAML file](https://raw.githubusercontent.com/oracle/weblogic-kubernetes-operator/{{< latestMinorVersion >}}/kubernetes/samples/scripts/create-weblogic-domain/model-in-image/domain-resources/WLS/mii-initial-d1-WLS-v1.yaml) file to a file called `/tmp/sample/mii-initial-domain.yaml` or similar. Alternatively, you can use the file `/tmp/sample/domain-resources/WLS/mii-initial-d1-WLS-v1.yaml` that is included in the sample source.
8787
This file contains both the domain resource and the referenced cluster resource definition. See [Domain and Cluster resources]({{< relref "/managing-domains/domain-resource">}}).
8888

8989
Click [here](https://raw.githubusercontent.com/oracle/weblogic-kubernetes-operator/{{< latestMinorVersion >}}/kubernetes/samples/scripts/create-weblogic-domain/model-in-image/domain-resources/WLS/mii-initial-d1-WLS-v1.yaml) to view the Domain YAML file.

documentation/site/content/samples/domains/model-in-image/update1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ Here are the steps:
156156
**NOTE**: Before you deploy the domain custom resource, ensure all nodes in your Kubernetes cluster [can access `auxliary-image` and other images]({{< relref "/samples/domains/model-in-image/_index.md#ensuring-your-kubernetes-cluster-can-access-images" >}}).
157157

158158
```shell
159-
$ kubectl apply -f /tmp/sample/domain-resources/WLS-AI/mii-update1-d1-WLS-AI-v1-ds.yaml
159+
$ kubectl apply -f /tmp/sample/domain-resources/WLS/mii-update1-d1-WLS-v1-ds.yaml
160160
```
161161

162162
1. Restart ('roll') the domain.

documentation/site/content/samples/domains/model-in-image/update2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Here are the steps for this use case:
121121

122122
- Option 1: Update a copy of your Domain YAML file from the Update 1 use case.
123123

124-
- In the [Update 1]({{< relref "/samples/domains/model-in-image/update1.md" >}}) use case, we suggested creating a file named `/tmp/sample/mii-update1.yaml` or using the `/tmp/sample/domain-resources/WLS-AI/mii-update1-d1-WLS-AI-v1-ds.yaml` file that is supplied with the sample.
124+
- In the [Update 1]({{< relref "/samples/domains/model-in-image/update1.md" >}}) use case, we suggested creating a file named `/tmp/sample/mii-update1.yaml` or using the `/tmp/sample/domain-resources/WLS/mii-update1-d1-WLS-v1-ds.yaml` file that is supplied with the sample.
125125
- We suggest copying this Domain YAML file and naming the copy `/tmp/sample/mii-update2.yaml` before making any changes.
126126

127127
- Working on a copy is not strictly necessary, but it helps keep track of your work for the different use cases in this sample and provides you a backup of your previous work.
@@ -284,7 +284,7 @@ Here are the steps for this use case:
284284
**NOTE**: Before you deploy the domain custom resource, ensure all nodes in your Kubernetes cluster [can access `auxiliary-image` and other images]({{< relref "/samples/domains/model-in-image/_index.md#ensuring-your-kubernetes-cluster-can-access-images" >}}).
285285

286286
```shell
287-
$ kubectl apply -f /tmp/sample/domain-resources/WLS-AI/mii-update2-d2-WLS-AI-v1-ds.yaml
287+
$ kubectl apply -f /tmp/sample/domain-resources/WLS/mii-update2-d2-WLS-v1-ds.yaml
288288
```
289289

290290
1. Wait for `sample-domain2` to start.

documentation/site/content/samples/domains/model-in-image/update3.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The Update 3 use case demonstrates deploying an updated WebLogic application to
88

99
In the use case, you will:
1010

11-
- Create an image `model-in-image:WLS-AI-v2` that is similar to the currently active `model-in-image:WLS-AI-v1` image, but with the following updates:
11+
- Create an image `model-in-image:WLS-v2` that is similar to the currently active `model-in-image:WLS-v1` image, but with the following updates:
1212
- An updated web application `v2` at the `myapp-v2` directory path within the WDT application archive instead of `myapp-v1`.
1313
- An updated model YAML file within the image that points to the new web application path.
1414
- Apply an updated Domain YAML file that references the new image while still referencing the original [Update 1]({{< relref "/samples/domains/model-in-image/update1.md" >}}) use case secrets and model ConfigMap.
@@ -29,21 +29,21 @@ Here are the steps for this use case:
2929

3030
2. Create an updated auxiliary image.
3131

32-
Recall that a goal of the [Initial]({{< relref "/samples/domains/model-in-image/initial.md" >}}) use case was to demonstrate using the WebLogic Image Tool to create an auxiliary image named `wdt-domain-image:WLS-v1` from files that were staged in `/tmp/sample/model-images/model-in-image__WLS-AI-v1/`. The staged files included a web application in a WDT ZIP archive, and WDT model configuration for a WebLogic Server Administration Server called `admin-server` and a WebLogic cluster called `cluster-1`. The final image was called `wdt-domain-image:WLS-AI-v1` and, in addition to having a copy of the staged files in its `/auxiliary/models` directory, also contained a directory `/auxiliary/weblogic-deploy` where the WebLogic Deploy Tooling software is installed.
32+
Recall that a goal of the [Initial]({{< relref "/samples/domains/model-in-image/initial.md" >}}) use case was to demonstrate using the WebLogic Image Tool to create an auxiliary image named `wdt-domain-image:WLS-v1` from files that were staged in `/tmp/sample/wdt-artifacts/wdt-model-files/WLS-v1/`. The staged files included a web application in a WDT ZIP archive, and WDT model configuration for a WebLogic Server Administration Server called `admin-server` and a WebLogic cluster called `cluster-1`. The final image was called `wdt-domain-image:WLS-v1` and, in addition to having a copy of the staged files in its `/auxiliary/models` directory, also contained a directory `/auxiliary/weblogic-deploy` where the WebLogic Deploy Tooling software is installed.
3333

3434
In this use case, you will follow similar steps to the [Initial]({{< relref "/samples/domains/model-in-image/initial.md" >}}) use case to create a new image with an updated application and model, plus deploy the updated model and application to the running [Update 1]({{< relref "/samples/domains/model-in-image/update1.md" >}}) use case domain.
3535

3636
- Understanding your updated WDT archive.
3737

38-
The updated archive for this use case is in directory `/tmp/sample/archives/archive-v2`. You will use it to create an archive ZIP file for the image. This archive is similar to the `/tmp/sample/archives/archive-v1` from the [Initial]({{< relref "/samples/domains/model-in-image/initial.md" >}}) use case with the following differences:
38+
The updated archive for this use case is in directory `/tmp/sample/wdt-artifacts/archives/archive-v2`. You will use it to create an archive ZIP file for the image. This archive is similar to the `/tmp/sample/wdt-artifacts/archives/archive-v1` from the [Initial]({{< relref "/samples/domains/model-in-image/initial.md" >}}) use case with the following differences:
3939
- It includes an updated version of the application in `./wlsdeploy/applications/myapp-v2` (while keeping the original application in directory `./wlsdeploy/applications/myapp-v1`).
4040
- The application in `./wlsdeploy/applications/myapp-v2/myapp_war/index.jsp` contains a single difference from the original application: it changes the line `out.println("Hello World! This is version 'v1' of the sample JSP web-app.");` to `out.println("Hello World! This is version 'v2' of the sample JSP web-app.");`.
4141

4242
For additional information about archives, see [Understand your first archive]({{< relref "/samples/domains/model-in-image/auxiliary-image-creation#understand-your-first-archive" >}}).
4343

4444
- Stage a ZIP file of the WDT archive.
4545

46-
When you create your updated image, you will use the files in the staging directory `/tmp/sample/model-in-image__WLS-AI-v2`. In preparation, you need it to contain a ZIP file of the new WDT application archive.
46+
When you create your updated image, you will use the files in the staging directory `/tmp/sample/wdt-artifacts/wdt-model-files/WLS-v2`. In preparation, you need it to contain a ZIP file of the new WDT application archive.
4747

4848
Run the following commands to create your application archive ZIP file and put it in the expected directory:
4949

@@ -130,7 +130,7 @@ Here are the steps for this use case:
130130
131131
- Option 1: Update a copy of your Domain YAML file from the Update 1 use case.
132132
133-
- In the [Update 1]({{< relref "/samples/domains/model-in-image/update1.md" >}}) use case, we suggested creating a file named `/tmp/sample/mii-update1.yaml` or using the `/tmp/sample/domain-resources/WLS-AI/mii-update1-d1-WLS-AI-v1-ds.yaml` file that is supplied with the sample.
133+
- In the [Update 1]({{< relref "/samples/domains/model-in-image/update1.md" >}}) use case, we suggested creating a file named `/tmp/sample/mii-update1.yaml` or using the `/tmp/sample/domain-resources/WLS/mii-update1-d1-WLS-v1-ds.yaml` file that is supplied with the sample.
134134
135135
- We suggest copying this Domain YAML file and naming the copy `/tmp/sample/mii-update3.yaml` before making any changes.
136136
@@ -160,7 +160,7 @@ Here are the steps for this use case:
160160
**NOTE**: Before you deploy the domain custom resource, ensure all nodes in your Kubernetes cluster [can access `auxiliary-image` and other images]({{< relref "/samples/domains/model-in-image/_index.md#ensuring-your-kubernetes-cluster-can-access-images" >}}).
161161
162162
```shell
163-
$ kubectl apply -f /tmp/sample/domain-resources/WLS-AI/mii-update3-d1-WLS-AI-v2-ds.yaml
163+
$ kubectl apply -f /tmp/sample/domain-resources/WLS/mii-update3-d1-WLS-v2-ds.yaml
164164
```
165165
166166

0 commit comments

Comments
 (0)