Skip to content

Commit d67a2f8

Browse files
rosemarymaranorjeberhard
authored andcommitted
review/edit sample READMEs
1 parent 166c956 commit d67a2f8

File tree

7 files changed

+32
-33
lines changed

7 files changed

+32
-33
lines changed

kubernetes/samples/README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# WebLogic operator samples
22

3-
These samples are intended to provide simple demonstrations of how to accomplish common tasks.
4-
The samples are **not** intended to be used in production deployments or to be depended on to
5-
create production environments. They are provided as-is for educational and demonstration purposes.
3+
These samples provide simple demonstrations of how to accomplish common tasks.
4+
The samples are **not** intended to be used in production deployments or to be depended upon to
5+
create production environments. They are provided for educational and demonstration purposes only.
66

7-
While these samples may be useful and usable as-is, it is intended that you would read through all of the sample code in detail, understand how the
8-
given sample works and then customize it to suit your needs.
7+
While these samples may be useful and usable as is, it is intended that you would read through all of the sample code in detail, understand how the given sample works, and then customize it to suit your needs.
98

109
## Sample scripts
1110

kubernetes/samples/scripts/create-weblogic-domain-credentials/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Creating credentials for a WebLogic domain
22

3-
This sample demonstrates how to create a Kubernetes secret containing the
3+
This sample demonstrates how to create a Kubernetes secret containing the
44
credentials for a WebLogic domain. The operator expects this secret to be
55
named following the pattern `domainUID-weblogic-credentials`, where `domainUID`
6-
is the unique identifier of the domain. It must be in the same namespace
6+
is the unique identifier of the domain. It must be in the same namespace
77
that the domain will run in.
88

99
To use the sample, run the command:
@@ -15,17 +15,17 @@ $ ./create-weblogic-credentials.sh -u username -p password -d domainUID -n names
1515
The parameters are as follows:
1616

1717
```
18-
-u username, must be specified.
18+
-u user name, must be specified.
1919
-p password, must be specified.
2020
-d domainUID, optional. The default value is domain1. If specified, the secret will be labeled with the domainUID unless the given value is an empty string.
21-
-n namespace, optional. Use the default namespace if not specified
22-
-s secretName, optional. If not specified, the secret name will be determined based on the domainUID value
21+
-n namespace, optional. Use the default namespace if not specified.
22+
-s secretName, optional. If not specified, the secret name will be determined based on the domainUID value.
2323
```
2424

25-
This creates a `generic` secret containing the username and password as literal values.
25+
This creates a `generic` secret containing the user name and password as literal values.
2626

2727
You can check the secret with the `kubectl get secret` command. An example is shown below,
28-
including output:
28+
including the output:
2929

3030
```
3131
$ kubectl -n domain-namespace-1 get secret domain1-weblogic-credentials -o yaml
@@ -46,4 +46,4 @@ metadata:
4646
uid: 0c2b3510-fe4c-11e8-994d-00001700101d
4747
type: Opaque
4848
49-
```
49+
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ The PV and PVC creation inputs can be customized by editing the `create-pv-pvc-i
6363

6464
By default, the `domainUID` is left empty in the inputs file, which means the generated PV and PVC will not be associated with a particular domain, but can be shared by multiple domain resources in the same Kubernetes namespaces as the PV and PVC.
6565

66-
For the use cases where dedicated PV and PVC are desired for a particular domain, the `domainUID` needs to be set in the `create-pv-pvc-inputs.yaml` file. The presence of a non-empty domainUID in the inputs file will cause the generated PV and PVC to be associated with the specified `domainUID`. The association includes that the names of the generated YAML files and the Kubernetes PV and PVC objects are decorated with the `domainUID`, and the PV and PVC objects are also labeled with the `domainUID`.
66+
For the use cases where dedicated PV and PVC are desired for a particular domain, the `domainUID` needs to be set in the `create-pv-pvc-inputs.yaml` file. The presence of a non-empty `domainUID` in the inputs file will cause the generated PV and PVC to be associated with the specified `domainUID`. The association includes that the names of the generated YAML files and the Kubernetes PV and PVC objects are decorated with the `domainUID`, and the PV and PVC objects are also labeled with the `domainUID`.
6767

6868
## Verify the results
6969

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
@@ -27,8 +27,8 @@ The script will perform the following steps:
2727

2828
* Create a directory for the generated properties and Kubernetes YAML files for this domain if it does not already exist. The pathname is `/path/to/weblogic-operator-output-directory/weblogic-domains/<domainUID>`. If the directory already exists, its contents will be removed.
2929
* Create a properties file, `domain.properties`, in the directory that is created above. This properties file will be used to create a sample WebLogic Server domain.
30-
* Clone the weblogic docker-images project via the `git clone https://github.com/oracle/docker-images.git` into the current directory.
31-
* Replace the built-in username and password in the `properties/docker-build/domain_security.properties` file with the `username` and `password` that are supplied in the command line via the `-u` and `-p` options. These credentials need to match the WebLogic domain admin credentials in the secret that is specified via `weblogicCredentialsSecretName` property in the `create-domain-inputs.yaml` file.
30+
* Clone the weblogic docker-images project into the current directory using `git clone https://github.com/oracle/docker-images.git`.
31+
* Replace the built-in user name and password in the `properties/docker-build/domain_security.properties` file with the `username` and `password` that are supplied on the command line using the `-u` and `-p` options. These credentials need to match the WebLogic domain admin credentials in the secret that is specified via the `weblogicCredentialsSecretName` property in the `create-domain-inputs.yaml` file.
3232
* Build a Docker image based on the Docker sample, [Example Image with a WebLogic Server Domain using the Oracle WebLogic Deploy Tooling (WDT)](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-domain-home-in-image-wdt) and [Example Image with a WebLogic Server Domain using WLST](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-domain-home-in-image). It will create a sample WebLogic Server domain in the Docker image. Also, you can run the Docker sample, [Example Image with a WebLogic Server Domain](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-domain-home-in-image), manually with the generated `domain.properties` to create a domain home image. **Note**: Oracle recommends keeping the domain home image private in the local repository.
3333
* Create a Kubernetes domain YAML file, `domain.yaml`, in the directory that is created above. This YAML file can be used to create the Kubernetes resource using the `kubectl create -f` or `kubectl apply -f` command.
3434

@@ -44,7 +44,7 @@ usage: create-domain.sh -o dir -i file -u username -p password [-k] [-e] [-h]
4444
-u Username used in building the Docker image for WebLogic domain in image.
4545
-p Password used in building the Docker image for WebLogic domain in image.
4646
-e Also create the resources in the generated YAML files, optional.
47-
-k Keep what has been previously cloned from https://github.com/oracle/docker-images.git, optional.
47+
-k Keep what has been previously cloned from https://github.com/oracle/docker-images.git, optional.
4848
If not specified, this script will always remove existing project and clone again.
4949
-h Help
5050
@@ -139,7 +139,7 @@ spec:
139139
includeServerOutInPodLog: true
140140
# serverStartPolicy legal values are "NEVER", "IF_NEEDED", or "ADMIN_ONLY"
141141
# This determines which WebLogic Servers the Operator will start up when it discovers this Domain
142-
# - "NEVER" will not start any servers in the domain
142+
# - "NEVER" will not start any servers in the domain
143143
# - "ADMIN_ONLY" will start up only the administration server (no managed servers will be started)
144144
# - "IF_NEEDED" will start all non-clustered servers, including the administration server and clustered servers up to the replica count
145145
serverStartPolicy: "IF_NEEDED"

kubernetes/samples/scripts/elasticsearch-and-kibana/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ It's useful for trying out the operator in a Kubernetes cluster that doesn't alr
1414
have them configured.
1515

1616
It runs Elasticstack on the same host and port that the operator's Helm chart defaults
17-
to, therefore, the customer only needs to set elkIntegrationEnabled to true in their
18-
`values.yaml` file.
17+
to, therefore, the customer only needs to set `elkIntegrationEnabled` to `true` in their
18+
`values.yaml` file.``
1919

2020
To install ElasticSearch and Kibana, use:
2121
```
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Sample to create certificates and keys for the operator
22

3-
When a user enables the operator's external REST api (by setting
4-
`externalRestEnabled` to `true` when installing the operator helm chart), the user needs
5-
to provide the certificate and private key for api's SSL identity (by setting
3+
When a user enables the operator's external REST API (by setting
4+
`externalRestEnabled` to `true` when installing the operator Helm chart), the user needs
5+
to provide the certificate and private key for the API's SSL identity (by setting
66
`externalOperatorCert` and `externalOperatorKey` to the base64 encoded PEM of the cert and
7-
key when installing the operator helm chart).
7+
key when installing the operator Helm chart).
88

99
This sample script generates a self-signed certificate and private key that can be used
10-
for the operator's external REST api when experimenting with the operator. They should
10+
for the operator's external REST API when experimenting with the operator. They should
1111
not be used in a production environment.
1212

1313
The syntax of the script is:
@@ -16,7 +16,7 @@ $ kubernetes/samples/scripts/generate-external-rest-identity.sh <subject alterna
1616
```
1717

1818
Where `<subject alternative names>` lists the subject alternative names to put into the generated
19-
self-signed certificate for the external WebLogic Operator REST https interface. Each must be prefaced
19+
self-signed certificate for the external WebLogic Operator REST HTTPS interface. Each must be prefaced
2020
by `DNS:` (for a name) or `IP:` (for an address), for example:
2121
```
2222
DNS:myhost,DNS:localhost,IP:127.0.0.1
@@ -25,13 +25,13 @@ DNS:myhost,DNS:localhost,IP:127.0.0.1
2525
You should include the addresses of all masters and load balancers in this list. The certificate
2626
cannot be conveniently changed after installation of the operator.
2727

28-
The script prints out the base64 encoded pem of the generated certificate and private key
29-
in the same format that the operator helm chart's `values.yaml` requires.
28+
The script prints out the base64 encoded PEM of the generated certificate and private key
29+
in the same format that the operator Helm chart's `values.yaml` requires.
3030

3131
Example usage:
3232
```
3333
$ generate-external-rest-identity.sh IP:127.0.0.1 > my_values.yaml
3434
$ echo "externalRestEnabled: true" >> my_values.yaml
3535
...
3636
$ helm install kubernetes/charts/weblogic-operator --name my_operator --namespace my_operator-ns --values my_values.yaml --wait
37-
```
37+
```

site/persistent-volumes.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
**TODO** review
1+
22

33
# Persistent volumes
44

@@ -14,14 +14,14 @@ The following prerequisites must be fulfilled before proceeding with the creatio
1414
## Storage locations
1515
Persistent volumes can point to different storage locations, for example NFS servers or a local directory path. The list of available options is listed in the [Kubernetes documentation](https://kubernetes.io/docs/concepts/storage/persistent-volumes/).
1616

17-
**Note** regarding NFS:
17+
**Note regarding NFS**:
1818
In the current GA version, the OCI Container Engine for Kubernetes supports network block storage that can be shared across nodes with access permission RWOnce (meaning that only one can write, others can read only). At this time, the WebLogic on Kubernetes domain created by the WebLogic Server Kubernetes Operator, requires a shared file system to store the WebLogic domain configuration, which MUST be accessible from all the pods across the nodes. As a workaround, you need to install an NFS server on one node and share the file system across all the nodes.
1919

20-
Currently, we recommend that you use NFS version 3.0 for running WebLogic Server on OCI Container Engine for Kubernetes. During certification, we found that when using NFS 4.0, the servers in the WebLogic domain went into a failed state intermittently. Because multiple threads use NFS (default store, diagnostics store, Node Manager, logging, and domain_home), there are issues when accessing the file store. These issues are removed by changing the NFS to version 3.0.
20+
Currently, we recommend that you use NFS version 3.0 for running WebLogic Server on OCI Container Engine for Kubernetes. During certification, we found that when using NFS 4.0, the servers in the WebLogic domain went into a failed state intermittently. Because multiple threads use NFS (default store, diagnostics store, Node Manager, logging, and `domain_home`), there are issues when accessing the file store. These issues are removed by changing the NFS to version 3.0.
2121

2222
# YAML files
2323

24-
Persistent volumes and claims are described in YAML files. For each persistent volume, you should create one persistent volume YAML file and one persistent volume claim YAML file. In the example below, you will find 2 YAML templates, one for the volume and one for the claim. As stated above, they can either be dedicated to a specific domain, or shared across multiple domains. For the use cases where a volume will be dedicated to a particular domain, it is a best practice to label it with `weblogic.domainUID=[domain name]`. This makes it easy to search for, and clean up resources associated with that particular domain.
24+
Persistent volumes and claims are described in YAML files. For each persistent volume, you should create one persistent volume YAML file and one persistent volume claim YAML file. In the example below, you will find two YAML templates, one for the volume and one for the claim. As stated above, they either can be dedicated to a specific domain, or shared across multiple domains. For the use cases where a volume will be dedicated to a particular domain, it is a best practice to label it with `weblogic.domainUID=[domain name]`. This makes it easy to search for, and clean up resources associated with that particular domain.
2525

2626
For sample YAML templates, refer to the [Persistent volumes example](../kubernetes/samples/scripts/create-weblogic-domain-pv-pvc/README.md).
2727

0 commit comments

Comments
 (0)