diff --git a/_attributes/common-attributes.adoc b/_attributes/common-attributes.adoc index 6a996fea665b..c574ca8ee636 100644 --- a/_attributes/common-attributes.adoc +++ b/_attributes/common-attributes.adoc @@ -9,6 +9,10 @@ :toc-title: :imagesdir: images :prewrap!: +:acs: Red Hat Advanced Cluster Security +:quay: Red Hat Quay +:rh-storage-essentials-first: Red Hat OpenShift Data Foundation Essentials +:rh-storage-data-foundation: Red Hat OpenShift Data Foundation :op-system-first: Red Hat Enterprise Linux CoreOS (RHCOS) :op-system: RHCOS :op-system-base: RHEL @@ -19,8 +23,7 @@ :cloud-redhat-com: Red Hat OpenShift Cluster Manager :rh-storage-first: Red Hat OpenShift Container Storage :rh-storage: OpenShift Container Storage -:rh-rhacm-first: Red Hat Advanced Cluster Management (RHACM) -:rh-rhacm: RHACM +:rh-rhacm: Red Hat Advanced Cluster Management :sandboxed-containers-first: OpenShift sandboxed containers :sandboxed-containers: Sandboxed Containers Operator :rh-virtualization-first: Red Hat Virtualization (RHV) @@ -33,9 +36,8 @@ :ocp: OpenShift Container Platform :olm-first: Operator Lifecycle Manager (OLM) :olm: OLM -:ocp-supported-version: 4.5 +:ocp-supported-version: 4.11 // Following variables are required for publishing using PV2 :product-title: OpenShift Platform Plus :product-version: .1 :product-title-short: OPP - diff --git a/architecture/opp-architecture.adoc b/architecture/opp-architecture.adoc index d799dccd2760..ca7976389331 100644 --- a/architecture/opp-architecture.adoc +++ b/architecture/opp-architecture.adoc @@ -1,10 +1,20 @@ [id="opp-architecture"] -= {product-title} architecture += {product-title} overview include::_attributes/common-attributes.adoc[] :context: opp-architecture toc::[] -Discover {product-title} architecture and concepts. +{product-title} is a single hybrid-cloud platform for enterprises. Use it to build, deploy, run, and manage intelligent applications securely across infrastructures. It is based on {op-system-base-full}, Kubernetes, and Red Hat {ocp}. It includes the following products: -include::modules/opp-architecture-overview.adoc[leveloffset=+1] \ No newline at end of file +* {rh-rhacm} for Kubernetes - Controls clusters and applications from a single console. +* {acs} for Kubernetes - Provides information about cluster security, visibility management, and security compliance. +* {quay} - Stores, builds, and deploys container images. +* {rh-storage-essentials-first} - Provides a permanent place to store data while clusters spin up and down across environments. + + +include::modules/opp-architecture-architecture.adoc[leveloffset=+1] +include::modules/opp-architecture-installation.adoc[leveloffset=+1] +include::modules/opp-architecture-relnotes.adoc[leveloffset=+1] +include::modules/opp-architecture-compatibility-matrix.adoc[leveloffset=+1] +include::modules/opp-architecture-support.adoc[leveloffset=+1] diff --git a/images/242_OpenShift_Plus_0422.png b/images/242_OpenShift_Plus_0422.png new file mode 100644 index 000000000000..1266b53b3194 Binary files /dev/null and b/images/242_OpenShift_Plus_0422.png differ diff --git a/modules/opp-architecture-architecture.adoc b/modules/opp-architecture-architecture.adoc new file mode 100644 index 000000000000..01cad9099641 --- /dev/null +++ b/modules/opp-architecture-architecture.adoc @@ -0,0 +1,48 @@ +// Module included in the following assemblies: +// +// * architecture/opp-architecture.adoc + +:_module-type: CONCEPT +[id="opp-architecture-architecture_{context}"] += {product-title} description and architecture + +{product-title} builds on the capabilities of {ocp} with the following features: + +* Multi-cluster security +* Complete management capabilities +* Integrated data management +* A global container registry + +{product-title} protects and manages applications across open hybrid cloud environments and application lifecycles. + +image::242_OpenShift_Plus_0422.png[] + +{product-title} supports these additional capabilities: + +* Platform services +** Service mesh, serverless +** Builds, CI/CD pipelines +** GitOps, Distributed tracing +** Log management +** Cost management +** Vulnerability management +** Compliance + +* Application services +** Languages and runtimes +** API management +** Integration +** Messaging +** Process automation + +* Data services +** Databases and cache +** Data ingest and preparation +** Data analytics +** AI/ML + +* Developer services +** Developer CLI/IDE +** Plug-ins and extensions +** Red Hat OpenShift Dev Spaces +** Red Hat OpenShift Local diff --git a/modules/opp-architecture-compatibility-matrix.adoc b/modules/opp-architecture-compatibility-matrix.adoc new file mode 100644 index 000000000000..a51bf1ce633d --- /dev/null +++ b/modules/opp-architecture-compatibility-matrix.adoc @@ -0,0 +1,22 @@ +// Module included in the following assemblies: +// +// * architecture/opp-architecture.adoc + +:_module-type: CONCEPT +[id="opp-architecture-compatibility-matrix_{context}"] += {product-title} product release compatibility matrix + +{product-title} is based on {ocp} {ocp-supported-version}. To find the verified release number for each {product-title} product, see the following information: + +[cols="1,1,1,1"] +|=== +|{rh-rhacm} +|{acs} +|{quay} +|{rh-storage-essentials-first} + +|2.6 +|3.72 +|3.7 +|4.11 +|=== diff --git a/modules/opp-architecture-installation.adoc b/modules/opp-architecture-installation.adoc new file mode 100644 index 000000000000..e18933e580b4 --- /dev/null +++ b/modules/opp-architecture-installation.adoc @@ -0,0 +1,15 @@ +// Module included in the following assemblies: +// +// * architecture/opp-architecture.adoc + +:_module-type: PROCEDURE +[id="opp-architecture-installation_{context}"] += Install {product-title} products + +To install {product-title}, you must install five products in a specific order. Install {ocp} first. Then, install {rh-rhacm}. It does not matter what order you install the remaining products: {quay}, {rh-storage-essentials-first}, and {acs}. See the following detailed installation information for each product: + +* {ocp} - link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.11/html/installing/installing-preparing#supported-installation-methods-for-different-platforms[Supported installation methods for different platforms] +* {rh-rhacm} - link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.0/html/install/installing[Installing {rh-rhacm}] +* {acs} - link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_security_for_kubernetes/3.71/html/installing/install-ocp-operator[Installing {acs} for Kubernetes by using an Operator] +* {rh-storage-essentials-first} - link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.11[Deploying {rh-storage-data-foundation}] +* {quay} - link:https://access.redhat.com/documentation/en-us/red_hat_quay/3/html/deploy_red_hat_quay_on_openshift_with_the_quay_operator/index[Deploy {quay} on OpenShift with the Quay Operator] diff --git a/modules/opp-architecture-overview.adoc b/modules/opp-architecture-overview.adoc deleted file mode 100644 index e10f25715546..000000000000 --- a/modules/opp-architecture-overview.adoc +++ /dev/null @@ -1,9 +0,0 @@ -// Module included in the following assemblies: -// -// * architecture/opp-architecture.adoc - -:_module-type: CONCEPT -[id="opp-architecture_{context}"] -= {product-title} architecture overview - -{product-title} has a complicated architecture system. \ No newline at end of file diff --git a/modules/opp-architecture-relnotes.adoc b/modules/opp-architecture-relnotes.adoc new file mode 100644 index 000000000000..8da88dfbc8ac --- /dev/null +++ b/modules/opp-architecture-relnotes.adoc @@ -0,0 +1,15 @@ +// Module included in the following assemblies: +// +// * architecture/opp-architecture.adoc + +:_module-type: CONCEPT +[id="opp-architecture-relnotes_{context}"] += {product-title} product release notes + +The release note information for each product is accessible from the following list: + +* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.11/html/release_notes/index[{ocp}] +* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.6/html/release_notes/red-hat-advanced-cluster-management-for-kubernetes-release-notes[{rh-rhacm} for Kubernetes] +* link:https://access.redhat.com/documentation/en-us/red_hat_quay/3.7/html/red_hat_quay_release_notes/index[{quay}] +* link:https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_security_for_kubernetes/3.72/html/release_notes/index[{acs} for Kubernetes] +* link:https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation/4.11/html/4.11_release_notes/index[{rh-storage-data-foundation}] diff --git a/modules/opp-architecture-support.adoc b/modules/opp-architecture-support.adoc new file mode 100644 index 000000000000..cfb0f1522fbb --- /dev/null +++ b/modules/opp-architecture-support.adoc @@ -0,0 +1,11 @@ +// Module included in the following assemblies: +// +// * architecture/opp-architecture.adoc + +:_module-type: CONCEPT +[id="opp-architecture-support_{context}"] += Get support for {product-title} + +Red Hat offers cluster administrator tools for gathering data, monitoring, and troubleshooting your cluster. + +If you need assistance with your {product-title} solution, log a case in the appropriate product using its entitlement name. See the link:https://access.redhat.com/support/cases/#/case/list?query=%20orderBy%20lastModifiedDate%20desc&p=1&size=10&searchType=basic[Red Hat customer support portal] to open a support case.