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
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,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.12/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.13/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 @@ -13,7 +13,7 @@ include::modules/storage-persistent-storage-overview.adoc[leveloffset=+1]
[id="additional-resources_understanding-persistent-storage-microshift"]
[role="_additional-resources"]
.Additional resources
* link:https://access.redhat.com/documentation/en-us/openshift_container_platform/4.12/html/storage/understanding-persistent-storage#pv-access-modes_understanding-persistent-storage[Access modes for persistent storage]
* 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]

include::modules/storage-persistent-storage-lifecycle.adoc[leveloffset=+1]

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.12/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.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.
2 changes: 1 addition & 1 deletion modules/ai-adding-worker-nodes-to-cluster.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ $ curl -s "$API_URL/api/assisted-install/v2/infra-envs/$INFRA_ENV_ID" -H "Author
.Example output
[source,terminal]
----
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.12
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
----

. Download the ISO:
Expand Down
8 changes: 4 additions & 4 deletions modules/architecture-machine-roles.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ The cluster also contains the definition for the `bootstrap` role. Because the b

== Control plane and node host compatibility

The {product-title} version must match between control plane host and node host. For example, in a 4.12 cluster, all control plane hosts must be 4.12 and all nodes must be 4.12.
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.

Temporary mismatches during cluster upgrades are acceptable. For example, when upgrading from {product-title} 4.11 to 4.12, some nodes will upgrade to 4.12 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.
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.

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:

Expand All @@ -34,8 +34,8 @@ The `kubelet` service must not be newer than `kube-apiserver`, and can be up to
|===
[.small]
--
1. For example, {product-title} 4.9, 4.11.
2. For example, {product-title} 4.8, 4.10, 4.12.
1. For example, {product-title} 4.11, 4.13.
2. For example, {product-title} 4.10, 4.12.
--

[id="defining-workers_{context}"]
Expand Down
2 changes: 1 addition & 1 deletion modules/cli-installing-cli-rpm.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ For {op-system-base-full}, you can install the OpenShift CLI (`oc`) as an RPM if
+
[source,terminal]
----
# subscription-manager repos --enable="rhocp-4.12-for-rhel-8-x86_64-rpms"
# subscription-manager repos --enable="rhocp-4.13-for-rhel-8-x86_64-rpms"
----
+
[NOTE]
Expand Down
2 changes: 1 addition & 1 deletion modules/cluster-logging-feature-reference.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Vector does not support FIPS Enabled Clusters.

.Prerequisites

* {product-title}: 4.12
* {product-title}: 4.13
* {logging-title-uc}: 5.4
* FIPS disabled

Expand Down
2 changes: 1 addition & 1 deletion modules/cluster-logging-loki-tech-preview.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ You can use the {product-title} web console to install the Loki Operator.

.Prerequisites

* {product-title}: 4.12
* {product-title}: 4.13
* {logging-title-uc}: 5.4

To install the Loki Operator using the {product-title} web console:
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 @@ -28,7 +28,7 @@ See "Creating machine configs with Butane" for information about Butane.
[source,yaml]
----
variant: openshift
version: 4.12.0
version: 4.13.0
metadata:
name: 40-worker-custom-journald
labels:
Expand Down
2 changes: 1 addition & 1 deletion modules/cluster-logging-vector-tech-preview.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Vector does not support FIPS Enabled Clusters.

.Prerequisites

* {product-title}: 4.12
* {product-title}: 4.13
* {logging-title-uc}: 5.4
* FIPS disabled

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ annotations:
[source,terminal]
----
$ podman run --entrypoint performance-profile-creator -v \
/must-gather:/must-gather:z registry.redhat.io/openshift4/performance-addon-rhel8-operator:v4.12 \
/must-gather:/must-gather:z registry.redhat.io/openshift4/performance-addon-rhel8-operator:v4.13 \
--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=low-latency \ <1>
Expand Down
4 changes: 2 additions & 2 deletions modules/configmap-removing-ca.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Before removal, the Additional trust bundle section appears, redacting its value
Name: <cluster_name>
ID: <cluster_internal_id>
External ID: <cluster_external_id>
OpenShift Version: 4.12.0
OpenShift Version: 4.13.0
Channel Group: stable
DNS: <dns>
AWS Account: <aws_account_id>
Expand Down Expand Up @@ -76,7 +76,7 @@ After removing the proxy, the Additional trust bundle section is removed:
Name: <cluster_name>
ID: <cluster_internal_id>
External ID: <cluster_external_id>
OpenShift Version: 4.12.0
OpenShift Version: 4.13.0
Channel Group: stable
DNS: <dns>
AWS Account: <aws_account_id>
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 @@ -19,7 +19,7 @@ See "Creating machine configs with Butane" for information about Butane.
[source,yaml]
----
variant: openshift
version: 4.12.0
version: 4.13.0
metadata:
name: 51-worker-rh-registry-trust
labels:
Expand Down
4 changes: 2 additions & 2 deletions modules/coreos-layering-configuring.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ When you configure a custom layered image, {product-title} no longer automatical
You should use the same base {op-system} image that is installed on the rest of your cluster. Use the `oc adm release info --image-for rhel-coreos-8` command to obtain the base image being used in your cluster.
====
+
For example, the following Containerfile creates a custom layered image from an {product-title} 4.12 image and a Hotfix package:
For example, the following Containerfile creates a custom layered image from an {product-title} 4.13 image and a Hotfix package:
+
.Example Containerfile for a custom layer image
[source,yaml]
Expand Down Expand Up @@ -127,7 +127,7 @@ Name: rendered-master-4e8be63aef68b843b546827b6ebe0913
Namespace:
Labels: <none>
Annotations: machineconfiguration.openshift.io/generated-by-controller-version: 8276d9c1f574481043d3661a1ace1f36cd8c3b62
machineconfiguration.openshift.io/release-image-version: 4.12.0-ec.3
machineconfiguration.openshift.io/release-image-version: 4.13.0-ec.3
API Version: machineconfiguration.openshift.io/v1
Kind: MachineConfig
...
Expand Down
6 changes: 3 additions & 3 deletions modules/creating-custom-live-rhcos-iso.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ The modified `sshd_config` file overrides the default `sshd_config` file.
$ butane -p embedded.yaml -d files-dir/ > embedded.ign
----

. Once the Ignition file is created, you can include the configuration in a new live {op-system} ISO, which is named `rhcos-sshd-4.12.0-x86_64-live.x86_64.iso`, with the `coreos-installer` utility:
. Once the Ignition file is created, you can include the configuration in a new live {op-system} ISO, which is named `rhcos-sshd-4.13.0-x86_64-live.x86_64.iso`, with the `coreos-installer` utility:
+
[source,terminal]
----
$ coreos-installer iso ignition embed -i embedded.ign rhcos-4.12.0-x86_64-live.x86_64.iso -o rhcos-sshd-4.12.0-x86_64-live.x86_64.iso
$ coreos-installer iso ignition embed -i embedded.ign rhcos-4.13.0-x86_64-live.x86_64.iso -o rhcos-sshd-4.13.0-x86_64-live.x86_64.iso
----

.Verification
Expand All @@ -82,7 +82,7 @@ $ coreos-installer iso ignition embed -i embedded.ign rhcos-4.12.0-x86_64-live.x
+
[source,terminal]
----
# coreos-installer iso ignition show rhcos-sshd-4.12.0-x86_64-live.x86_64.iso
# coreos-installer iso ignition show rhcos-sshd-4.13.0-x86_64-live.x86_64.iso
----

+
Expand Down
2 changes: 1 addition & 1 deletion modules/customizing-the-jenkins-image-stream-tag.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ To override the current upgrade value for existing deployments, change the value

.Prerequisites

* You are running OpenShift Jenkins on {product-title} 4.12.
* You are running OpenShift Jenkins on {product-title} 4.13.
* You know the namespace where OpenShift Jenkins is deployed.

.Procedure
Expand Down
2 changes: 1 addition & 1 deletion modules/developer-cli-odo-installing-odo-on-linux-rpm.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ For {op-system-base-full}, you can install the `{odo-title}` CLI as an RPM.
+
[source,terminal]
----
# subscription-manager repos --enable="ocp-tools-4.12-for-rhel-8-x86_64-rpms"
# subscription-manager repos --enable="ocp-tools-4.13-for-rhel-8-x86_64-rpms"
----

. Install the `{odo-title}` package:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ $ oc get csv -n openshift-operators
[source,terminal]
----
NAME DISPLAY VERSION REPLACES PHASE
node-maintenance-operator.v4.12 Node Maintenance Operator 4.12 Succeeded
node-maintenance-operator.v4.13 Node Maintenance Operator 4.13 Succeeded
----
. Verify that the Node Maintenance Operator is running:
+
Expand Down
2 changes: 1 addition & 1 deletion modules/enabling-baseline-capability-set.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ As a cluster administrator, you can enable the capabilities by setting `baseline
$ oc patch clusterversion version --type merge -p '{"spec":{"capabilities":{"baselineCapabilitySet":"vCurrent"}}}' <1>
----
+
<1> For `baselineCapabilitySet` you can specify `vCurrent`, `v4.11`, `v4.12`, or `None`.
<1> For `baselineCapabilitySet` you can specify `vCurrent`, `v4.12`, `v4.13`, or `None`.

include::snippets/capabilities-table.adoc[]
16 changes: 8 additions & 8 deletions modules/graceful-restart.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,14 @@ Check that there are no cluster Operators with the `DEGRADED` condition set to `
[source,terminal]
----
NAME VERSION AVAILABLE PROGRESSING DEGRADED SINCE
authentication 4.12.0 True False False 59m
cloud-credential 4.12.0 True False False 85m
cluster-autoscaler 4.12.0 True False False 73m
config-operator 4.12.0 True False False 73m
console 4.12.0 True False False 62m
csi-snapshot-controller 4.12.0 True False False 66m
dns 4.12.0 True False False 76m
etcd 4.12.0 True False False 76m
authentication 4.13.0 True False False 59m
cloud-credential 4.13.0 True False False 85m
cluster-autoscaler 4.13.0 True False False 73m
config-operator 4.13.0 True False False 73m
console 4.13.0 True False False 62m
csi-snapshot-controller 4.13.0 True False False 66m
dns 4.13.0 True False False 76m
etcd 4.13.0 True False False 76m
...
----

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.12/docs/gather-job.yaml[]
include::https://raw.githubusercontent.com/openshift/insights-operator/release-4.13/docs/gather-job.yaml[]
----
. Copy your `insights-operator` image version:
+
Expand Down
2 changes: 1 addition & 1 deletion modules/installation-aws-upload-custom-rhcos-ami.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ variable:
----
$ export RHCOS_VERSION=<version> <1>
----
<1> The {op-system} VMDK version, like `4.12.0`.
<1> The {op-system} VMDK version, like `4.13.0`.

. Export the Amazon S3 bucket name as an environment variable:
+
Expand Down
Loading