Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _topic_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ Name: Release notes
Dir: release_notes
Distros: openshift-enterprise
Topics:
- Name: OpenShift Container Platform 4.8 release notes
File: ocp-4-8-release-notes
- Name: OpenShift Container Platform 4.9 release notes
File: ocp-4-9-release-notes
- Name: Versioning policy
File: versioning-policy
---
Expand Down
9 changes: 8 additions & 1 deletion logging/cluster-logging-release-notes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@ toc::[]
[id="openshift-logging-supported-versions"]
== Supported versions

OpenShift Logging 5.0, 5.1, and 5.2 run on {product-title} 4.7 and 4.8.
.{product-title} version support for Red Hat OpenShift Logging (RHOL)
[options="header"]
|====
| |4.7 |4.8 |4.9
|RHOL 5.0|X |X |
|RHOL 5.1|X |X |
|RHOL 5.2|X |X |X
|====

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

Expand Down
9 changes: 8 additions & 1 deletion logging/cluster-logging-upgrading.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@ include::modules/common-attributes.adoc[]

toc::[]

{product-title} 4.7 and 4.8 support OpenShift Logging 5.0, 5.1, and 5.2.
.{product-title} version support for Red Hat OpenShift Logging (RHOL)
[options="header"]
|====
| |4.7 |4.8 |4.9
|RHOL 5.0|X |X |
|RHOL 5.1|X |X |
|RHOL 5.2|X |X |X
|====

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:

Expand Down
8 changes: 4 additions & 4 deletions metering/metering-upgrading-metering.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ Wait several seconds to allow the subscription to update before proceeding to th
====
. Click *Operators* -> *Installed Operators*.
+
The Metering Operator is shown as 4.8. For example:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kalexand-rh metering will not be shipped for 4.9, so I think all metering references should be removed in this upgrade doc https://issues.redhat.com/browse/CLOUDDST-8973

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vikram-redhat, do we have a plan for removing the metering content?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It has been removed: #36779. I guess we should delete the modules/assemblies as well?

The Metering Operator is shown as 4.9. For example:
+
----
Metering
4.8.0-202107012112.p0 provided by Red Hat, Inc
4.9.0-202107012112.p0 provided by Red Hat, Inc
----

.Verification
Expand All @@ -73,11 +73,11 @@ You can verify the metering upgrade by performing any of the following checks:
$ oc get csv | grep metering
----
+
.Example output for metering upgrade from 4.7 to 4.8
.Example output for metering upgrade from 4.8 to 4.9
[source,terminal]
----
NAME DISPLAY VERSION REPLACES PHASE
metering-operator.4.8.0-202107012112.p0 Metering 4.8.0-202107012112.p0 metering-operator.4.7.0-202007012112.p0 Succeeded
metering-operator.4.9.0-202107012112.p0 Metering 4.9.0-202107012112.p0 metering-operator.4.8.0-202007012112.p0 Succeeded
----
--

Expand Down
2 changes: 1 addition & 1 deletion migrating_from_ocp_3_to_4/planning-migration-3-4.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ toc::[]
{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.

ifndef::openshift-origin[]
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].
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].
endif::[]

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.
Expand Down
2 changes: 1 addition & 1 deletion modules/cluster-logging-systemd-scaling.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ See "Creating machine configs with Butane" for information about Butane.
[source,yaml]
----
variant: openshift
version: 4.8.0
version: 4.9.0
metadata:
name: 40-worker-custom-journald
labels:
Expand Down
2 changes: 1 addition & 1 deletion modules/cluster-logging-updating-logging-to-5-0.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* The _Cluster Logging_ Operator became the _Red Hat OpenShift Logging_ Operator.
* The _Elasticsearch_ Operator became _OpenShift Elasticsearch_ Operator.

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:
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:

* From Elasticsearch Operator 4.x to OpenShift Elasticsearch Operator 5.x
* From Cluster Logging Operator 4.x to Red Hat OpenShift Logging Operator 5.x
Expand Down
2 changes: 1 addition & 1 deletion modules/cluster-node-tuning-operator-verify-profiles.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[id="verifying-tuned-profiles-are-applied_{context}"]
= Verifying that the TuneD profiles are applied

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

[source,terminal]
Expand Down
2 changes: 1 addition & 1 deletion modules/cnf-configure_for_irq_dynamic_load_balancing.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ metadata:
spec:
containers:
- name: dynamic-irq-pod
image: "quay.io/openshift-kni/cnf-tests:4.8"
image: "quay.io/openshift-kni/cnf-tests:4.9"
command: ["sleep", "10h"]
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion modules/cnf-installing-the-performance-addon-operator.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ $ oc get packagemanifest performance-addon-operator -n openshift-marketplace -o
.Example output
[source,terminal]
----
4.8
4.9
----

.. Create the following Subscription CR and save the YAML in the `pao-sub.yaml` file:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ You can use the `ROLE_WORKER_CNF` variable to override the worker pool name:
[source,terminal]
----
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig -e
ROLE_WORKER_CNF=custom-worker-pool registry.redhat.io/openshift4/cnf-tests-rhel8:v4.8 /usr/bin/test-run.sh
ROLE_WORKER_CNF=custom-worker-pool registry.redhat.io/openshift4/cnf-tests-rhel8:v4.9 /usr/bin/test-run.sh
----
+
[NOTE]
Expand All @@ -83,7 +83,7 @@ Use this command to run in dry-run mode. This is useful for checking what is in

[source,terminal]
----
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.8 /usr/bin/test-run.sh -ginkgo.dryRun -ginkgo.v
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.9 /usr/bin/test-run.sh -ginkgo.dryRun -ginkgo.v
----

[id="cnf-performing-end-to-end-tests-disconnected-mode_{context}"]
Expand All @@ -104,7 +104,7 @@ Run this command from an intermediate machine that has access both to the cluste

[source,terminal]
----
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.8 /usr/bin/mirror -registry my.local.registry:5000/ | oc image mirror -f -
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.9 /usr/bin/mirror -registry my.local.registry:5000/ | oc image mirror -f -
----

Then, follow the instructions in the following section about overriding the registry used to fetch the images.
Expand All @@ -116,7 +116,7 @@ This is done by setting the `IMAGE_REGISTRY` environment variable:

[source,terminal]
----
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig -e IMAGE_REGISTRY="my.local.registry:5000/" -e CNF_TESTS_IMAGE="custom-cnf-tests-image:latests" registry.redhat.io/openshift4/cnf-tests-rhel8:v4.8 /usr/bin/test-run.sh
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig -e IMAGE_REGISTRY="my.local.registry:5000/" -e CNF_TESTS_IMAGE="custom-cnf-tests-image:latests" registry.redhat.io/openshift4/cnf-tests-rhel8:v4.9 /usr/bin/test-run.sh
----

[id="cnf-performing-end-to-end-tests-mirroring-to-cluster-internal-registry_{context}"]
Expand Down Expand Up @@ -213,7 +213,7 @@ echo "{\"auths\": { \"$REGISTRY\": { \"auth\": $TOKEN } }}" > dockerauth.json
+
[source,terminal]
----
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.8 /usr/bin/mirror -registry $REGISTRY/cnftests | oc image mirror --insecure=true -a=$(pwd)/dockerauth.json -f -
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.9 /usr/bin/mirror -registry $REGISTRY/cnftests | oc image mirror --insecure=true -a=$(pwd)/dockerauth.json -f -
----

. Run the tests:
Expand All @@ -235,11 +235,11 @@ $ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig -e IMAG
[
{
"registry": "public.registry.io:5000",
"image": "imageforcnftests:4.8"
"image": "imageforcnftests:4.9"
},
{
"registry": "public.registry.io:5000",
"image": "imagefordpdk:4.8"
"image": "imagefordpdk:4.9"
}
]
----
Expand All @@ -248,7 +248,7 @@ $ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig -e IMAG
+
[source,terminal]
----
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.8 /usr/bin/mirror --registry "my.local.registry:5000/" --images "/kubeconfig/images.json" | oc image mirror -f -
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.9 /usr/bin/mirror --registry "my.local.registry:5000/" --images "/kubeconfig/images.json" | oc image mirror -f -
----

[id="cnf-performing-end-to-end-tests-running-in-single-node-cluster_{context}"]
Expand Down Expand Up @@ -342,7 +342,7 @@ For example, to change the `CNF_TESTS_IMAGE` with a custom registry run the foll

[source,terminal]
----
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig -e CNF_TESTS_IMAGE="custom-cnf-tests-image:latests" registry.redhat.io/openshift4/cnf-tests-rhel8:v4.8 /usr/bin/test-run.sh
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig -e CNF_TESTS_IMAGE="custom-cnf-tests-image:latests" registry.redhat.io/openshift4/cnf-tests-rhel8:v4.9 /usr/bin/test-run.sh
----

[id="cnf-performing-end-to-end-tests-ginko-parameters_{context}"]
Expand All @@ -354,7 +354,7 @@ You can use the `-ginkgo.focus` parameter to filter a set of tests:

[source,terminal]
----
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.8 /usr/bin/test-run.sh -ginkgo.focus="performance|sctp"
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.9 /usr/bin/test-run.sh -ginkgo.focus="performance|sctp"
----

You can run only the latency test using the `-ginkgo.focus` parameter.
Expand All @@ -363,7 +363,7 @@ To run only the latency test, you must provide the `-ginkgo.focus` parameter and

[source,terminal]
----
$ docker run --rm -v $KUBECONFIG:/kubeconfig -e KUBECONFIG=/kubeconfig -e LATENCY_TEST_RUN=true -e LATENCY_TEST_RUNTIME=600 -e OSLAT_MAXIMUM_LATENCY=20 -e PERF_TEST_PROFILE=<performance_profile_name> registry.redhat.io/openshift4/cnf-tests-rhel8:v4.8 /usr/bin/test-run.sh -ginkgo.focus="\[performance\]\[config\]|\[performance\]\ Latency\ Test"
$ docker run --rm -v $KUBECONFIG:/kubeconfig -e KUBECONFIG=/kubeconfig -e LATENCY_TEST_RUN=true -e LATENCY_TEST_RUNTIME=600 -e OSLAT_MAXIMUM_LATENCY=20 -e PERF_TEST_PROFILE=<performance_profile_name> registry.redhat.io/openshift4/cnf-tests-rhel8:v4.9 /usr/bin/test-run.sh -ginkgo.focus="\[performance\]\[config\]|\[performance\]\ Latency\ Test"
----

[NOTE]
Expand Down Expand Up @@ -525,7 +525,7 @@ Assuming the `kubeconfig` file is in the current folder, the command for running

[source,terminal]
----
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.8 /usr/bin/test-run.sh
$ docker run -v $(pwd)/:/kubeconfig -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.9 /usr/bin/test-run.sh
----

This allows your `kubeconfig` file to be consumed from inside the running container.
Expand Down Expand Up @@ -844,7 +844,7 @@ A JUnit-compliant XML is produced by passing the `--junit` parameter together wi

[source,terminal]
----
$ docker run -v $(pwd)/:/kubeconfig -v $(pwd)/junitdest:/path/to/junit -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.8 /usr/bin/test-run.sh --junit /path/to/junit
$ docker run -v $(pwd)/:/kubeconfig -v $(pwd)/junitdest:/path/to/junit -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.9 /usr/bin/test-run.sh --junit /path/to/junit
----

[id="cnf-performing-end-to-end-tests-test-failure-report_{context}"]
Expand All @@ -854,7 +854,7 @@ A report with information about the cluster state and resources for troubleshoot

[source,terminal]
----
$ docker run -v $(pwd)/:/kubeconfig -v $(pwd)/reportdest:/path/to/report -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.8 /usr/bin/test-run.sh --report /path/to/report
$ docker run -v $(pwd)/:/kubeconfig -v $(pwd)/reportdest:/path/to/report -e KUBECONFIG=/kubeconfig/kubeconfig registry.redhat.io/openshift4/cnf-tests-rhel8:v4.9 /usr/bin/test-run.sh --report /path/to/report
----

[id="cnf-performing-end-to-end-tests-podman_{context}"]
Expand Down Expand Up @@ -915,5 +915,5 @@ To override the performance profile, the manifest must be mounted inside the con

[source,termal]
----
$ docker run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig -e PERFORMANCE_PROFILE_MANIFEST_OVERRIDE=/kubeconfig/manifest.yaml registry.redhat.io/openshift4/cnf-tests-rhel8:v4.8 /usr/bin/test-run.sh
$ docker run -v $(pwd)/:/kubeconfig:Z -e KUBECONFIG=/kubeconfig/kubeconfig -e PERFORMANCE_PROFILE_MANIFEST_OVERRIDE=/kubeconfig/manifest.yaml registry.redhat.io/openshift4/cnf-tests-rhel8:v4.9 /usr/bin/test-run.sh
----
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ EXTERNAL-IP OS-IMAGE KERNEL-VERSION
CONTAINER-RUNTIME
cnf-worker-0.example.com Ready worker,worker-rt 5d17h v1.22.1
128.66.135.107 <none> Red Hat Enterprise Linux CoreOS 46.82.202008252340-0 (Ootpa)
4.18.0-211.rt5.23.el8.x86_64 cri-o://1.22.1-90.rhaos4.8.git4a0ac05.el8-rc.1
4.18.0-211.rt5.23.el8.x86_64 cri-o://1.22.1-90.rhaos4.9.git4a0ac05.el8-rc.1
[...]
----

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ readonly IMG_EXISTS_CMD="${CONTAINER_RUNTIME} image exists"
readonly IMG_PULL_CMD="${CONTAINER_RUNTIME} image pull"
readonly MUST_GATHER_VOL="/must-gather"

PAO_IMG="quay.io/openshift-kni/performance-addon-operator:4.8-snapshot"
PAO_IMG="quay.io/openshift-kni/performance-addon-operator:4.9-snapshot"
MG_TARBALL=""
DATA_DIR=""

Expand Down Expand Up @@ -162,7 +162,7 @@ There two types of arguments:
* PPC arguments
====
+
<1> Optional: Specify the Performance Addon Operator image. If not set, the default upstream image is used: `quay.io/openshift-kni/performance-addon-operator:4.8-snapshot`.
<1> Optional: Specify the Performance Addon Operator image. If not set, the default upstream image is used: `quay.io/openshift-kni/performance-addon-operator:4.9-snapshot`.
<2> `-t` is a required wrapper script argument and specifies the path to a `must-gather` tarball.

. Run the performance profile creator tool in discovery mode:
Expand Down
6 changes: 3 additions & 3 deletions modules/cnf-running-the-performance-creator-profile.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ worker-cnf rendered-worker-cnf-1d871ac76e1951d32b2fe92369879826 False Tr
+
[source,terminal]
----
$ podman run --entrypoint performance-profile-creator quay.io/openshift-kni/performance-addon-operator:4.8-snapshot -h
$ podman run --entrypoint performance-profile-creator quay.io/openshift-kni/performance-addon-operator:4.9-snapshot -h
----
+
.Example output
Expand Down Expand Up @@ -77,7 +77,7 @@ Using this information you can set appropriate values for some of the arguments
+
[source,terminal]
----
$ podman run --entrypoint performance-profile-creator -v /must-gather:/must-gather:z quay.io/openshift-kni/performance-addon-operator:4.8-snapshot --info log --must-gather-dir-path /must-gather
$ podman run --entrypoint performance-profile-creator -v /must-gather:/must-gather:z quay.io/openshift-kni/performance-addon-operator:4.9-snapshot --info log --must-gather-dir-path /must-gather
----
+
[NOTE]
Expand All @@ -96,7 +96,7 @@ The `info` option requires a value which specifies the output format. Possible v
+
[source,terminal]
----
$ podman run --entrypoint performance-profile-creator -v /must-gather:/must-gather:z quay.io/openshift-kni/performance-addon-operator:4.8-snapshot --mcp-name=worker-cnf --reserved-cpu-count=20 --rt-kernel=true --split-reserved-cpus-across-numa=false --topology-manager-policy=single-numa-node --must-gather-dir-path /must-gather --power-consumption-mode=ultra-low-latency > my-performance-profile.yaml
$ podman run --entrypoint performance-profile-creator -v /must-gather:/must-gather:z quay.io/openshift-kni/performance-addon-operator:4.9-snapshot --mcp-name=worker-cnf --reserved-cpu-count=20 --rt-kernel=true --split-reserved-cpus-across-numa=false --topology-manager-policy=single-numa-node --must-gather-dir-path /must-gather --power-consumption-mode=ultra-low-latency > my-performance-profile.yaml
----
+
[NOTE]
Expand Down
6 changes: 3 additions & 3 deletions modules/cnf-upgrading-performance-addon-operator.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ $ oc get csv
[source,terminal]
----
VERSION REPLACES PHASE
4.8.0 performance-addon-operator.v4.8.0 Installing
4.7.0 Replacing
4.9.0 performance-addon-operator.v4.9.0 Installing
4.8.0 Replacing
----

. Run `get csv` again to verify the output:
Expand All @@ -130,5 +130,5 @@ VERSION REPLACES PHASE
[source,terminal]
----
NAME DISPLAY VERSION REPLACES PHASE
performance-addon-operator.v4.8.0 Performance Addon Operator 4.8.0 performance-addon-operator.v4.7.0 Succeeded
performance-addon-operator.v4.9.0 Performance Addon Operator 4.9.0 performance-addon-operator.v4.8.0 Succeeded
----
2 changes: 1 addition & 1 deletion modules/common-attributes.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// The {product-title} attribute provides the context-sensitive name of the relevant OpenShift distribution, for example, "OpenShift Container Platform" or "OKD". The {product-version} attribute provides the product version relative to the distribution, for example "4.8".
// The {product-title} attribute provides the context-sensitive name of the relevant OpenShift distribution, for example, "OpenShift Container Platform" or "OKD". The {product-version} attribute provides the product version relative to the distribution, for example "4.9".
// {product-title} and {product-version} are parsed when AsciiBinder queries the _distro_map.yml file in relation to the base branch of a pull request.
// See https://github.com/openshift/openshift-docs/blob/main/contributing_to_docs/doc_guidelines.adoc#product-name-version for more information on this topic.
// Other common attributes are defined in the following lines:
Expand Down
2 changes: 1 addition & 1 deletion modules/containers-signature-verify-enable.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ See "Creating machine configs with Butane" for information about Butane.
[source,yaml]
----
variant: openshift
version: 4.8.0
version: 4.9.0
metadata:
name: 51-worker-rh-registry-trust
labels:
Expand Down
2 changes: 1 addition & 1 deletion modules/developer-cli-odo-installing-odo-on-linux.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
+
[source,terminal]
----
# subscription-manager repos --enable="ocp-tools-4.8-for-rhel-8-x86_64-rpms"
# subscription-manager repos --enable="ocp-tools-4.9-for-rhel-8-x86_64-rpms"
----

. Install the `{odo-title}` package:
Expand Down
2 changes: 1 addition & 1 deletion modules/gathering-data-specific-features.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ifndef::openshift-origin[]
|`registry.redhat.io/rhmtc/openshift-migration-must-gather-rhel8:v{mtc-version}`
|Data collection for the {mtc-full}.

|`registry.redhat.io/ocs4/ocs-must-gather-rhel8:v4.8`
|`registry.redhat.io/ocs4/ocs-must-gather-rhel8:v4.9`
|Data collection for Red Hat OpenShift Container Storage.

|`registry.redhat.io/openshift4/ose-cluster-logging-operator`
Expand Down
Loading