Skip to content

Commit 16a5c0b

Browse files
authored
Merge pull request #36974 from kalexand-rh/osdocs2368
osdocs-2368: updating 4.8 references to 4.9
2 parents ae39ba3 + c0fc03d commit 16a5c0b

File tree

68 files changed

+211
-211
lines changed

Some content is hidden

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

68 files changed

+211
-211
lines changed

_topic_map.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ Name: Release notes
8181
Dir: release_notes
8282
Distros: openshift-enterprise
8383
Topics:
84-
- Name: OpenShift Container Platform 4.8 release notes
85-
File: ocp-4-8-release-notes
84+
- Name: OpenShift Container Platform 4.9 release notes
85+
File: ocp-4-9-release-notes
8686
- Name: Versioning policy
8787
File: versioning-policy
8888
---

logging/cluster-logging-release-notes.adoc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ toc::[]
88
[id="openshift-logging-supported-versions"]
99
== Supported versions
1010

11-
OpenShift Logging 5.0, 5.1, and 5.2 run on {product-title} 4.7 and 4.8.
11+
.{product-title} version support for Red Hat OpenShift Logging (RHOL)
12+
[options="header"]
13+
|====
14+
| |4.7 |4.8 |4.9
15+
|RHOL 5.0|X |X |
16+
|RHOL 5.1|X |X |
17+
|RHOL 5.2|X |X |X
18+
|====
1219

1320
include::modules/con_making-open-source-more-inclusive.adoc[leveloffset=+1]
1421

logging/cluster-logging-upgrading.adoc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,14 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8-
{product-title} 4.7 and 4.8 support OpenShift Logging 5.0, 5.1, and 5.2.
8+
.{product-title} version support for Red Hat OpenShift Logging (RHOL)
9+
[options="header"]
10+
|====
11+
| |4.7 |4.8 |4.9
12+
|RHOL 5.0|X |X |
13+
|RHOL 5.1|X |X |
14+
|RHOL 5.2|X |X |X
15+
|====
916

1017
To upgrade from cluster logging in {product-title} version 4.6 and earlier to OpenShift Logging 5.x, you update the {product-title} cluster to version 4.7 or 4.8. Then, you update the following operators:
1118

metering/metering-upgrading-metering.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ Wait several seconds to allow the subscription to update before proceeding to th
4646
====
4747
. Click *Operators* -> *Installed Operators*.
4848
+
49-
The Metering Operator is shown as 4.8. For example:
49+
The Metering Operator is shown as 4.9. For example:
5050
+
5151
----
5252
Metering
53-
4.8.0-202107012112.p0 provided by Red Hat, Inc
53+
4.9.0-202107012112.p0 provided by Red Hat, Inc
5454
----
5555

5656
.Verification
@@ -73,11 +73,11 @@ You can verify the metering upgrade by performing any of the following checks:
7373
$ oc get csv | grep metering
7474
----
7575
+
76-
.Example output for metering upgrade from 4.7 to 4.8
76+
.Example output for metering upgrade from 4.8 to 4.9
7777
[source,terminal]
7878
----
7979
NAME DISPLAY VERSION REPLACES PHASE
80-
metering-operator.4.8.0-202107012112.p0 Metering 4.8.0-202107012112.p0 metering-operator.4.7.0-202007012112.p0 Succeeded
80+
metering-operator.4.9.0-202107012112.p0 Metering 4.9.0-202107012112.p0 metering-operator.4.8.0-202007012112.p0 Succeeded
8181
----
8282
--
8383

migrating_from_ocp_3_to_4/planning-migration-3-4.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ toc::[]
88
{product-title} {product-version} introduces architectural changes and enhancements. The procedures that you used to manage your {product-title} 3 cluster might not apply to {product-title} 4.
99

1010
ifndef::openshift-origin[]
11-
For information on configuring your {product-title} 4 cluster, review the appropriate sections of the {product-title} documentation. For information on new features and other notable technical changes, review the xref:../release_notes/ocp-4-8-release-notes.adoc#ocp-4-8-release-notes[OpenShift Container Platform 4.8 release notes].
11+
For information on configuring your {product-title} 4 cluster, review the appropriate sections of the {product-title} documentation. For information on new features and other notable technical changes, review the xref:../release_notes/ocp-4-9-release-notes.adoc#ocp-4-9-release-notes[OpenShift Container Platform 4.9 release notes].
1212
endif::[]
1313

1414
It is not possible to upgrade your existing {product-title} 3 cluster to {product-title} 4. You must start with a new {product-title} 4 installation. Tools are available to assist in migrating your control plane settings and application workloads.

modules/cluster-logging-systemd-scaling.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ See "Creating machine configs with Butane" for information about Butane.
2727
[source,yaml]
2828
----
2929
variant: openshift
30-
version: 4.8.0
30+
version: 4.9.0
3131
metadata:
3232
name: 40-worker-custom-journald
3333
labels:

modules/cluster-logging-updating-logging-to-5-0.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* The _Cluster Logging_ Operator became the _Red Hat OpenShift Logging_ Operator.
88
* The _Elasticsearch_ Operator became _OpenShift Elasticsearch_ Operator.
99

10-
To upgrade from cluster logging in {product-title} version 4.6 and earlier to OpenShift Logging 5.x, you update the {product-title} cluster to version 4.7 or 4.8. Then, you update the following operators:
10+
To upgrade from cluster logging in {product-title} version 4.6 and earlier to OpenShift Logging 5.x, you update the {product-title} cluster to version 4.7, 4.8, or 4.9. Then, you update the following operators:
1111

1212
* From Elasticsearch Operator 4.x to OpenShift Elasticsearch Operator 5.x
1313
* From Cluster Logging Operator 4.x to Red Hat OpenShift Logging Operator 5.x

modules/cluster-node-tuning-operator-verify-profiles.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[id="verifying-tuned-profiles-are-applied_{context}"]
66
= Verifying that the TuneD profiles are applied
77

8-
Starting with {product-title} 4.8, it is no longer necessary to check the TuneD pod logs
8+
It is no longer necessary to check the TuneD pod logs
99
to find which TuneD profiles are applied on cluster nodes.
1010

1111
[source,terminal]

modules/cnf-configure_for_irq_dynamic_load_balancing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ metadata:
4444
spec:
4545
containers:
4646
- name: dynamic-irq-pod
47-
image: "quay.io/openshift-kni/cnf-tests:4.8"
47+
image: "quay.io/openshift-kni/cnf-tests:4.9"
4848
command: ["sleep", "10h"]
4949
resources:
5050
requests:

modules/cnf-installing-the-performance-addon-operator.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ $ oc get packagemanifest performance-addon-operator -n openshift-marketplace -o
7575
.Example output
7676
[source,terminal]
7777
----
78-
4.8
78+
4.9
7979
----
8080

8181
.. Create the following Subscription CR and save the YAML in the `pao-sub.yaml` file:

0 commit comments

Comments
 (0)