Skip to content

Commit 63620ef

Browse files
rjeberhardrjeberhard
committed
Merge remote-tracking branch 'origin/develop' into cluster-template
2 parents 3e09ecb + 0a0cd0d commit 63620ef

File tree

1,468 files changed

+588143
-2389
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,468 files changed

+588143
-2389
lines changed

‎docs-source/content/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Oracle is finding ways for organizations using WebLogic Server to run important
1717
The fastest way to experience the operator is to follow the [Quick Start guide]({{< relref "/quickstart/_index.md" >}}), or you can peruse our [documentation]({{< relref "/userguide/_index.md" >}}), read our [blogs](https://blogs.oracle.com/weblogicserver/updated-weblogic-kubernetes-support-with-operator-20), or try out the [samples]({{< relref "/samples/_index.md" >}}).
1818

1919
***
20-
The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.2.0.
21-
This release was published on June 6, 2019.
20+
The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.2.1.
21+
This release was published on June 20, 2019.
2222
***
2323

2424
#### Operator earlier versions

‎docs-source/content/quickstart/create-domain.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ weight: 6
1010

1111
```bash
1212
$ kubernetes/samples/scripts/create-weblogic-domain-credentials/create-weblogic-credentials.sh \
13-
-u weblogic -p welcome1 -n sample-domain1-ns -d sample-domain1
13+
-u <username> -p <password> -n sample-domain1-ns -d sample-domain1
1414
```
1515

1616
The sample will create a secret named `domainUID-weblogic-credentials` where the `domainUID` is replaced
@@ -35,7 +35,7 @@ If you set the `domainHomeImageBuildPath` property to `./docker-images/OracleWeb
3535

3636
```bash
3737
$ cd kubernetes/samples/scripts/create-weblogic-domain/domain-home-in-image
38-
$ ./create-domain.sh -i my-inputs.yaml -o /some/output/directory -u weblogic -p welcome1 -e
38+
$ ./create-domain.sh -i my-inputs.yaml -o /some/output/directory -u <username> -p <password> -e
3939
```
4040

4141
You need to provide the WebLogic administration user name and password in the `-u` and `-p` options

‎docs-source/content/recent-changes.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎docs-source/content/release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ draft: false
88

99
| Date | Version | Introduces backward incompatibilities | Change |
1010
| --- | --- | --- | --- |
11+
| June 20, 2019 | v2.2.1 | no | The operator now supports Kubernetes 1.14.0+. This release is primarily a bug fix release and resolves the following issues:<br><ul><li>Servers in domains, where the domain home is on a persistent volume, would sometimes fail to start. These failures would be during the introspection phase following a full domain shutdown. Now, the introspection script better handles the relevant error conditions.</li><li>The domain resource provides an option to <a href="https://github.com/oracle/weblogic-kubernetes-operator/blob/master/docs/domains/Domain.md#server-service">pre-create Kubernetes services</a> for WebLogic Servers that are not yet running so that the DNS addresses of these services are resolvable. These services are now created as non-headless so that they have an IP address.</li></ul>
1112
| June 6, 2019 | v2.2.0 | no | Added support for FMW Infrastructure domains. WebLogic Server instances are now gracefully shut down by default and shutdown options are configurable. Operator is now built and runs on JDK 11.
1213
| April 4, 2019 | v2.1 | no | Customers can add init and sidecar containers to generated pods.
1314
| March 4, 2019 | v2.0.1 | no | OpenShift support is now certified. Many bug fixes, including fixes for configuration overrides, cluster services, and domain status processing.

‎docs-source/content/samples/simple/credentials/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ that the domain will run in.
1717
To use the sample, run the command:
1818

1919
```
20-
$ ./create-weblogic-credentials.sh -u username -p password -d domainUID -n namespace -s secretName
20+
$ ./create-weblogic-credentials.sh -u <username> -p <password> -d domainUID -n namespace -s secretName
2121
```
2222

2323
The parameters are as follows:

‎docs-source/content/samples/simple/domains/domain-home-in-image/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ The following prerequisites must be handled prior to running the create domain s
2222
```
2323
$ cd ./kubernetes/samples/scripts/create-weblogic-domain-credentials
2424
$ create-weblogic-credentials.sh
25-
-u weblogic
26-
-p welcome1
25+
-u <username>
26+
-p <password>
2727
-d domain1
2828
-n default
2929
-s domain1-weblogic-credentials

‎docs-source/content/userguide/introduction/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Detailed instructions are available [here]({{< relref "/userguide/managing-opera
1616

1717
### Operator prerequisites
1818

19-
* Kubernetes 1.11.5+, 1.12.3+, and 1.13.0+ (check with `kubectl version`).
19+
* Kubernetes 1.11.5+, 1.12.3+, 1.13.0+, and 1.14.0+ (check with `kubectl version`).
2020
* Flannel networking v0.9.1-amd64 (check with `docker images | grep flannel`).
2121
* Docker 18.03.1.ce (check with `docker version`).
2222
* Helm 2.8.2+ (check with `helm version`).

‎docs-source/content/userguide/managing-domains/prepare.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ Perform these steps to prepare your Kubernetes cluster to run a WebLogic domain:
2424
```
2525
$ kubectl -n domain-namespace-1 \
2626
create secret generic domain1-weblogic-credentials \
27-
--from-literal=username=weblogic \
28-
--from-literal=password=welcome1
27+
--from-literal=username=username \
28+
--from-literal=password=password
2929
```
3030
3131
* Replace `domain-namespace-1` with the namespace that the domain will be in.
3232
* Replace `domain1-weblogic-credentials` with the name of the secret. The operator expects the secret name to be
3333
the `domainUID` followed by the literal string `-weblogic-credentials` and many of the samples assume this name.
34-
* Replace the string `weblogic` in the third line with the user name for the administrative user.
35-
* Replace the string `welcome1` in the fourth line with the password.
34+
* Replace the string `username` in the third line with the user name for the administrative user.
35+
* Replace the string `password` in the fourth line with the password.
3636
3737
1. Optionally, [create a PV & persistent volume claim (PVC)]({{< relref "/samples/simple/storage/_index.md" >}}) which can hold the domain home, logs, and application binaries.
3838
Even if you put your domain in a Docker image, you may want to put the logs on a persistent volume so that they are available after the pods terminate.

‎docs/2.2.1/404.html

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<!DOCTYPE html>
2+
<html lang="en" class="js csstransforms3d">
3+
4+
<head>
5+
<meta charset="utf-8"> <meta name="description" content="">
6+
7+
<link rel="icon" href="/weblogic-kubernetes-operator/images/favicon.png" type="image/png">
8+
9+
<title>404 Page not found</title>
10+
11+
12+
<link href="/weblogic-kubernetes-operator/css/nucleus.css?1561069276" rel="stylesheet">
13+
<link href="/weblogic-kubernetes-operator/css/fontawesome-all.min.css?1561069276" rel="stylesheet">
14+
<link href="/weblogic-kubernetes-operator/css/hybrid.css?1561069276" rel="stylesheet">
15+
<link href="/weblogic-kubernetes-operator/css/featherlight.min.css?1561069276" rel="stylesheet">
16+
<link href="/weblogic-kubernetes-operator/css/perfect-scrollbar.min.css?1561069276" rel="stylesheet">
17+
<link href="/weblogic-kubernetes-operator/css/horsey.css?1561069276" rel="stylesheet">
18+
<link href="/weblogic-kubernetes-operator/css/theme.css?1561069276" rel="stylesheet">
19+
<link href="/weblogic-kubernetes-operator/css/hugo-theme.css?1561069276" rel="stylesheet">
20+
21+
<style type="text/css">
22+
:root #header + #content > #left > #rlblock_left {
23+
display: none !important;
24+
}
25+
26+
p,
27+
li,
28+
ul {
29+
text-align: center
30+
}
31+
32+
ul {
33+
list-style-type: none;
34+
}
35+
</style>
36+
37+
</head>
38+
39+
<body>
40+
41+
<body class="" data-url="/">
42+
43+
<section id="body" style="margin-left:0px;">
44+
<div id="overlay"></div>
45+
<div id="chapter">
46+
<div id="body-inner">
47+
<h1>Error</h1>
48+
<p>
49+
</p>
50+
<p>Woops. Looks like this page doesn&#39;t exist ¯\_(ツ)_/¯.</p>
51+
<p></p>
52+
<p><a href='/weblogic-kubernetes-operator/'>Go to homepage</a></p>
53+
<p><img src='/weblogic-kubernetes-operator/images/gopher-404.jpg' style="width:50%" alt="Page not found!"></img></p>
54+
</div>
55+
</div>
56+
57+
</section>
58+
</body>
59+
60+
</html>

0 commit comments

Comments
 (0)