Skip to content

Commit d4e643e

Browse files
committed
Merge branch 'develop' into owls-69919-domain-resource-properties
2 parents 1c489a8 + e28aef7 commit d4e643e

File tree

9 files changed

+368
-239
lines changed

9 files changed

+368
-239
lines changed

README.md

Lines changed: 77 additions & 136 deletions
Large diffs are not rendered by default.

kubernetes/samples/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Sample scripts
44

5-
* [Sample Secret for WebLogic Amin Credentials](scripts/create-weblogic-domain/create-weblogic-credentials.sh) for creating a Kubernetes secret that contains the admin server credentials. This secret can then be used in creating a WebLogic domain custom resource.
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.
66
* [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.
77
* [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.
88
* [Sample Elasticsearch and Kibana configuration](scripts/elasticsearch_and_kibana.yaml) for configuring the Elasticsearch and Kibana deployments and services for the operator's logs.

kubernetes/samples/charts/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ The Oracle WebLogic Server Kubernetes Operator supports three load balancers: TR
66

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

Lines changed: 48 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,43 @@
1-
# Apache Load Balancer custom sample
2-
In this sample, we will configure Apache webtier as a load balancer for multiple WebLogic domains using custom configuration. We will demonstrate how to use Apache webtier to handle traffic to the multiple backend WebLogic domains.
1+
# Apache load balancer custom sample
2+
In this sample, we will configure the Apache webtier as a load balancer for multiple WebLogic domains using a custom configuration. We will demonstrate how to use the Apache webtier to handle traffic to multiple backend WebLogic domains.
33

4-
## 1. Create Namespace
5-
In this sample, both Apache webtier and WebLogic domain instances are located in the namespace `apache-sample`.
4+
## 1. Create a namespace
5+
In this sample, both the Apache webtier and WebLogic domain instances are located in the namespace `apache-sample`.
66
```
77
$ kubectl create namespace apache-sample
88
```
99

10-
## 2. Create WebLogic Domains
11-
Now we need to prepare some backends for Apache webtier to do load balancing. Please refer the sample https://github.com/oracle/weblogic-kubernetes-operator/tree/develop/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv to create two WebLogic domains under the namespace `apache-sample`.
10+
## 2. Create WebLogic domains
11+
We need to prepare some backend domains for load balancing by the Apache webtier. Refer to the sample, https://github.com/oracle/weblogic-kubernetes-operator/tree/develop/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv, to create two WebLogic domains under the namespace `apache-sample`.
1212

1313
The first domain uses the following custom configuration parameters:
14-
- namespace: apache-sample
15-
- domainUID: domain1
16-
- clusterName: cluster-1
17-
- adminServerName: admin-server
18-
- adminPort: 7001
19-
- adminNodePort: 30701
20-
- managedServerPort: 8001
14+
- namespace: `apache-sample`
15+
- domainUID: `domain1`
16+
- clusterName: `cluster-1`
17+
- adminServerName: `admin-server`
18+
- adminPort: `7001`
19+
- adminNodePort: `30701`
20+
- managedServerPort: `8001`
2121

2222
The second domain uses the following custom configuration parameters:
23-
- namespace: apache-sample
24-
- domainUID: domain2
25-
- clusterName: cluster-1
26-
- adminServerName: admin-server
27-
- adminPort: 7011
28-
- adminNodePort: 30702
29-
- managedServerPort: 8021
23+
- namespace: `apache-sample`
24+
- domainUID: `domain2`
25+
- clusterName: `cluster-1`
26+
- adminServerName: `admin-server`
27+
- adminPort: `7011`
28+
- adminNodePort: `30702`
29+
- managedServerPort: `8021`
3030

31-
After the domains are successfully created, deploy the sample web application testwebapp.war on each domain cluster through the admin console. The sample web application is located in the kubernetes/samples/charts/application directory.
31+
After the domains are successfully created, deploy the sample web application, `testwebapp.war`, on each domain cluster using the WLS Administration Console. The sample web application is located in the `kubernetes/samples/charts/application` directory.
3232

33-
## 3. Build Apache Webtier Docker Image
34-
Please refer the sample https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-webtier-apache to build Apache webtier docker image.
33+
## 3. Build the Apache webtier Docker image
34+
Refer to the sample, https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-webtier-apache, to build the Apache webtier Docker image.
35+
36+
## 4. Provide the custom Apache plugin configuration
37+
In this sample, we will provide a custom Apache plugin configuration to fine tune the behavior of Apache.
38+
39+
* Create a custom Apache plugin configuration file named `custom_mod_wl_apache.conf`. The file content is similar to below.
3540

36-
## 4. Provide Custom Apache Plugin Configuration
37-
In this sample we will provide custom Apache plugin configuration to fine tune the behavior of Apache.
38-
- Create a custom Apache plugin configuration file named `custom_mod_wl_apache.conf`. The file content is similar as below.
3941
```
4042
# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
4143
#
@@ -55,9 +57,9 @@ WebLogicPort ${WEBLOGIC_PORT}
5557
</Location>
5658
5759
# Directive for all application deployed on weblogic cluster with a prepath defined by LOCATION variable
58-
# For example, if the LOCAITON is set to '/weblogic', all applications deployed on the cluster can be accessed via
60+
# For example, if the LOCAITON is set to '/weblogic', all applications deployed on the cluster can be accessed via
5961
# http://myhost:myport/weblogic/application_end_url
60-
# where 'myhost' is the IP of the machine that runs the Apache web tier, and
62+
# where 'myhost' is the IP of the machine that runs the Apache web tier, and
6163
# 'myport' is the port that the Apache web tier is publicly exposed to.
6264
# Note that LOCATION cannot be set to '/' unless this is the only Location module configured.
6365
<Location /weblogic1>
@@ -77,10 +79,12 @@ WebLogicCluster domain2-cluster-cluster-1:8021
7779
PathTrim /weblogic2
7880
</Location>
7981
```
80-
- Place the `custom_mod_wl_apache.conf` file in a local directory `<host-config-dir>` on the host machine.
8182

82-
## 5. Prepare Your Own Certificate and Private Key
83-
In production, Oracle strongly recommends that you provide your own certificates. Run following commands to to generate your own certificate and private key using openssl.
83+
* Place the `custom_mod_wl_apache.conf` file in a local directory `<host-config-dir>` on the host machine.
84+
85+
## 5. Prepare your own certificate and private key
86+
In production, Oracle strongly recommends that you provide your own certificates. Run the following commands to generate your own certificate and private key using `openssl`.
87+
8488
```
8589
$ cd kubernetes/samples/charts/apache-samples/custom-sample
8690
$ export VIRTUAL_HOST_NAME=apache-sample-host
@@ -89,20 +93,22 @@ $ export SSL_CERT_KEY_FILE=apache-sample.key
8993
$ sh certgen.sh
9094
```
9195

92-
## 6. Prepare the Input Values for Apache Webtier Helm Chart
93-
Run following commands to prepare the input value file for Apache webtier helm chart.
96+
## 6. Prepare the input values for the Apache webtier Helm chart
97+
Run the following commands to prepare the input value file for the Apache webtier Helm chart.
98+
9499
```
95100
$ base64 -i ${SSL_CERT_FILE} | tr -d '\n'
96101
$ base64 -i ${SSL_CERT_KEY_FILE} | tr -d '\n'
97102
$ touch input.yaml
98103
```
99-
Edit the input parameters file `input.yaml`, the file content is similar as below.
104+
Edit the input parameters file, `input.yaml`. The file content is similar to below.
105+
100106
```
101107
# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
102108
#
103109
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
104110
105-
# Use this to provide your own Apache webtier configuration as needed; simply define this
111+
# Use this to provide your own Apache webtier configuration as needed; simply define this
106112
# path and put your own custom_mod_wl_apache.conf file under this path.
107113
volumePath: <host-config-dir>
108114
@@ -120,26 +126,27 @@ customCert: <cert_data>
120126
customKey: <key_data>
121127
```
122128

123-
## 7. Install Apache Webtier Helm Chart
124-
Apache webtier helm chart is located in kubernetes/samples/charts/apache-webtier directory. Install Apache webtier helm chart to apache-sample namespace with specified input parameters:
129+
## 7. Install the Apache webtier Helm chart
130+
The Apache webtier Helm chart is located in the `kubernetes/samples/charts/apache-webtier` directory. Install the Apache webtier Helm chart to the `apache-sample` namespace with the specified input parameters:
131+
125132
```
126133
$ cd kubernetes/samples/charts
127134
$ helm install --name my-release --values apache-samples/custom-sample/input.yaml --namespace apache-sample apache-webtier
128135
```
129136

130-
## 8. Run the Sample Application
131-
Now you can send requests to different WebLogic domains with the unique entry point of Apache with different path. Alternatively, you can access the URLs in a web browser.
137+
## 8. Run the sample application
138+
Now you can send requests to different WebLogic domains with the unique entry point of Apache with different paths. Alternatively, you can access the URLs in a web browser.
132139
```
133140
$ curl --silent http://${HOSTNAME}:30305/weblogic1/testwebapp/
134141
$ curl --silent http://${HOSTNAME}:30305/weblogic2/testwebapp/
135142
```
136-
You can also use SSL URLs to send requests to different WebLogic domains. Access the SSL URL via the curl command or a web browser.
143+
Also, you can use SSL URLs to send requests to different WebLogic domains. Access the SSL URL via the `curl` command or a web browser.
137144
```
138145
$ curl -k --silent https://${HOSTNAME}:30443/weblogic1/testwebapp/
139146
$ curl -k --silent https://${HOSTNAME}:30443/weblogic2/testwebapp/
140147
```
141148

142-
## 9. Uninstall Apache Webtier
149+
## 9. Uninstall the Apache webtier
143150
```
144151
$ helm delete --purge my-release
145152
```
Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
# Apache Load Balancer default sample
2-
In this sample, we will configure Apache webtier as a load balancer for WebLogic domain using the default configuration. We will demonstrate how to use Apache webtier to handle traffic to the backend WebLogic domain.
1+
# Apache load balancer default sample
2+
In this sample, we will configure the Apache webtier as a load balancer for a WebLogic domain using the default configuration. We will demonstrate how to use the Apache webtier to handle traffic to a backend WebLogic domain.
33

4-
## 1. Create WebLogic Domain
5-
Now we need to prepare backend for Apache webtier to do load balancing. Please refer the sample https://github.com/oracle/weblogic-kubernetes-operator/tree/develop/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv to create a WebLogic domain. Keep the default values for the following configuration parameters:
6-
- namespace: default
7-
- domainUID: domain1
8-
- clusterName: cluster-1
9-
- adminServerName: admin-server
10-
- adminPort: 7001
11-
- managedServerPort: 8001
4+
## 1. Create a WebLogic domain
5+
We need to prepare a backend domain for load balancing by the Apache webtier. Refer to the sample, https://github.com/oracle/weblogic-kubernetes-operator/tree/develop/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv, to create a WebLogic domain. Keep the default values for the following configuration parameters:
6+
- namespace: `default`
7+
- domainUID: `domain1`
8+
- clusterName: `cluster-1`
9+
- adminServerName: `admin-server`
10+
- adminPort: `7001`
11+
- managedServerPort: `8001`
1212

13-
After the domain is successfully created, deploy the sample web application testwebapp.war on the domain cluster through the admin console. The sample web application is located in the kubernetes/samples/charts/application directory.
13+
After the domain is successfully created, deploy the sample web application, `testwebapp.war`, on the domain cluster using the WLS Administration Console. The sample web application is located in the `kubernetes/samples/charts/application` directory.
1414

15-
## 2. Build Apache Webtier Docker Image
16-
Please refer the sample https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-webtier-apache to build Apache webtier docker image.
15+
## 2. Build the Apache webtier Docker image
16+
Refer to the sample, https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-webtier-apache, to build the Apache webtier Docker image.
1717

18-
## 3. Install Apache Webtier with Helm Chart
19-
Apache webtier helm chart is located at https://github.com/oracle/weblogic-kubernetes-operator/blob/develop/kubernetes/samples/charts/apache-webtier.
20-
Install Apache webtier helm chart to default namespace with default settings:
18+
## 3. Install the Apache webtier with a Helm chart
19+
The Apache webtier Helm chart is located at https://github.com/oracle/weblogic-kubernetes-operator/blob/develop/kubernetes/samples/charts/apache-webtier.
20+
Install the Apache webtier Helm chart into the default namespace with the default settings:
2121
```
2222
$ cd kubernetes/samples/charts
2323
$ helm install --name my-release apache-webtier
2424
```
2525

2626
## 4. Run the sample application
27-
Now you can send request to WebLogic domain with the unique entry point of Apache. Alternatively, you can access the URL in a web browser.
27+
Now you can send request to the WebLogic domain with the unique entry point of Apache. Alternatively, you can access the URL in a web browser.
2828
```
2929
$ curl --silent http://${HOSTNAME}:30305/weblogic/testwebapp/
3030
```
31-
You can also use SSL URL to send request to WebLogic domain. Access the SSL URL via the curl command or a web browser.
31+
You can also use an SSL URL to send requests to the WebLogic domain. Access the SSL URL via the `curl` command or a web browser.
3232
```
3333
$ curl -k --silent https://${HOSTNAME}:30443/weblogic/testwebapp/
3434
```
3535

36-
## 5. Uninstall Apache Webtier
36+
## 5. Uninstall the Apache webtier
3737
```
3838
$ helm delete --purge my-release
3939
```

0 commit comments

Comments
 (0)