Skip to content

Commit 9bd7b4f

Browse files
committed
Review comments
1 parent 1c966bf commit 9bd7b4f

File tree

5 files changed

+3
-13
lines changed

5 files changed

+3
-13
lines changed

docs-source/content/recent-changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This document tracks recent changes to the operator, especially ones that introd
1010

1111
| Date | Version | Introduces backward incompatibilities | Change |
1212
| --- | --- | --- | --- |
13-
| TBD | v2.2 | no | TBD
13+
| TBD | v2.2 | no | Added support for FMW Infrastructure domains. WebLogic server instances are now gracefully shutdown by default and shutdown options are configurable. Operator is now built and runs on JDK 11.
1414
| April 4, 2019 | v2.1 | no | Customers can add init and sidecar containers to generated pods.
1515
| 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.
1616
| January 24, 2019 | v2.0 | yes; not compatible with 1.x releases, but is compatible with 2.0-rc2. | Final version numbers and documentation updates.

docs-source/content/release-notes.md

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

99
| Date | Version | Introduces backward incompatibilities | Change |
1010
| --- | --- | --- | --- |
11-
| TBD | v2.2 | no | Added support for FMW Infrastructure domains. If servers are manually shutdown, for example using the WLS Console, the operator will return them to the desired state specified in the domain custom resource. Operator is now built and runs on JDK 11.
11+
| TBD | v2.2 | no | Added support for FMW Infrastructure domains. WebLogic server instances are now gracefully shutdown by default and shutdown options are configurable. Operator is now built and runs on JDK 11.
1212
| April 4, 2019 | v2.1 | no | Customers can add init and sidecar containers to generated pods.
1313
| 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.
1414
| January 24, 2019 | v2.0 | yes; not compatible with 1.x releases, but is compatible with 2.0-rc2. | Final version numbers and documentation updates.

docs-source/content/userguide/managing-domains/domain-resource.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,3 @@ To confirm that the domain resource was created, use this command:
4141
```
4242
$ kubectl describe domain [domain name] -n [namespace]
4343
```
44-
45-
46-
47-

docs-source/content/userguide/managing-domains/fmw-infra/_index.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,12 @@ is provided that demonstrates how to create a Docker image with the necessary pa
6666
After downloading the patch from My Oracle Support, you can create the patched image
6767
by running the provided script:
6868

69-
TODO TODO TODO check with monica's sample to ensure this is correct TODO TODO TODO
70-
7169
```bash
7270
cd docker-images/OracleFMWInfrastructure/samples/12213-patch-fmw-for-k8s
7371
./buildDockerImage.sh
7472
```
7573

76-
This will produce an image named `TODO TODO TODO monica what is it called TODO TODO TODO`.
74+
This will produce an image named `oracle/fmw-infrastructure:12213-update-k8s`.
7775

7876
These sample will allow you to create a Docker image containing the FMW Infrastructure
7977
binaries and the necessary patch. You can use this image to run the Repository Creation Utility

operator/src/main/resources/scripts/livenessProbe.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,4 @@ if [ -f ${STATEFILE} ] && [ `grep -c "FAILED_NOT_RESTARTABLE" ${STATEFILE}` -eq
3434
trace "Error: WebLogic Server state is FAILED_NOT_RESTARTABLE."
3535
exit $RETVAL
3636
fi
37-
if [ -f ${STATEFILE} ] && [ `grep -c "SHUTDOWN" ${STATEFILE}` -eq 1 ]; then
38-
trace "Error: WebLogic Server state is SHUTDOWN."
39-
exit $RETVAL
40-
fi
4137
exit 0

0 commit comments

Comments
 (0)