Skip to content

Commit

Permalink
OSDOCS-11309: hardcoded 4.18 version number bump
Browse files Browse the repository at this point in the history
  • Loading branch information
sheriff-rh committed Feb 3, 2025
1 parent 4120cbe commit 49ec7ee
Show file tree
Hide file tree
Showing 94 changed files with 173 additions and 173 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion extensions/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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-verison} 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
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 @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion modules/about-developer-perspective.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 2 additions & 2 deletions modules/cpmso-openstack-with-az-config.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
20 changes: 10 additions & 10 deletions modules/create-wif-cluster-cli.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
----
--
+
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions modules/creating-config-files-cluster-install-oci.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
----
====
Expand Down
2 changes: 1 addition & 1 deletion modules/hcp-aws-hc-ext-dns.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
2 changes: 1 addition & 1 deletion modules/hcp-bm-hc-mirror.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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_.
2 changes: 1 addition & 1 deletion modules/hcp-bm-hc.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ $ hcp create cluster agent \
<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 availability policy for the hosted control plane components. Supported options are `SingleReplica` and `HighlyAvailable`. The default value is `HighlyAvailable`.
<10> 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_.
<10> 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_.
<11> Specify the node pool replica count, for example, `3`. You must specify the replica count as `0` or greater to create the same number of replicas. Otherwise, no node pools are created.

+
Expand Down
2 changes: 1 addition & 1 deletion modules/hcp-bm-ingress.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ clusteroperator.config.openshift.io/console
clusteroperator.config.openshift.io/ingress 4.x.y True False False 53m
----
+
Replace `<4.x.y>` with the supported {product-title} version that you want to use, for example, `4.17.0-multi`.
Replace `<4.x.y>` with the supported {product-title} version that you want to use, for example, `4.18.0-multi`.


ifeval::["{context}" == "hcp-manage-non-bm"]
Expand Down
2 changes: 1 addition & 1 deletion modules/hcp-create-hc-arm64-aws.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $ hcp create cluster aws \
<4> Specify the path to your pull secret, for example, `/user/name/pullsecret`.
<5> Specify the path to your AWS STS credentials file, for example, `/home/user/sts-creds/sts-creds.json`.
<6> Specify the AWS region name, for example, `us-east-1`.
<7> 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".
<7> 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".
<8> Specify the Amazon Resource Name (ARN), for example, `arn:aws:iam::820196288204:role/myrole`.

. Add a `NodePool` object to the hosted cluster by running the following command:
Expand Down
8 changes: 4 additions & 4 deletions modules/hcp-dc-image-mirror.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ To configure image mirroring, complete the following steps:

. By using the following example, create an `ImageSetConfiguration` object to use for mirroring. Replace values as needed to match your environment:
+
[source,yaml]
[source,yaml,subs="attributes+"]
----
apiVersion: mirror.openshift.io/v1alpha2
kind: ImageSetConfiguration
Expand All @@ -37,7 +37,7 @@ storageConfig:
mirror:
platform:
channels:
- name: candidate-4.17
- name: candidate-{product-version}
minVersion: <4.x.y-build> <2>
maxVersion: <4.x.y-build> <2>
type: ocp
Expand All @@ -52,10 +52,10 @@ mirror:
- name: quay.io/karmab/curl:latest
- name: quay.io/karmab/kcli:latest
- name: quay.io/user-name/trbsht:latest
- name: quay.io/user-name/hypershift:BMSelfManage-v4.17
- name: quay.io/user-name/hypershift:BMSelfManage-v{product-version}
- name: registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.10
operators:
- catalog: registry.redhat.io/redhat/redhat-operator-index:v4.17
- catalog: registry.redhat.io/redhat/redhat-operator-index:v{product-version}
packages:
- name: lvms-operator
- name: local-storage-operator
Expand Down
2 changes: 1 addition & 1 deletion modules/hcp-ibm-z-adding-reg-ca-hostedcluster.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ $ hcp create cluster agent \
<4> Replace the name with your base domain, for example, `example.com`.
<5> Replace the etcd storage class name, for example, `lvm-storageclass`.
<6> Replace the path to your SSH public key. The default file path is `~/.ssh/id_rsa.pub`.
<7> Replace with the supported {product-title} version that you want to use, for example, `4.17.0-multi`.
<7> Replace with the supported {product-title} version that you want to use, for example, `4.18.0-multi`.
<8> Replace the path to Certificate Authority of mirror registry.
2 changes: 1 addition & 1 deletion modules/hcp-non-bm-hc-mirror.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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_.
2 changes: 1 addition & 1 deletion modules/hcp-non-bm-hc.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ $ hcp create cluster agent \
<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 availability policy for the hosted control plane components. Supported options are `SingleReplica` and `HighlyAvailable`. The default value is `HighlyAvailable`.
<10> Specify the supported {product-title} version that you want to use, for example, `4.17.0-multi`.
<10> Specify the supported {product-title} version that you want to use, for example, `4.18.0-multi`.
<11> Specify the node pool replica count, for example, `3`. You must specify the replica count as `0` or greater to create the same number of replicas. Otherwise, no node pools are created.

.Verification
Expand Down
2 changes: 1 addition & 1 deletion modules/hosted-control-planes-version-support.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ You can host different versions of control planes on the same management cluster
----
apiVersion: v1
data:
supported-versions: '{"versions":["4.17"]}'
supported-versions: '{"versions":["4.18"]}'
kind: ConfigMap
metadata:
labels:
Expand Down
6 changes: 3 additions & 3 deletions modules/ibi-create-iso-for-bmh.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ kind: ImageBasedInstallationConfig
metadata:
name: example-image-based-installation-config
# The following fields are required
seedImage: quay.io/openshift-kni/seed-image:4.17.0
seedVersion: 4.17.0
seedImage: quay.io/openshift-kni/seed-image:4.18.0
seedVersion: 4.18.0
installationDisk: /dev/vda
pullSecret: '<your_pull_secret>'
# networkConfig is optional and contains the network configuration for the host in NMState format.
Expand Down Expand Up @@ -89,7 +89,7 @@ kind: ImageBasedInstallationConfig
metadata:
name: example-image-based-installation-config
seedImage: quay.io/repo-id/seed:latest
seedVersion: "4.17.0"
seedVersion: "4.18.0"
extraPartitionStart: "-240G"
installationDisk: /dev/disk/by-id/wwn-0x62c...
sshKey: 'ssh-ed25519 AAAA...'
Expand Down
2 changes: 1 addition & 1 deletion modules/ibi-extra-partition-ibi-install-iso.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ kind: ImageBasedInstallationConfig
metadata:
name: example-extra-partition
seedImage: quay.io/repo-id/seed:latest
seedVersion: "4.17.0"
seedVersion: "4.18.0"
installationDisk: /dev/sda
pullSecret: '{"auths": ...}'
# ...
Expand Down
2 changes: 1 addition & 1 deletion modules/insights-operator-one-time-gather.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ You must run a gather operation to create an Insights Operator archive.
+
[source,yaml]
----
include::https://raw.githubusercontent.com/openshift/insights-operator/release-4.17/docs/gather-job.yaml[]
include::https://raw.githubusercontent.com/openshift/insights-operator/release-4.18/docs/gather-job.yaml[]
----
. Copy your `insights-operator` image version:
+
Expand Down
4 changes: 2 additions & 2 deletions modules/installation-arm-bootstrap.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ bootstrap machine that you need for your {product-title} cluster:
[source,json]
----
ifndef::ash[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.17/upi/azure/04_bootstrap.json[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.18/upi/azure/04_bootstrap.json[]
endif::ash[]
ifdef::ash[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.17/upi/azurestack/04_bootstrap.json[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.18/upi/azurestack/04_bootstrap.json[]
endif::ash[]
----
====
Expand Down
4 changes: 2 additions & 2 deletions modules/installation-arm-control-plane.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ control plane machines that you need for your {product-title} cluster:
[source,json]
----
ifndef::ash[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.17/upi/azure/05_masters.json[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.18/upi/azure/05_masters.json[]
endif::ash[]
ifdef::ash[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.17/upi/azurestack/05_masters.json[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.18/upi/azurestack/05_masters.json[]
endif::ash[]
----
====
Expand Down
4 changes: 2 additions & 2 deletions modules/installation-arm-dns.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ cluster:
[source,json]
----
ifndef::ash[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.17/upi/azure/03_infra.json[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.18/upi/azure/03_infra.json[]
endif::ash[]
ifdef::ash[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.17/upi/azurestack/03_infra.json[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.18/upi/azurestack/03_infra.json[]
endif::ash[]
----
====
Expand Down
4 changes: 2 additions & 2 deletions modules/installation-arm-image-storage.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ stored {op-system-first} image that you need for your {product-title} cluster:
[source,json]
----
ifndef::ash[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.17/upi/azure/02_storage.json[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.18/upi/azure/02_storage.json[]
endif::ash[]
ifdef::ash[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.17/upi/azurestack/02_storage.json[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.18/upi/azurestack/02_storage.json[]
endif::ash[]
----
====
Expand Down
4 changes: 2 additions & 2 deletions modules/installation-arm-vnet.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ VNet that you need for your {product-title} cluster:
[source,json]
----
ifndef::ash[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.17/upi/azure/01_vnet.json[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.18/upi/azure/01_vnet.json[]
endif::ash[]
ifdef::ash[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.17/upi/azurestack/01_vnet.json[]
include::https://raw.githubusercontent.com/openshift/installer/release-4.18/upi/azurestack/01_vnet.json[]
endif::ash[]
----
====
Expand Down
Loading

0 comments on commit 49ec7ee

Please sign in to comment.