From 6acf22c6a4c42d4c6cf741a97965c2b0a584038f Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Mon, 12 Jul 2021 16:23:40 -0400 Subject: [PATCH 1/3] update versions --- .../staging/content/userguide/platforms/environments.md | 2 +- .../staging/content/userguide/prerequisites/introduction.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/staging/content/userguide/platforms/environments.md b/documentation/staging/content/userguide/platforms/environments.md index 2f62503408a..ff8b7b68914 100644 --- a/documentation/staging/content/userguide/platforms/environments.md +++ b/documentation/staging/content/userguide/platforms/environments.md @@ -23,7 +23,7 @@ Container Services for use with Kubernetes* on OCI Compute, and on "Authorized C [Oracle Linux Cloud Native Environment](https://docs.oracle.com/en/operating-systems/olcne/) is a fully integrated suite for the development and management of cloud-native applications. Based on Open Container Initiative (OCI) and Cloud Native Computing Foundation (CNCF) standards, Oracle Linux Cloud Native Environment delivers a simplified framework for installations, updates, upgrades, and configuration of key features for orchestrating microservices. -WebLogic Server and the WebLogic Kubernetes Operator are certified and supported on Oracle Linux Cloud Native Environment. Operator 2.6.0 provides certified support of OLCNE 1.1 with Kubernetes 1.17.0. +WebLogic Server and the WebLogic Kubernetes Operator are certified and supported on Oracle Linux Cloud Native Environment. Operator 3.2.5 provides certified support of OLCNE 1.3 with Kubernetes 1.2.0 and CRI-O 1.20.2. ### Microsoft Azure Kubernetes Service diff --git a/documentation/staging/content/userguide/prerequisites/introduction.md b/documentation/staging/content/userguide/prerequisites/introduction.md index 4f786f3082f..edcf3c20834 100644 --- a/documentation/staging/content/userguide/prerequisites/introduction.md +++ b/documentation/staging/content/userguide/prerequisites/introduction.md @@ -7,10 +7,10 @@ weight: 2 For the current production release 3.2.5: -* Kubernetes 1.16.15+, 1.17.13+, 1.18.10+, and 1.19.7+ (check with `kubectl version`). +* Kubernetes 1.16.15+, 1.17.13+, 1.18.10+, and 1.19.7+, 1.2.0+ (check with `kubectl version`). * Flannel networking v0.9.1-amd64 or later (check with `docker images | grep flannel`), Calico networking v3.16.1 or later, *or* OpenShift SDN on OpenShift 4.3 systems. -* Docker 18.9.1 or 19.03.1+ (check with `docker version`) *or* CRI-O 1.14.7+ (check with `crictl version | grep RuntimeVersion`). +* Docker 18.9.1 or 19.03.1+ (check with `docker version`) *or* CRI-O 1.20.2+ (check with `crictl version | grep RuntimeVersion`). * Helm 3.3.4+ (check with `helm version --client --short`). * For domain home source type `Model in Image`, WebLogic Deploy Tooling 1.9.11. * 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. From 26e831191520b34f65bf626207785ff10973bc15 Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Tue, 13 Jul 2021 07:37:10 -0400 Subject: [PATCH 2/3] incorporate fixes --- .../staging/content/userguide/platforms/environments.md | 4 +++- .../staging/content/userguide/prerequisites/introduction.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/documentation/staging/content/userguide/platforms/environments.md b/documentation/staging/content/userguide/platforms/environments.md index ff8b7b68914..1a28fdd51a0 100644 --- a/documentation/staging/content/userguide/platforms/environments.md +++ b/documentation/staging/content/userguide/platforms/environments.md @@ -23,7 +23,9 @@ Container Services for use with Kubernetes* on OCI Compute, and on "Authorized C [Oracle Linux Cloud Native Environment](https://docs.oracle.com/en/operating-systems/olcne/) is a fully integrated suite for the development and management of cloud-native applications. Based on Open Container Initiative (OCI) and Cloud Native Computing Foundation (CNCF) standards, Oracle Linux Cloud Native Environment delivers a simplified framework for installations, updates, upgrades, and configuration of key features for orchestrating microservices. -WebLogic Server and the WebLogic Kubernetes Operator are certified and supported on Oracle Linux Cloud Native Environment. Operator 3.2.5 provides certified support of OLCNE 1.3 with Kubernetes 1.2.0 and CRI-O 1.20.2. +WebLogic Server and the WebLogic Kubernetes Operator are certified and supported on Oracle Linux Cloud Native Environment: +- Operator v2.6.0 is certified on OLCNE 1.1 and v3.2.5 is certified on OLCNE 1.3. +- Operator v3.2.5 provides certified support of OLCNE 1.3 with Kubernetes 1.20.6 and CRI-O 1.20.6. ### Microsoft Azure Kubernetes Service diff --git a/documentation/staging/content/userguide/prerequisites/introduction.md b/documentation/staging/content/userguide/prerequisites/introduction.md index edcf3c20834..9c2794be03e 100644 --- a/documentation/staging/content/userguide/prerequisites/introduction.md +++ b/documentation/staging/content/userguide/prerequisites/introduction.md @@ -7,7 +7,7 @@ weight: 2 For the current production release 3.2.5: -* Kubernetes 1.16.15+, 1.17.13+, 1.18.10+, and 1.19.7+, 1.2.0+ (check with `kubectl version`). +* Kubernetes 1.16.15+, 1.17.13+, 1.18.10+, and 1.19.7+, 1.20.6+ (check with `kubectl version`). * Flannel networking v0.9.1-amd64 or later (check with `docker images | grep flannel`), Calico networking v3.16.1 or later, *or* OpenShift SDN on OpenShift 4.3 systems. * Docker 18.9.1 or 19.03.1+ (check with `docker version`) *or* CRI-O 1.20.2+ (check with `crictl version | grep RuntimeVersion`). From a02b5326aba094a767db9ea6b4a28d05599e1f77 Mon Sep 17 00:00:00 2001 From: Rosemary Marano Date: Tue, 13 Jul 2021 10:12:17 -0400 Subject: [PATCH 3/3] more fixes --- .../staging/content/userguide/prerequisites/introduction.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/staging/content/userguide/prerequisites/introduction.md b/documentation/staging/content/userguide/prerequisites/introduction.md index 9c2794be03e..3bb39edd859 100644 --- a/documentation/staging/content/userguide/prerequisites/introduction.md +++ b/documentation/staging/content/userguide/prerequisites/introduction.md @@ -7,10 +7,10 @@ weight: 2 For the current production release 3.2.5: -* Kubernetes 1.16.15+, 1.17.13+, 1.18.10+, and 1.19.7+, 1.20.6+ (check with `kubectl version`). +* Kubernetes 1.16.15+, 1.17.13+, 1.18.10+, 1.19.7+, and 1.20.6+ (check with `kubectl version`). * Flannel networking v0.9.1-amd64 or later (check with `docker images | grep flannel`), Calico networking v3.16.1 or later, *or* OpenShift SDN on OpenShift 4.3 systems. -* Docker 18.9.1 or 19.03.1+ (check with `docker version`) *or* CRI-O 1.20.2+ (check with `crictl version | grep RuntimeVersion`). +* Docker 18.9.1 or 19.03.1+ (check with `docker version`) *or* CRI-O 1.20.6+ (check with `crictl version | grep RuntimeVersion`). * Helm 3.3.4+ (check with `helm version --client --short`). * For domain home source type `Model in Image`, WebLogic Deploy Tooling 1.9.11. * 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.