Skip to content

Commit deecbfa

Browse files
authored
Merge pull request #599 from oracle/rmarano
complete review and edit
2 parents 809206f + a6cb12f commit deecbfa

File tree

13 files changed

+104
-106
lines changed

13 files changed

+104
-106
lines changed

kubernetes/samples/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# WebLogic Operator Samples
1+
# WebLogic operator samples
22

33
## Sample scripts
44

5-
* [Sample secret for WebLogic admin credentials](scripts/create-weblogic-domain/create-weblogic-credentials.sh) for creating a Kubernetes secret that contains the Administration Server credentials. This secret can be used in creating a WebLogic domain custom resource.
6-
* [Sample PV and PVC](scripts/create-weblogic-domain-pv-pvc/README.md) for creating a PV or PVC that can be used by a domain custom resource as the persistent storage for the WebLogic domain home or log files.
7-
* [Sample domain home on a persistent volume](scripts/create-weblogic-domain/domain-home-on-pv/README.md) for creating a WebLogic domain home on an existing PV or PVC, and the domain customer resource YAML file for deploying the generated WebLogic domain.
8-
* [Sample Elasticsearch and Kibana configuration](scripts/elasticsearch_and_kibana.yaml) for configuring the Elasticsearch and Kibana deployments and services for the operator's logs.
9-
* [Sample self-signed certificate and private key](scripts/generate-external-rest-identity.sh) for generating a self-signed certificate and private key that can be used for the operator's external REST API.
5+
* [Sample for creating a Kubernetes secret](scripts/create-weblogic-domain/create-weblogic-credentials.sh) that contains the Administration Server credentials. This secret can be used in creating a WebLogic domain resource.
6+
* [Sample for creating a PV or PVC](scripts/create-weblogic-domain-pv-pvc/README.md) that can be used by a domain resource as the persistent storage for the WebLogic domain home or log files.
7+
* [Sample for creating a WebLogic domain home on an existing PV or PVC](scripts/create-weblogic-domain/domain-home-on-pv/README.md), and the domain resource YAML file for deploying the generated WebLogic domain.
8+
* [Sample for configuring the Elasticsearch and Kibana](scripts/elasticsearch_and_kibana.yaml) deployments and services for the operator's logs.
9+
* [Sample for generating a self-signed certificate and private key](scripts/generate-external-rest-identity.sh) that can be used for the operator's external REST API.
1010

1111
## Sample Helm charts
1212

1313
* [Sample Traefik Helm chart](charts/traefik/README.md) for setting up a Traefik load balancer for WebLogic clusters.
1414
* [Sample Voyager Helm chart](charts/voyager/README.md) for setting up a Voyager load balancer for WebLogic clusters.
15-
* [Sample Ingress Helm chart](charts/ingress-per-domain/README.md) for setting up a Kubernetes Ingress for each WebLogic cluster using Traefik or Voyager load balancer.
15+
* [Sample Ingress Helm chart](charts/ingress-per-domain/README.md) for setting up a Kubernetes Ingress for each WebLogic cluster using a Traefik or Voyager load balancer.
1616
* [Sample Apache Helm chart](charts/apache-webtier/README.md) and [Apache samples using the default or custom configurations](charts/apache-samples/README.md) for setting up a load balancer for WebLogic clusters using the Apache HTTP Server with WebLogic Server Plugins.

kubernetes/samples/charts/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
## Load balancer sample scripts
44

5-
The Oracle WebLogic Server Kubernetes Operator supports three load balancers: TRAEFIK, VOYAGER, and APACHE. We provide samples that demonstrate how to install and configure each one. The samples are located in following folders:
5+
The Oracle WebLogic Server Kubernetes Operator supports three load balancers: Traefik, Voyager, and Apache. We provide samples that demonstrate how to install and configure each one. The samples are located in following folders:
66

77
* [traefik](traefik/README.md)
88
* [voyager](voyager/README.md)
9-
* apache-samples [custom-sample](apache-samples/custom-sample/README.md)
10-
* apache-samples [default-sample](apache-samples/default-sample/README.md)
9+
* apache-samples/[custom-sample](apache-samples/custom-sample/README.md)
10+
* apache-samples/[default-sample](apache-samples/default-sample/README.md)
1111
* [ingress-per-domain](ingress-per-domain/README.md)
1212
* [apache-webtier](apache-webtier/README.md)
1313

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Sample Persistent Volume and Persistent Volume Claim
1+
# Sample persistent volume and persistent volume claim
22

3-
The sample scripts demonstrate the creation of a Kubernetes persistent volume (PV) and persistent volume claim (PVC), which can then be used in a domain custom resource as a persistent storage for the WebLogic domain home or log files.
3+
The sample scripts demonstrate the creation of a Kubernetes persistent volume (PV) and persistent volume claim (PVC), which can then be used in a domain resource as a persistent storage for the WebLogic domain home or log files.
44

55
A PV and PVC can be shared by multiple WebLogic domains or dedicated to a particular domain.
66

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# WebLogic Sample Domain Home in Docker Image
1+
# WebLogic sample domain home in Docker image
22

3-
The sample scripts demonstrate the creation of a WebLogic domain home in docker image. 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. 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.
44

55
## Prerequisites
66

77
The following prerequisites must be handled prior to running the create domain script:
8-
* Make sure the WebLogic Operator is running.
8+
* Make sure the WebLogic operator is running.
99
* Create a Kubernetes namespace for the domain unless the intention is to use the default namespace.
1010
* Create the Kubernetes secrets `username` and `password` of the admin account in the same Kubernetes namespace as the domain.
11-
* Build the Oracle WebLogic image oracle/weblogic:12.2.1.3-developer . Refer to [Oracle WebLogic Server on Docker](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3).
11+
* Build the Oracle WebLogic image `oracle/weblogic:12.2.1.3-developer`. Refer to [Oracle WebLogic Server on Docker](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3).
1212

13-
## Using the script to create a domain
13+
## Use the script to create a domain
1414

1515
Make a copy of the `create-domain-inputs.yaml` file, and run the create script, pointing it at your inputs file and an output directory:
1616

@@ -25,13 +25,13 @@ Make a copy of the `create-domain-inputs.yaml` file, and run the create script,
2525
The script will perform the following steps:
2626

2727
* 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>`. Note that the script fails if the directory is not empty when the `create-domain.sh` script is executed.
28-
* Create a proerties file, `domain.properties`, in the directory that is created above. This properties file will be used to create a sample WebLogic Server domain.
28+
* 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.
2929
* Clone the weblogic docker-images project via the `git clone https://github.com/oracle/docker-images.git` into the current directory.
3030
* 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.
31-
* Build Docker image based on Docker sample [Example Image with a WebLogic Server Domain](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-domain-home-in-image). It will create a sample WebLogic Server domain into the Docker image. You can also 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 domain home image. Note: Oracle recommends keeping the domain home image private in the local repository.
31+
* Build a Docker image based on 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). 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.
3232
* 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.
3333

34-
As a convenience, using the `-e` option, the script can optionally create the domain object, which in turn results in the creation of the corresponding WebLogic Server pods and services as well.
34+
As a convenience, using the `-e` option, the script can optionally create the domain object, which in turn results in the creation of the corresponding WebLogic Server pods and services.
3535

3636
The usage of the create script is as follows:
3737

@@ -88,13 +88,13 @@ The following parameters can be provided in the inputs file.
8888

8989
Note that the names of the Kubernetes resources in the generated YAML files may be formed with the value of some of the properties specified in the `create-inputs.yaml` file. Those properties include the `adminServerName`, `clusterName` and `managedServerNameBase`. If those values contain any characters that are invalid in a Kubernetes service name, those characters are converted to valid values in the generated YAML files. For example, an uppercase letter is converted to a lowercase letter and an underscore `("_")` is converted to a hyphen `("-")`.
9090

91-
The sample demonstrates how to create a WebLogic domain home and associated Kubernetes resources for a domain that only has one cluster. In addition, the sample provides the capability for users to supply their own scripts to create the domain home for other use cases. The generated domain YAML file could also be modified to cover more use cases.
91+
The sample demonstrates how to create a WebLogic domain home and associated Kubernetes resources for a domain that has only one cluster. In addition, the sample provides the capability for users to supply their own scripts to create the domain home for other use cases. Also, the generated domain YAML file can be modified to cover more use cases.
9292

9393
## Verify the results
9494

9595
The create script will verify that the domain was created, and will report failure if there was any error. However, it may be desirable to manually verify the domain, even if just to gain familiarity with the various Kubernetes objects that were created by the script.
9696

97-
Note that the example results below uses the `default` Kubernetes namespace. If you are using a different namespace, you need to replace `NAMESPACE` in the example `kubectl` commands with the actual Kubernetes namespace.
97+
Note that the example results below use the `default` Kubernetes namespace. If you are using a different namespace, you need to replace `NAMESPACE` in the example `kubectl` commands with the actual Kubernetes namespace.
9898

9999
### Generated YAML files with the default inputs
100100

@@ -292,11 +292,11 @@ Status:
292292
Events: <none>
293293
```
294294

295-
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 Managed Servers.
295+
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.
296296

297-
### Verify pods
297+
### Verify the pods
298298

299-
The following command can be used to see the pods running the servers:
299+
Use the following command to see the pods running the servers:
300300

301301
```
302302
kubectl get pods -n NAMESPACE
@@ -312,9 +312,9 @@ domain1-managed-server1 1/1 Running 0 8m
312312
domain1-managed-server2 1/1 Running 0 8m
313313
```
314314

315-
### Verify services
315+
### Verify the services
316316

317-
The following command can be used to see the services for the domain:
317+
Use the following command to see the services for the domain:
318318

319319
```
320320
kubectl get services -n NAMESPACE
@@ -331,9 +331,9 @@ domain1-managed-server1 ClusterIP None <none>
331331
domain1-managed-server2 ClusterIP None <none> 8001/TCP 22m
332332
```
333333

334-
## Delete domain
334+
## Delete the domain
335335

336-
Th generated YAML file in the `/path/to/weblogic-operator-output-directory/weblogic-domains/<domainUID>` directory can also be used to delete the Kubernetes resource. The following command can be used to delete domain:
336+
The generated YAML file in the `/path/to/weblogic-operator-output-directory/weblogic-domains/<domainUID>` directory can be used to delete the Kubernetes resource. Use the following command to delete the domain:
337337

338338
```
339339
$ kubectl delete -f domain.yaml

0 commit comments

Comments
 (0)