Merge pull request #87963 from sheriff-rh/OSDOCS-11309

Author: sheriff-rh

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

@@ -38,5 +38,5 @@ include::modules/verifying-the-assumed-iam-role-in-your-pod.adoc[leveloffset=+2]
 * 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].
 
 ifdef::openshift-rosa,openshift-dedicated[]
-* For general information about webhook admission plugins for OpenShift, see link:https://docs.openshift.com/container-platform/4.17/architecture/admission-plug-ins.html#admission-webhooks-about_admission-plug-ins[Webhook admission plugins] in the OpenShift Container Platform documentation.
+* For general information about webhook admission plugins for OpenShift, see link:https://docs.openshift.com/container-platform/4.18/architecture/admission-plug-ins.html#admission-webhooks-about_admission-plug-ins[Webhook admission plugins] in the OpenShift Container Platform documentation.
 endif::openshift-rosa,openshift-dedicated[]

authentication/managing_cloud_provider_credentials/cco-mode-mint.adoc

@@ -17,7 +17,7 @@ The CCO uses the `admin` credential to process the `CredentialsRequest` objects
 With mint mode, each cluster component has only the specific permissions it requires.
 Cloud credential reconciliation is automatic and continuous so that components can perform actions that require additional credentials or permissions.
 
-For example, a minor version cluster update (such as updating from {product-title} 4.16 to 4.17) might include an updated `CredentialsRequest` resource for a cluster component.
+For example, a minor version cluster update (such as updating from {product-title} {ocp-nminus1} to {product-version}) might include an updated `CredentialsRequest` resource for a cluster component.
 The CCO, operating in mint mode, uses the `admin` credential to process the `CredentialsRequest` resource and create users with limited permissions to satisfy the updated authentication requirements.
 
 [NOTE]

extensions/index.adoc

@@ -8,7 +8,7 @@ toc::[]
 
 Extensions enable cluster administrators to extend capabilities for users on their {product-title} cluster.
 
-{olm-first} has been included with {product-title} 4 since its initial release. {product-title} 4.17 includes components for a next-generation iteration of {olm} as a Generally Available (GA) feature, known during this phase as _{olmv1}_. This updated framework evolves many of the concepts that have been part of previous versions of {olm} and adds new capabilities.
+{olm-first} has been included with {product-title} 4 since its initial release. {product-title} {product-version} includes components for a next-generation iteration of {olm} as a Generally Available (GA) feature, known during this phase as _{olmv1}_. This updated framework evolves many of the concepts that have been part of previous versions of {olm} and adds new capabilities.
 
 [id="olmv1-highlights_{context}"]
 == Highlights

migrating_from_ocp_3_to_4/planning-migration-3-4.adoc

@@ -180,7 +180,7 @@ For information on OVN-Kubernetes features that are similar to features in the O
 
 [WARNING]
 ====
-You should install {product-title} 4 with the OVN-Kubernetes network plugin because it is not possible to upgrade a cluster to {product-title} 4.17 if it is using the OpenShift SDN network plugin.
+You should install {product-title} 4 with the OVN-Kubernetes network plugin because it is not possible to upgrade a cluster to {product-title} 4.17 or later if it is using the OpenShift SDN network plugin.
 ====
 
 [id="migration-preparing-logging"]

modules/about-developer-perspective.adoc

@@ -31,4 +31,4 @@ The *Developer* perspective provides workflows specific to developer use cases,
 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.
 
 .Additional resources
-See link:https://docs.openshift.com/container-platform/4.17/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.
+See link:https://docs.openshift.com/container-platform/4.18/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/cpmso-openstack-with-az-config.adoc

@@ -32,7 +32,7 @@ where:
 . For the `master-1` and `master-2` control plane machines, edit the value of the `serverGroupName` property in their provider specs to match that of the machine `master-0`.
 +
 .An example {rh-openstack} provider spec
-[source,yaml]
+[source,yaml,subs="attributes+"]
 ----
 providerSpec:
   value:
@@ -43,7 +43,7 @@ providerSpec:
       name: openstack-cloud-credentials
       namespace: openshift-machine-api
     flavor: m1.xlarge
-    image: rhcos-4.17
+    image: rhcos-{product-version}
     kind: OpenstackProviderSpec
     metadata:
       creationTimestamp: null

modules/create-wif-cluster-cli.adoc

@@ -59,7 +59,7 @@ $ ocm gcp create wif-config --name <wif_name> \ <1>
 2024/09/26 13:05:52 IAM service account cloud-credential-operator-oeub created
 2024/09/26 13:05:52 IAM service account openshift-cloud-network-c-oeub created
 2024/09/26 13:05:53 IAM service account openshift-ingress-gcp-oeub created
-2024/09/26 13:05:55 Role "osd_deployer_v4.17" updated
+2024/09/26 13:05:55 Role "osd_deployer_v4.18" updated
 ----
 --
 +
@@ -85,7 +85,7 @@ Once the WIF is configured, the following service accounts, roles, and groups ar
 
 
 |osd-deployer
-|osd_deployer_v4.17
+|osd_deployer_v4.18
 
 
 |osd-control-plane
@@ -99,35 +99,35 @@ Once the WIF is configured, the following service accounts, roles, and groups ar
 - compute.viewer
 
 |cloud-credential-operator-gcp-ro-creds
-|cloud_credential_operator_gcp_ro_creds_v4.17
+|cloud_credential_operator_gcp_ro_creds_v{product-version}
 
 |openshift-cloud-network-config-controller-gcp
-|openshift_cloud_network_config_controller_gcp_v4.17
+|openshift_cloud_network_config_controller_gcp_v{product-version}
 
 |openshift-gcp-ccm
-|openshift_gcp_ccm_v4.17
+|openshift_gcp_ccm_v{product-version}
 
 |openshift-gcp-pd-csi-driver-operator
 |- compute.storageAdmin
 - iam.serviceAccountUser
 - resourcemanager.tagUser
-- openshift_gcp_pd_csi_driver_operator_v4.17
+- openshift_gcp_pd_csi_driver_operator_v{product-version}
 
 |openshift-image-registry-gcp
-|openshift_image_registry_gcs_v4.17
+|openshift_image_registry_gcs_v{product-version}
 
 |openshift-ingress-gcp
-|openshift_ingress_gcp_v4.17
+|openshift_ingress_gcp_v{product-version}
 
 |openshift-machine-api-gcp
-|openshift_machine_api_gcp_v4.17
+|openshift_machine_api_gcp_v{product-version}
 
 |Access via SRE group:sd-sre-platform-gcp-access
 |sre_managed_support
 
 |===
 
-For further details about WIF configuration roles and their assigned permissions, see link:https://github.com/openshift/managed-cluster-config/blob/master/resources/wif/4.17/vanilla.yaml[managed-cluster-config].
+For further details about WIF configuration roles and their assigned permissions, see link:https://github.com/openshift/managed-cluster-config/blob/master/resources/wif/4.18/vanilla.yaml[managed-cluster-config].
 
 [id="create-wif-cluster_{context}"]
 == Creating a WIF cluster

modules/creating-config-files-cluster-install-oci.adoc

@@ -34,9 +34,9 @@ $ ./openshift-install version
 .Example output for a shared registry binary
 [source,terminal,subs="quotes"]
 ----
-./openshift-install 4.17.0
+./openshift-install 4.18.0
 built from commit ae7977b7d1ca908674a0d45c5c243c766fa4b2ca
-release image registry.ci.openshift.org/origin/release:4.17ocp-release@sha256:0da6316466d60a3a4535d5fed3589feb0391989982fba59d47d4c729912d6363
+release image registry.ci.openshift.org/origin/release:4.18ocp-release@sha256:0da6316466d60a3a4535d5fed3589feb0391989982fba59d47d4c729912d6363
 release architecture amd64
 ----
 ====

modules/hcp-aws-hc-ext-dns.adoc

@@ -64,7 +64,7 @@ $ hcp create cluster aws \
 <5> Specify the public hosted zone that the service consumer owns, for example, `service-consumer-domain.com`.
 <6> Specify the node replica count, for example, `2`.
 <7> Specify the path to your pull secret file.
-<8> Specify the supported {product-title} version that you want to use, for example, `4.17.0-multi`.
+<8> Specify the supported {product-title} version that you want to use, for example, `4.18.0-multi`.
 <9> Specify the public hosted zone that the service provider owns, for example, `service-provider-domain.com`.
 <10> Set as `PublicAndPrivate`. You can use external DNS with `Public` or `PublicAndPrivate` configurations only.
 <11> Specify the path to your {aws-short} STS credentials file, for example, `/home/user/sts-creds/sts-creds.json`.

modules/hcp-bm-hc-mirror.adoc

@@ -52,4 +52,4 @@ $ hcp create cluster agent \
 <6> Specify the `icsp.yaml` file that defines ICSP and your mirror registries.
 <7> Specify the path to your SSH public key. The default file path is `~/.ssh/id_rsa.pub`.
 <8> Specify your hosted cluster namespace.
-<9> Specify the supported {product-title} version that you want to use, for example, `4.17.0-multi`. If you are using a disconnected environment, replace `<ocp_release_image>` with the digest image. To extract the {product-title} release image digest, see _Extracting the {product-title} release image digest_.
+<9> Specify the supported {product-title} version that you want to use, for example, `4.18.0-multi`. If you are using a disconnected environment, replace `<ocp_release_image>` with the digest image. To extract the {product-title} release image digest, see _Extracting the {product-title} release image digest_.