openshift/openshift-docs
1
0
Fork 0
mirror of https://github.com/openshift/openshift-docs.git synced 2026-02-05 21:46:22 +01:00
Code Issues Releases Activity

4.0 to product-version

Browse Source
This commit is contained in:
Vikram Goyal
2019-04-17 16:54:11 -04:00
parent 604f17da0f
commit a95031fc3d
15 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/operators/olm-creating-apps-from-installed-operators.adoc
View File

@@ -6,6 +6,6 @@ include::modules/common-attributes.adoc[]
toc::[]
This guide walks developers through an example of creating applications from an
installed Operator using the {product-title} 4.0 web console.
installed Operator using the {product-title} {product-version} web console.
include::modules/olm-creating-etcd-cluster-from-operator.adoc[leveloffset=+1]

2
architecture/customizations.adoc
View File

@@ -31,7 +31,7 @@ Custom Resource Definitions (CRDs) that are deployed on your cluster.
|See
|Infrastructure
|In {product-title} 4.0, you cannot customize the infrastructure resource.
|In {product-title} {product-version}, you cannot customize the infrastructure resource.
|Ingress
|See

2
builds/custom-builds-buildah.adoc
View File

@@ -5,7 +5,7 @@ include::modules/common-attributes.adoc[]
toc::[]
With {product-title} 4.0, a Docker socket will not be present on the host
With {product-title} {product-version}, a Docker socket will not be present on the host
nodes. This means the _mount docker socket_ option of a custom build is not
guaranteed to provide an accessible Docker socket for use within a custom build
image.

2
contributing_to_docs/doc_guidelines.adoc
View File

@@ -2,7 +2,7 @@
= Documentation guidelines
include::modules/common-attributes.adoc
The documentation guidelines for OpenShift 4.0 build on top of the
The documentation guidelines for OpenShift 4 build on top of the
link:https://redhat-documentation.github.io/modular-docs/[Red Hat modular docs reference guide].
== Assembly file metadata

2
modules/available-persistent-storage-options.adoc
View File

@@ -36,5 +36,5 @@ a| * Accessible through a REST API endpoint
[IMPORTANT]
====
Currently, CNS is not supported in {product-title} 4.0.
Currently, CNS is not supported in {product-title} {product-version}.
====

2
modules/building-memcached-operator-using-osdk.adoc
View File

@@ -18,7 +18,7 @@ using tools and libraries provided by the SDK.
- Operator SDK CLI installed on the development workstation
- Operator Lifecycle Manager (OLM) installed on a Kubernetes-based cluster (v1.8
or above to support the `apps/v1beta2` API group), for example {product-title} 4.0
or above to support the `apps/v1beta2` API group), for example {product-title} {product-version}
- Access to the cluster using an account with `cluster-admin` permissions
- link:https://kubernetes.io/docs/tasks/tools/install-kubectl/[`kubectl`] v1.11.3+
(can alternatively use `oc`)

2
modules/installation-planning.adoc
View File

@@ -189,7 +189,7 @@ You can also install {product-title} to act as a stand-alone registry using the
[id="planning-installation-types-{context}"]
== Installation types for supported infrastructure
Starting in {product-title} 4.0, you can install the cluster on your own
Starting in {product-title} {product-version}, you can install the cluster on your own
infrastructure nodes or install a fully-managed cluster on certain cloud providers.
.Differences between installation types

2
modules/managing-memcached-operator-using-olm.adoc
View File

@@ -18,7 +18,7 @@ management functions without any additional tools.
.Prerequisites
- OLM installed on a Kubernetes-based cluster (v1.8 or above to support the
`apps/v1beta2` API group), for example {product-title} 4.0
`apps/v1beta2` API group), for example {product-title} {product-version}
Preview OLM enabled
- Memcached Operator built

2
modules/olm-creating-etcd-cluster-from-operator.adoc
View File

@@ -10,7 +10,7 @@ Operator, managed by the Operator Lifecycle Manager (OLM).
.Prerequisites
- Access to an {product-title} 4.0 cluster
- Access to an {product-title} {product-version} cluster
- etcd Operator already installed to the cluster by an administrator
.Procedure

4
modules/olm-operator-lifecycle-manager.adoc
View File

@@ -5,7 +5,7 @@
[id="olm-operator-lifecycle-manager-{context}"]
= Understanding the Operator Lifecycle Manager
In {product-title} 4.0, the _Operator Lifecycle Manager_ (OLM) helps users
In {product-title} {product-version}, the _Operator Lifecycle Manager_ (OLM) helps users
install, update, and manage the lifecycle of all Operators and their associated
services running across their clusters. It is part of the
link:https://github.com/operator-framework[Operator Framework],
@@ -15,7 +15,7 @@ an open source toolkit designed to manage Kubernetes native applications
.Operator Lifecycle Manager workflow
image::olm-workflow.png[]
The OLM runs by default in {product-title} 4.0, which aids cluster
The OLM runs by default in {product-title} {product-version}, which aids cluster
administrators in installing, upgrading, and granting access to Operators
running on their cluster. The {product-title} web console provides management
screens for cluster administrators to install Operators, as well as grant

2
modules/openshift-cluster-limits.adoc
View File

@@ -81,5 +81,5 @@ expensive and slow down processing given state changes.]
|===
In {product-title} 4.0, half of a CPU core (500 millicore) is now reserved by
In {product-title} {product-version}, half of a CPU core (500 millicore) is now reserved by
the system compared to {product-title} 3.11 and previous versions.

2
modules/osdk-building-ansible-operator.adoc
View File

@@ -12,7 +12,7 @@ the Operator SDK.
.Prerequisites
- Operator SDK CLI installed on the development workstation
- Access to a Kubernetes-based cluster v1.11.3+ (for example {product-title} 4.0)
- Access to a Kubernetes-based cluster v1.11.3+ (for example {product-title} {product-version})
using an account with `cluster-admin` permissions
- link:https://kubernetes.io/docs/tasks/tools/install-kubectl/[`kubectl`] v1.11.3+
(can alternatively use `oc`)

2
modules/osdk-building-helm-operator.adoc
View File

@@ -19,7 +19,7 @@ away from a Helm-based Operator.
.Prerequisites
- Operator SDK CLI installed on the development workstation
- Access to a Kubernetes-based cluster v1.11.3+ (for example {product-title} 4.0)
- Access to a Kubernetes-based cluster v1.11.3+ (for example {product-title} {product-version})
using an account with `cluster-admin` permissions
- link:https://kubernetes.io/docs/tasks/tools/install-kubectl/[`kubectl`] v1.11.3+
(can alternatively use `oc`)

2
modules/prometheus-database-storage-requirements.adoc
View File

@@ -64,7 +64,7 @@ OpenStack environment:
[IMPORTANT]
====
Currently, OpenStack environments are not supported for {product-title} 4.0.
Currently, OpenStack environments are not supported for {product-title} {product-version}.
====
*Recommendations for {product-title}*

12
welcome/index.adoc
View File

@@ -10,7 +10,7 @@ exploring its features.
[NOTE]
====
These are the WIP docs for the 4.0 version of {product-title} and are provided as
These are the WIP docs for the {product-version} version of {product-title} and are provided as
is for early access. The final version of these docs are likely to change. Please
check back often as we continue to update these docs.
====
@@ -21,15 +21,15 @@ How you approach {product-title} {product-version} documentation depends on your
* As a software developer, you might want to understand about the different forms of applications you can create and manage through OpenShift, such as Operators, S2i images, or service broker applications.
To navigate the {product-title} 4.0 documentation set, you can either use the left navigation bar to browse the documentation or go through the content of this Welcome page to follow links to different {product-title} activities.
To navigate the {product-title} {product-version} documentation set, you can either use the left navigation bar to browse the documentation or go through the content of this Welcome page to follow links to different {product-title} activities.
== Cluster Administrator Activities
As a cluster administrator, with tasks from deploying {product-title} 4.0 to managing the resulting cluster’s resources, this documentation will help you:
As a cluster administrator, with tasks from deploying {product-title} {product-version} to managing the resulting cluster’s resources, this documentation will help you:
- **xref:../architecture/architecture.adoc#architecture-overview-architecture[Understand {product-title}]**: Learn how {product-title} 4.0 employs a foundation of Kubernetes that is installed and maintained through multiple levels of Operators. See how OpenShift masters and workers are managed and updated through xref:../architecture/architecture.adoc#machine-api-overview-architecture[Machine API] and xref:../applications/operators/olm-what-operators-are.adoc#machine-api-overview-architecture[Operators].
- **xref:../architecture/architecture.adoc#architecture-overview-architecture[Understand {product-title}]**: Learn how {product-title} {product-version} employs a foundation of Kubernetes that is installed and maintained through multiple levels of Operators. See how OpenShift masters and workers are managed and updated through xref:../architecture/architecture.adoc#machine-api-overview-architecture[Machine API] and xref:../applications/operators/olm-what-operators-are.adoc#machine-api-overview-architecture[Operators].
- **xref:../installing/installing_aws/installing-aws-account.adoc[Choose a deployment platform]**: Amazon AWS is the first supported platform for {product-title} 4.0. However, you can expect support for other cloud and on-premise platforms to follow soon.
- **xref:../installing/installing_aws/installing-aws-account.adoc[Choose a deployment platform]**: Amazon AWS is the first supported platform for {product-title} {product-version}. However, you can expect support for other cloud and on-premise platforms to follow soon.
- **xref:../installing/installing_aws/installing-aws-account.adoc[Deploy {product-title}]**: Choose between an xref:../installing/installing_aws/installing-aws-default.adoc[AWS quick cluster install] or xref:../installing/installing_aws/installing-aws-customizations.adoc[AWS install with customizations].
@@ -61,7 +61,7 @@ Ultimately, OpenShift is a platform for developing and deploying containerized a
* **xref:../openshift_images/using-templates.adoc[Create templates]**: Use existing templates or create your own templates that describe how an application is built or deployed. A template can combine images with descriptions, parameters, replicas (how many pods are spun up at a time), exposed ports and other content that defines how an application can be run or built.
* **xref:../applications/operator_sdk/osdk-getting-started.adoc[Create operators]**: Operators are the preferred form for creating on-cluster applications for {product-title} 4.0. Learn the workflow for building, testing and deploying operators. Then create your own operators based on xref:../applications/operator_sdk/osdk-ansible.adoc[Ansible] or
* **xref:../applications/operator_sdk/osdk-getting-started.adoc[Create operators]**: Operators are the preferred form for creating on-cluster applications for {product-title} {product-version}. Learn the workflow for building, testing and deploying operators. Then create your own operators based on xref:../applications/operator_sdk/osdk-ansible.adoc[Ansible] or
xref:../applications/operator_sdk/osdk-helm.adoc[Helm], or configure xref:../applications/operator_sdk/osdk-monitoring-prometheus.adoc[built-in Prometheus monitoring] using the Operator SDK.
ifdef::openshift-enterprise,openshift-origin,openshift-dedicated[]