Skip to content

Commit 224f475

Browse files
committed
Update the doc with the latest patch number plus more doc changes
Signed-off-by: doxiao <[email protected]>
1 parent b8c2740 commit 224f475

File tree

5 files changed

+25
-17
lines changed

5 files changed

+25
-17
lines changed

kubernetes/samples/scripts/common/domain-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
domainHome: %DOMAIN_HOME%
1818
# If the domain home is in the image
1919
domainHomeInImage: %DOMAIN_HOME_IN_IMAGE%
20-
# The Operator currently does not support other images
20+
# The WebLogic Server Docker image that the Operator uses to start the domain
2121
image: "%WEBLOGIC_IMAGE%"
2222
# imagePullPolicy defaults to "Always" if image version is :latest
2323
imagePullPolicy: "%WEBLOGIC_IMAGE_PULL_POLICY%"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# WebLogic sample domain home in Docker image
22

3-
The sample scripts demonstrate the creation of a WebLogic domain home in a Docker image. If logHomeOnPV is enabled, then the log home resides on an existing Kubernetes persistent volume (PV) and persistent volume claim (PVC). The scripts also generate the domain YAML file, which can then be used to start the Kubernetes artifacts of the corresponding domain. Optionally, the scripts start up the domain, and WebLogic Server pods and services.
3+
The sample scripts demonstrate the creation of a WebLogic domain home in a Docker image by using one of the domain home in image samples in the [WebLogic Server Domain Docker image samples GitHub project](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples). The sample scripts have an option of putting the WebLogic domain log, server logs, server output files, and the node manager logs on an existing Kubernetes persistent volume (PV) and persistent volume claim (PVC). The scripts also generate the domain YAML file, which can then be used by the scripts or manually to start the Kubernetes artifacts of the corresponding domain, including the WebLogic Server pods and services.
44

55
## Prerequisites
66

@@ -102,13 +102,13 @@ The following parameters can be provided in the inputs file.
102102
| `adminServerName` | Name of the Administration Server. | `admin-server` |
103103
| `clusterName` | Name of the WebLogic cluster instance to generate for the domain. | `cluster-1` |
104104
| `configuredManagedServerCount` | Number of Managed Server instances to generate for the domain. | `5` |
105-
| `domainHomeImageBase` | Base WebLogic binary image used to build the WebLogic domain image. The operator requires WebLogic Server 12.2.1.3.0 with patch 29135930 applied. Refer to [Weblogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how to create one. If a different `domainHomeImageBase` is specified, the specified image needs to be built locally or pulled from a repository before the `create-domain.sh` script is executed. | |
105+
| `domainHomeImageBase` | Base WebLogic binary image used to build the WebLogic domain image. The operator requires WebLogic Server 12.2.1.3.0 with patch 29135930 applied. Refer to [Weblogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how to create one. | |
106106
| `domainHomeImageBuildPath` | Location of the WebLogic "domain home in image" Docker image in `https://github.com/oracle/docker-images.git` project. If not specified, use "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image". Another possible value is "./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt" which uses WDT, instead of WLST, to generate the domain configuration. | `./docker-images/OracleWebLogic/samples/12213-domain-home-in-image` |
107107
| `domainPVMountPath` | Mount path of the domain persistent volume. This parameter is required if `logHomeOnPV` is true. Otherwise, it is ignored. | `/shared` |
108108
| `domainUID` | Unique ID that will be used to identify this particular domain. Used as the name of the generated WebLogic domain as well as the name of the Kubernetes domain resource. This ID must be unique across all domains in a Kubernetes cluster. This ID cannot contain any character that is not valid in a Kubernetes service name. | `domain1` |
109109
| `exposeAdminNodePort` | Boolean indicating if the Administration Server is exposed outside of the Kubernetes cluster. | `false` |
110110
| `exposeAdminT3Channel` | Boolean indicating if the T3 administrative channel is exposed outside the Kubernetes cluster. | `false` |
111-
| `image` | WebLogic Docker image that the domain resource will pull if needed. You need to specify this only if you are going to tag the generated image to a different name. If you run the sample script from a machine that is remote to the Kubernetes cluster, you need to specify this to point to an image in a registry local to the cluster, and then push the generated image to that registry before starting the domain. If not specified, the sample uses the internally generated image name, either `domain-home-in-image:latest` or `domain-home-in-image-wdt:latest`. | |
111+
| `image` | WebLogic Server Docker image that the Operator uses to start the domain. The create domain scripts generate a WebLogic Server Docker image with a domain home in it. By default, the scripts tag the generated WebLogic server Docker image as either `domain-home-in-image` or `domain-home-in-image-wdt` based on the `domainHomeImageBuildPath` property, and use it to set the `image` in the generated domain YAML file. If this property is set, the create domain scripts will use the value specified, instead of the default value, to tag the generated image and set the `image` in the domain YAML file. If you are running the sample scripts from a machine that is remote to the Kubernetes cluster where the domain is going to be running, you need to set this property to the image name that is intended to be used in a registry local to that Kubernetes cluster. You also need to push the `image` to that registry before starting the domain using the `kubectl create -f` or `kubectl apply -f` command. | |
112112
| `imagePullPolicy` | WebLogic Docker image pull policy. Legal values are `IfNotPresent`, `Always`, or `Never`. | `IfNotPresent` |
113113
| `imagePullSecretName` | Name of the Kubernetes secret to access the Docker Store to pull the WebLogic Server Docker image. The presence of the secret will be validated when this parameter is specified. | |
114114
| `includeServerOutInPodLog` | Boolean indicating whether to include `server.out` to the pod's stdout. | `true` |
@@ -160,7 +160,7 @@ spec:
160160
domainHome: /u01/oracle/user_projects/domains/domain1
161161
# If the domain home is in the image
162162
domainHomeInImage: true
163-
# The Operator currently does not support other images
163+
# The WebLogic Server Docker image that the Operator uses to start the domain
164164
image: "domain-home-in-image"
165165
# imagePullPolicy defaults to "Always" if image version is :latest
166166
imagePullPolicy: "IfNotPresent"

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,20 @@ managedServerPort: 8001
3737
# Boolean indicating if production mode is enabled for the domain
3838
productionModeEnabled: true
3939

40-
# WebLogic Docker image that the domain resource will pull if needed.
40+
# WebLogic Server Docker image that the Operator uses to start the domain.
4141
#
42-
# You only need to specify this if you want to tag the generated image to a different name.
42+
# The create domain scripts generate a WebLogic Server Docker image with a domain home in it.
43+
# By default, the scripts tag the generated WebLogic server Docker image as either
44+
# `domain-home-in-image` or `domain-home-in-image-wdt` based on the `domainHomeImageBuildPath`
45+
# property, and use it to set the `image` in the generated domain YAML file.
4346
#
44-
# If you are running the sample script from a machine that is remote to the Kubernetes cluster,
45-
# you need to specify this to point to an image in a registry local to the cluster. You
46-
# then need to push the generate image to that registry before starting the domain.
47-
#
48-
# If not specified, the sample uses the internally generated image name,
49-
# either "domain-home-in-image-wdt:latest" or "domain-home-in-image-wlst:latest".
47+
# If this property is set, the create domain scripts will use the value specified, instead of the
48+
# default value, to tag the generated image and set the `image` in the domain YAML file.
5049
#
50+
# If you are running the sample scripts from a machine that is remote to the Kubernetes cluster where
51+
# the domain is going to be running, you need to set this property to the image name that is intended
52+
# to be used in a registry local to that Kubernetes cluster. You also need to push the `image` to
53+
# that registry before starting the domain using the `kubectl create -f` or `kubectl apply -f` command.
5154
# See README.md for more help.
5255
#image:
5356

@@ -116,7 +119,10 @@ persistentVolumeClaimName: domain1-weblogic-sample-pvc
116119
domainPVMountPath: /shared
117120

118121
# Base WebLogic binary image used to build the WebLogic domain image
119-
# The operator requires WebLogic Server 12.2.1.3.0 with patch 28076014 applied.
122+
# WebLogic Server Docker image.
123+
# The operator requires WebLogic Server 12.2.1.3.0 with patch 29135930 applied.
124+
# Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how
125+
# to create a custom Docker image with the required patch.
120126
# See README.md for more help.
121127
#domainHomeImageBase:
122128

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ spec:
133133
domainHome: /shared/domains/domain1
134134
# If the domain home is in the image
135135
domainHomeInImage: false
136-
# The Operator currently does not support other images
136+
# The WebLogic Server Docker image that the Operator uses to start the domain
137137
image: "oracle/weblogic:12213-patch-wls-for-k8s"
138138
# imagePullPolicy defaults to "Always" if image version is :latest
139139
imagePullPolicy: "IfNotPresent"

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/create-domain-inputs.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ managedServerNameBase: managed-server
3737
# Port number for each managed server
3838
managedServerPort: 8001
3939

40-
# WebLogic Docker image.
41-
# The operator requires WebLogic Server 12.2.1.3.0 with patch 28076014 applied. See README.md for more help.
40+
# WebLogic Server Docker image.
41+
# The operator requires WebLogic Server 12.2.1.3.0 with patch 29135930 applied.
42+
# Refer to [WebLogic Docker images](../../../../../site/weblogic-docker-images.md) for details on how
43+
# to create a custom Docker image with the required patch.
4244
#image:
4345

4446
# Image pull policy

0 commit comments

Comments
 (0)