Skip to content

Commit ea4441a

Browse files
authored
Merge pull request #60977 from sheriff-rh/OSDOCS-6186
2 parents 9577287 + 3964c2b commit ea4441a

File tree

78 files changed

+249
-252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+249
-252
lines changed

authentication/assuming-an-aws-iam-role-for-a-service-account.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ include::modules/verifying-the-assumed-iam-role-in-your-pod.adoc[leveloffset=+2]
3737
* For more information about installing and using the AWS Boto3 SDK for Python, see the link:https://boto3.amazonaws.com/v1/documentation/api/latest/index.html[AWS Boto3 documentation].
3838

3939
ifdef::openshift-rosa,openshift-dedicated[]
40-
* For general information about webhook admission plugins for OpenShift, see link:https://docs.openshift.com/container-platform/4.13/architecture/admission-plug-ins.html#admission-webhooks-about_admission-plug-ins[Webhook admission plugins] in the OpenShift Container Platform documentation.
40+
* For general information about webhook admission plugins for OpenShift, see link:https://docs.openshift.com/container-platform/4.14/architecture/admission-plug-ins.html#admission-webhooks-about_admission-plug-ins[Webhook admission plugins] in the OpenShift Container Platform documentation.
4141
endif::openshift-rosa,openshift-dedicated[]

microshift_cli_ref/microshift-cli-tools-introduction.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ Commands for multi-node deployments, projects, and developer tooling are not sup
2626

2727
* xref:..//microshift_cli_ref/microshift-oc-cli-install.adoc#microshift-oc-cli-install[Installing the OpenShift CLI tool for MicroShift].
2828
29-
* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.13/html/cli_tools/openshift-cli-oc[Detailed description of the OpenShift CLI (oc)].
29+
* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.14/html/cli_tools/openshift-cli-oc[Detailed description of the OpenShift CLI (oc)].
3030
3131
* link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9[Red Hat Enterprise Linux (RHEL) documentation for specific use cases].

microshift_storage/understanding-persistent-storage-microshift.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ include::modules/storage-persistent-storage-overview.adoc[leveloffset=+1]
1313
[id="additional-resources_understanding-persistent-storage-microshift"]
1414
[role="_additional-resources"]
1515
.Additional resources
16-
* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.13/html/storage/understanding-persistent-storage#pv-access-modes_understanding-persistent-storage[Access modes for persistent storage]
16+
* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.14/html/storage/understanding-persistent-storage#pv-access-modes_understanding-persistent-storage[Access modes for persistent storage]
1717
1818
include::modules/storage-persistent-storage-lifecycle.adoc[leveloffset=+1]
1919

modules/about-developer-perspective.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ The *Developer* perspective provides workflows specific to developer use cases,
3131
You can use the *Topology* view to display applications, components, and workloads of your project. If you have no workloads in the project, the *Topology* view will show some links to create or import them. You can also use the *Quick Search* to import components directly.
3232

3333
.Additional Resources
34-
See link:https://docs.openshift.com/container-platform/4.13/applications/odc-viewing-application-composition-using-topology-view.html[Viewing application composition using the Topology] view for more information on using the *Topology* view in *Developer* perspective.
34+
See link:https://docs.openshift.com/container-platform/4.14/applications/odc-viewing-application-composition-using-topology-view.html[Viewing application composition using the Topology] view for more information on using the *Topology* view in *Developer* perspective.

modules/ai-adding-worker-nodes-to-cluster.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ $ curl -s "$API_URL/api/assisted-install/v2/infra-envs/$INFRA_ENV_ID" -H "Author
101101
.Example output
102102
[source,terminal]
103103
----
104-
https://api.openshift.com/api/assisted-images/images/41b91e72-c33e-42ee-b80f-b5c5bbf6431a?arch=x86_64&image_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NTYwMjYzNzEsInN1YiI6IjQxYjkxZTcyLWMzM2UtNDJlZS1iODBmLWI1YzViYmY2NDMxYSJ9.1EX_VGaMNejMhrAvVRBS7PDPIQtbOOc8LtG8OukE1a4&type=minimal-iso&version=4.13
104+
https://api.openshift.com/api/assisted-images/images/41b91e72-c33e-42ee-b80f-b5c5bbf6431a?arch=x86_64&image_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NTYwMjYzNzEsInN1YiI6IjQxYjkxZTcyLWMzM2UtNDJlZS1iODBmLWI1YzViYmY2NDMxYSJ9.1EX_VGaMNejMhrAvVRBS7PDPIQtbOOc8LtG8OukE1a4&type=minimal-iso&version=$VERSION
105105
----
106106

107107
. Download the ISO:

modules/architecture-machine-roles.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ The cluster also contains the definition for the `bootstrap` role. Because the b
1414

1515
== Control plane and node host compatibility
1616

17-
The {product-title} version must match between control plane host and node host. For example, in a 4.13 cluster, all control plane hosts must be 4.13 and all nodes must be 4.13.
17+
The {product-title} version must match between control plane host and node host. For example, in a {product-version} cluster, all control plane hosts must be {product-version} and all nodes must be {product-version}.
1818

19-
Temporary mismatches during cluster upgrades are acceptable. For example, when upgrading from {product-title} 4.12 to 4.13, some nodes will upgrade to 4.13 before others. Prolonged skewing of control plane hosts and node hosts might expose older compute machines to bugs and missing features. Users should resolve skewed control plane hosts and node hosts as soon as possible.
19+
Temporary mismatches during cluster upgrades are acceptable. For example, when upgrading from the previous {product-title} version to {product-version}, some nodes will upgrade to {product-version} before others. Prolonged skewing of control plane hosts and node hosts might expose older compute machines to bugs and missing features. Users should resolve skewed control plane hosts and node hosts as soon as possible.
2020

2121
The `kubelet` service must not be newer than `kube-apiserver`, and can be up to two minor versions older depending on whether your {product-title} version is odd or even. The table below shows the appropriate version compatibility:
2222

modules/cli-installing-cli-rpm.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ For {op-system-base-full}, you can install the OpenShift CLI (`oc`) as an RPM if
4545

4646
. Enable the repositories required by {product-title} {product-version}.
4747
+
48-
[source,terminal]
48+
[source,terminal,subs="attributes+"]
4949
----
50-
# subscription-manager repos --enable="rhocp-4.13-for-rhel-8-x86_64-rpms"
50+
# subscription-manager repos --enable="rhocp-{product-version}-for-rhel-8-x86_64-rpms"
5151
----
5252
+
5353
[NOTE]

modules/cluster-logging-feature-reference.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Vector does not support FIPS Enabled Clusters.
2525

2626
.Prerequisites
2727

28-
* {product-title}: 4.13
28+
* {product-title}: {product-version}
2929
* {logging-title-uc}: 5.4
3030
* FIPS disabled
3131

modules/cluster-logging-loki-tech-preview.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ You can use the {product-title} web console to install the Loki Operator.
2020

2121
.Prerequisites
2222

23-
* {product-title}: 4.13
23+
* {product-title}: {product-version}
2424
* {logging-title-uc}: 5.4
2525

2626
To install the Loki Operator using the {product-title} web console:

modules/cluster-logging-systemd-scaling.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ and other settings.
2525
See "Creating machine configs with Butane" for information about Butane.
2626
====
2727
+
28-
[source,yaml]
28+
[source,yaml,subs="attributes+"]
2929
----
3030
variant: openshift
31-
version: 4.13.0
31+
version: {product-version}.0
3232
metadata:
3333
name: 40-worker-custom-journald
3434
labels:

0 commit comments

Comments
 (0)