Skip to content

Commit 3266e91

Browse files
authored
Merge pull request #1963 from oracle/rm/OWLS-84881
add Calico networking
2 parents d1c3b5b + 024fd58 commit 3266e91

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Detailed instructions are available [here]({{< relref "/userguide/managing-opera
1919
For the current production release 3.0.2:
2020

2121
* Kubernetes 1.14.8+, 1.15.7+, 1.16.0+, 1.17.0+, and 1.18.0+ (check with `kubectl version`).
22-
* Flannel networking v0.9.1-amd64 or later (check with `docker images | grep flannel`) *or* OpenShift SDN on OpenShift 4.3 systems.
22+
* Flannel networking v0.9.1-amd64 or later (check with `docker images | grep flannel`), Calico networking (Calico v3.16.1),
23+
*or* OpenShift SDN on OpenShift 4.3 systems.
2324
* Docker 18.9.1 or 19.03.1 (check with `docker version`) *or* CRI-O 1.14.7 (check with `crictl version | grep RuntimeVersion`).
2425
* Helm 3.1.3+ (check with `helm version --client --short`).
2526
* Either Oracle WebLogic Server 12.2.1.3.0 with patch 29135930, Oracle WebLogic Server 12.2.1.4.0, or Oracle WebLogic Server 14.1.1.0.0.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ In this release, SOA Suite domains are supported using the “domain on a persis
4646
#### Prerequisites for SOA Suite domains
4747

4848
* Kubernetes 1.13.5+, 1.14.3+ and 1.15.2+ (check with `kubectl version`).
49-
* Flannel networking v0.11.0-amd64 (check with `docker images | grep flannel`).
49+
* Flannel networking v0.11.0-amd64 (check with `docker images | grep flannel`) or Calico networking (Calico v3.16.1).
5050
* Docker 18.9.1 (check with `docker version`)
5151
* Helm 2.14.0+ (check with `helm version`).
5252
* Oracle Fusion Middleware Infrastructure 12.2.1.3.0 image with patch 29135930.

0 commit comments

Comments
 (0)