Skip to content

Commit d23fbf4

Browse files
committed
Merge branch '2.0-rc1-final-doc-review' into develop
2 parents 346b3ef + 962b926 commit d23fbf4

File tree

27 files changed

+163
-209
lines changed

27 files changed

+163
-209
lines changed

README.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,24 @@ Oracle is finding ways for organizations using WebLogic Server to run important
2020

2121
The fastest way to experience the operator is to follow the [Quick start guide](site/quickstart.md), or you can peruse our [documentation](site), read our [blogs](https://blogs.oracle.com/weblogicserver/how-to-weblogic-server-on-kubernetes), or try out the [samples](kubernetes/samples/README.md).
2222

23+
```diff
24+
+ The current release of the operator is 2.0-rc1, a release candidate for our 2.0 release.
25+
+ This release candidate was published on Dec 20, 2018.
26+
+ We expect to publish the final 2.0 release in January 2019.
27+
+ We expect that there will be some minor changes to documentation and samples in the final 2.0 release,
28+
+ however, this release candidate is suitable for testing and early adopters.
29+
```
30+
31+
# Backward Compatibility Guidelines
32+
33+
The 2.0 release introduces some breaking changes and does not maintain compatibility with previous releases.
34+
35+
Starting with the 2.0 release, future operator releases are intended to be backwards-compatible with respect to the Domain
36+
resource schema, operator Helm chart input values, configuration overrides template, Kubernetes resources created
37+
by the operator Helm chart, Kubernetes resources created by the operator, and the operator REST interface. We intend to
38+
maintain compatibility for three releases, excepting a clearly communicated deprecated feature, which will be
39+
maintained for one release after a replacement is available.
40+
2341
# About this documentation
2442

2543
This documentation includes sections aimed at different audiences. To help you find what you are looking for more easily,

kubernetes/samples/charts/apache-samples/custom-sample/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $ kubectl create namespace apache-sample
88
```
99

1010
## 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`.
11+
We need to prepare some backend domains for load balancing by the Apache webtier. Refer to the [sample](/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/README.md), to create two WebLogic domains under the namespace `apache-sample`.
1212

1313
The first domain uses the following custom configuration parameters:
1414
- namespace: `apache-sample`
@@ -31,7 +31,7 @@ The second domain uses the following custom configuration parameters:
3131
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

3333
## 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.
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.
3535

3636
## 4. Provide the custom Apache plugin configuration
3737
In this sample, we will provide a custom Apache plugin configuration to fine tune the behavior of Apache.

kubernetes/samples/charts/apache-samples/default-sample/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
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

44
## 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:
5+
We need to prepare a backend domain for load balancing by the Apache webtier. Refer to the [sample](/kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/README.md), to create a WebLogic domain. Keep the default values for the following configuration parameters:
66
- namespace: `default`
77
- domainUID: `domain1`
88
- clusterName: `cluster-1`
@@ -13,10 +13,10 @@ We need to prepare a backend domain for load balancing by the Apache webtier. Re
1313
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

1515
## 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.
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

1818
## 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.
19+
The Apache webtier Helm chart [is located here](kubernetes/samples/charts/apache-webtier).
2020
Install the Apache webtier Helm chart into the default namespace with the default settings:
2121
```
2222
$ cd kubernetes/samples/charts

kubernetes/samples/charts/apache-webtier/README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@ The chart depends on the Docker image for the Apache HTTP Server with the 12.2.1
66

77
## Prerequisites
88

9-
- Kubernetes 1.8+
10-
11-
```console
12-
$ docker pull wlsldi-v2.docker.oraclecorp.com/weblogic-webtier-apache-12.2.1.3.0:latest
13-
$ docker tag wlsldi-v2.docker.oraclecorp.com/weblogic-webtier-apache-12.2.1.3.0:latest store/oracle/apache:12.2.1.3
14-
```
9+
You will need to build a Docker image with the Apache webtier in it using the sample provided [here](https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-webtier-apache)
10+
in order to use this load balancer.
1511

1612
## Installing the Chart
1713
To install the chart with the release name `my-release`:

kubernetes/samples/charts/traefik/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ The chart is in the default repository for Helm.
1313

1414
To install the Traefik operator in the `traefik` namespace with default settings:
1515
```
16-
helm install --name traefik-operator --namespace traefik stable/traefik
16+
$ helm install --name traefik-operator --namespace traefik stable/traefik
1717
```
1818
Or, with a given `values.yaml`:
1919
```
20-
helm install --name traefik-operator --namespace traefik --values values.yaml stable/traefik
20+
$ helm install --name traefik-operator --namespace traefik --values values.yaml stable/traefik
2121
```
2222
With the dashboard enabled, you can access the Traefik dashboard with the URL `http://${HOSTNAME}:30305`, with the HTTP host `traefik.example.com`.
2323
```
24-
curl -H 'host: traefik.example.com' http://${HOSTNAME}:30305/
24+
$ curl -H 'host: traefik.example.com' http://${HOSTNAME}:30305/
2525
```
2626

2727
## Optionally, download the Traefik Helm chart
@@ -94,7 +94,7 @@ $ curl -k -H 'host: domain2.org' https://${HOSTNAME}:30443/testwebapp/
9494
## Uninstall the Traefik operator
9595
After removing all the Ingress resources, uninstall the Traefik operator:
9696
```
97-
helm delete --purge traefik-operator
97+
$ helm delete --purge traefik-operator
9898
```
9999
## Install and uninstall the Traefik operator with setup.sh
100100
Alternatively, you can run the helper script `setup.sh`, under the `kubernetes/samples/charts/util` folder, to install and uninstall Traefik.

kubernetes/samples/charts/voyager/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ $ curl -k -H 'host: domain2.org' https://${HOSTNAME}:30307/testwebapp/
103103
## Uninstall the Voyager Operator
104104
After removing all the Voyager Ingress resources, uninstall the Voyager operator:
105105
```
106-
helm delete --purge voyager-operator
106+
$ helm delete --purge voyager-operator
107107
```
108108

109109
## Install and uninstall the Voyager operator with setup.sh

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ Prior to running the `create-pv-pvc.sh` script, make a copy of the `create-pv-pv
1616
Run the create script, pointing it at your inputs file and an output directory:
1717

1818
```
19-
./create-pv-pvc.sh \
19+
$ ./create-pv-pvc.sh \
2020
-i create-pv-pvc-inputs.yaml \
2121
-o /path/to/output-directory
2222
```
2323

24-
The `create-pv-pvc.sh` script will create a subdirectory `pv-pvcs` under the given `/path/to/output-directory` directory. By default, the script generates two YAML files, namely `weblogic-sample-pv.yaml` and `weblogic-sample-pvc.yaml`, in the `/path/to/output-directory` `directory/pv-pvcs`. These two YAML files can be used to create the Kubernetes resources using the `kubectl create -f` command.
24+
The `create-pv-pvc.sh` script will create a subdirectory `pv-pvcs` under the given `/path/to/output-directory` directory. By default, the script generates two YAML files, namely `weblogic-sample-pv.yaml` and `weblogic-sample-pvc.yaml`, in the `/path/to/output-directory/pv-pvcs`. These two YAML files can be used to create the Kubernetes resources using the `kubectl create -f` command.
2525

2626
```
27-
kubectl create -f weblogic-sample-pv.yaml
28-
kubectl create -f weblogic-sample-pvc.yaml
27+
$ kubectl create -f weblogic-sample-pv.yaml
28+
$ kubectl create -f weblogic-sample-pvc.yaml
2929
3030
```
3131

@@ -173,6 +173,9 @@ spec:
173173

174174
### Verify the PV and PVC objects
175175

176+
You can use this command to verify the persistent volume was created, note that the `Status` field
177+
should have the value `Bound`, indicating the that persistent volume has been claimed:
178+
176179
```
177180
$ kubectl describe pv weblogic-sample-pv
178181
Name: weblogic-sample-pv
@@ -193,6 +196,8 @@ Events: <none>
193196
194197
```
195198

199+
You can use this command to verify the persistent volume claim was created:
200+
196201
```
197202
$ kubectl describe pvc weblogic-sample-pvc
198203
Name: weblogic-sample-pvc

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
@@ -16,7 +16,7 @@ The following prerequisites must be handled prior to running the create domain s
1616
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:
1717

1818
```
19-
./create-domain.sh \
19+
$ ./create-domain.sh \
2020
-u <username> \
2121
-p <password> \
2222
-i create-domain-inputs.yaml \
@@ -177,7 +177,7 @@ spec:
177177
To confirm that the domain was created, use this command:
178178

179179
```
180-
kubectl describe domain DOMAINUID -n NAMESPACE
180+
$ kubectl describe domain DOMAINUID -n NAMESPACE
181181
```
182182

183183
Replace `DOMAINUID` with the `domainUID` and `NAMESPACE` with the actual namespace.
@@ -312,7 +312,7 @@ In the `Status` section of the output, the available servers and clusters are li
312312
Use the following command to see the pods running the servers:
313313

314314
```
315-
kubectl get pods -n NAMESPACE
315+
$ kubectl get pods -n NAMESPACE
316316
```
317317

318318
Here is an example of the output of this command:
@@ -330,7 +330,7 @@ domain1-managed-server2 1/1 Running 0 29m
330330
Use the following command to see the services for the domain:
331331

332332
```
333-
kubectl get services -n NAMESPACE
333+
$ kubectl get services -n NAMESPACE
334334
```
335335

336336
Here is an example of the output of this command:

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Before you begin, read this guide, [Domain Resource](../../../../../site/domain-
88

99
The following prerequisites must be handled prior to running the create domain script:
1010
* Make sure the WebLogic operator is running.
11-
* The operator requires WebLogic Server 12.2.1.3.0 with patch 28076014 applied. Refer to [Weblogic docker images](../../../../../site/weblogic-docker-images.md) for details on how to create one.
11+
* The operator requires WebLogic Server 12.2.1.3.0 with patch 28076014 applied. Refer to [WebLogic docker images](../../../../../site/weblogic-docker-images.md) for details on how to create one.
1212
* Create a Kubernetes namespace for the domain unless the intention is to use the default namespace.
1313
* In the same Kubernetes namespace, create the Kubernetes persistent volume where the domain home will be hosted, and the Kubernetes persistent volume claim for the domain. For samples to create a PV and PVC, see [Create sample PV and PVC](../../create-weblogic-domain-pv-pvc/README.md).
1414
* Create the Kubernetes secrets `username` and `password` of the admin account in the same Kubernetes namespace as the domain.
@@ -18,19 +18,19 @@ The following prerequisites must be handled prior to running the create domain s
1818
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:
1919

2020
```
21-
./create-domain.sh \
21+
$ ./create-domain.sh \
2222
-i create-domain-inputs.yaml \
2323
-o /path/to/output-directory
2424
```
2525

2626
The script will perform the following steps:
2727

28-
* Create a directory for the generated 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.
28+
* Create a directory for the generated 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 must be removed before using this script.
2929
* Create a Kubernetes job that will start up a utility WebLogic Server container and run offline WLST scripts, or WebLogic Deploy Tool (WDT) scripts, to create the domain on the shared storage.
3030
* Run and wait for the job to finish.
3131
* 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:
3232
```
33-
kubectl apply -f /path/to/output-directory/weblogic-domains/<domainUID>/domain.yaml
33+
$ kubectl apply -f /path/to/output-directory/weblogic-domains/<domainUID>/domain.yaml
3434
```
3535

3636
* Create a convenient utility script, `delete-domain-job.yaml`, to clean up the domain home created by the create script.
@@ -206,7 +206,7 @@ spec:
206206
To confirm that the domain was created, use this command:
207207

208208
```
209-
kubectl describe domain DOMAINUID -n NAMESPACE
209+
$ kubectl describe domain DOMAINUID -n NAMESPACE
210210
```
211211

212212
Replace `DOMAINUID` with the `domainUID` and `NAMESPACE` with the actual namespace.
@@ -321,7 +321,7 @@ In the `Status` section of the output, the available servers and clusters are li
321321
Use the following command to see the pods running the servers:
322322

323323
```
324-
kubectl get pods -n NAMESPACE
324+
$ kubectl get pods -n NAMESPACE
325325
```
326326

327327
Here is an example of the output of this command:
@@ -339,7 +339,7 @@ domain1-managed-server2 1/1 Running 0 8m
339339
Use the following command to see the services for the domain:
340340

341341
```
342-
kubectl get services -n NAMESPACE
342+
$ kubectl get services -n NAMESPACE
343343
```
344344

345345
Here is an example of the output of this command:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ have them configured.
1515

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

2020
To install ElasticSearch and Kibana, use:
2121
```
22-
kubectl apply -f kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml
22+
$ kubectl apply -f kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml
2323
```
2424

2525
To remove them, use:
2626
```
27-
kubectl delete -f kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml
27+
$ kubectl delete -f kubernetes/samples/scripts/elasticsearch-and-kibana/elasticsearch_and_kibana.yaml
2828
```

0 commit comments

Comments
 (0)