From 3998d0de35ccf57b5a7d8e552756186d322fefa9 Mon Sep 17 00:00:00 2001 From: Brendan Daly Date: Tue, 21 Jul 2026 14:13:35 +0100 Subject: [PATCH] 1 Co-Authored-By: Claude Opus 4.6 --- .../creating_machinesets/creating-machineset-azure.adoc | 3 ++- modules/machineset-azure-ephemeral-os.adoc | 4 ++-- modules/machineset-creating-azure-ephemeral-os.adoc | 9 +++++---- .../machineset-customer-managed-encryption-azure.adoc | 2 +- modules/machineset-yaml-azure.adoc | 7 +++---- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/machine_management/creating_machinesets/creating-machineset-azure.adoc b/machine_management/creating_machinesets/creating-machineset-azure.adoc index c7f5eb7b5604..e40df2b49189 100644 --- a/machine_management/creating_machinesets/creating-machineset-azure.adoc +++ b/machine_management/creating_machinesets/creating-machineset-azure.adoc @@ -53,7 +53,7 @@ include::modules/machineset-azure-ultra-disk.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* link:https://docs.microsoft.com/en-us/azure/virtual-machines/disks-types#ultra-disks[{azure-full} ultra disks documentation] +* link:https://docs.microsoft.com/en-us/azure/virtual-machines/disks-types#ultra-disks[Ultra disks ({azure-short} documentation)] * xref:../../storage/container_storage_interface/persistent-storage-csi-azure.adoc#machineset-azure-ultra-disk_persistent-storage-csi-azure[Machine sets that deploy machines on ultra disks using CSI PVCs] * xref:../../storage/persistent_storage/persistent-storage-azure.adoc#machineset-azure-ultra-disk_persistent-storage-azure[Machine sets that deploy machines on ultra disks using in-tree PVCs] @@ -86,6 +86,7 @@ include::modules/nvidia-gpu-aws-deploying-the-node-feature-discovery-operator.ad [role="_additional-resources"] .Additional resources + * xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#machineset-azure-enabling-accelerated-networking-new-install_installing-azure-customizations[Enabling Accelerated Networking during installation] // Enabling Accelerated Networking on an existing Microsoft Azure cluster diff --git a/modules/machineset-azure-ephemeral-os.adoc b/modules/machineset-azure-ephemeral-os.adoc index c901f32fcace..fdd29cac6d51 100644 --- a/modules/machineset-azure-ephemeral-os.adoc +++ b/modules/machineset-azure-ephemeral-os.adoc @@ -7,9 +7,9 @@ = Machine sets that deploy machines on Ephemeral OS disks [role="_abstract"] -You can create a compute machine set running on {azure-first} that deploys machines on Ephemeral OS disks. Ephemeral OS disks use local VM capacity rather than remote {azure-short} Storage. This configuration therefore incurs no additional cost and provides lower latency for reading, writing, and reimaging. +You can create a compute machine set running on {azure-first} that deploys machines on Ephemeral OS disks. Ephemeral OS disks use local VM capacity rather than remote {azure-full} Storage. The configuration, therefore, incurs no additional cost and provides lower latency for reading, writing, and reimaging. [role="_additional-resources"] .Additional resources -* link:https://docs.microsoft.com/en-us/azure/virtual-machines/ephemeral-os-disks[Ephemeral OS disks for {azure-short} VMs ({azure-full} documentation)] +* link:https://docs.microsoft.com/en-us/azure/virtual-machines/ephemeral-os-disks[Ephemeral OS disks for {azure-short} VMs ({azure-short} documentation)] diff --git a/modules/machineset-creating-azure-ephemeral-os.adoc b/modules/machineset-creating-azure-ephemeral-os.adoc index 2b1688006f73..d6a70a61428d 100644 --- a/modules/machineset-creating-azure-ephemeral-os.adoc +++ b/modules/machineset-creating-azure-ephemeral-os.adoc @@ -7,11 +7,13 @@ = Creating machines on Ephemeral OS disks by using compute machine sets [role="_abstract"] -To improve performance and reduce storage costs, you can host the OS disk directly on the local storage of the virtual machines (VMs) rather than on remote {azure-first} Storage. You can launch machines on Ephemeral OS disks on {azure-short} by editing your compute machine set YAML file. +To improve performance and reduce storage costs, you can host the OS disk directly on the local storage of the virtual machines (VMs) rather than on remote {azure-first} Storage. + +You launch machines on Ephemeral OS disks on {azure-short} by editing your compute machine set YAML file. .Prerequisites -* Have an existing {azure-full} cluster. +* Have an existing {azure-short} cluster. .Procedure @@ -50,7 +52,6 @@ where: ==== The implementation of Ephemeral OS disk support in {product-title} only supports the `CacheDisk` placement type. Do not change the `placement` configuration setting. ==== - . Create a compute machine set using the updated configuration: + [source,terminal] @@ -60,4 +61,4 @@ $ oc create -f .yaml .Verification -* On the {azure-full} portal, review the *Overview* page for a machine deployed by the compute machine set, and verify that the `Ephemeral OS disk` field is set to `OS cache placement`. +* On the {azure-short} portal, review the *Overview* page for a machine deployed by the compute machine set, and verify that the `Ephemeral OS disk` field is set to `OS cache placement`. diff --git a/modules/machineset-customer-managed-encryption-azure.adoc b/modules/machineset-customer-managed-encryption-azure.adoc index b99fddd6cdb8..59168dcfdabe 100644 --- a/modules/machineset-customer-managed-encryption-azure.adoc +++ b/modules/machineset-customer-managed-encryption-azure.adoc @@ -39,4 +39,4 @@ providerSpec: [role="_additional-resources"] .Additional resources -* https://docs.microsoft.com/en-us/azure/virtual-machines/disk-encryption#customer-managed-keys[Customer-managed keys ({azure-short} documentation)] \ No newline at end of file +* link:https://docs.microsoft.com/en-us/azure/virtual-machines/disk-encryption#customer-managed-keys[Customer-managed keys ({azure-short} documentation)] \ No newline at end of file diff --git a/modules/machineset-yaml-azure.adoc b/modules/machineset-yaml-azure.adoc index 21e3f7e5964b..02dc4a4e5fa7 100644 --- a/modules/machineset-yaml-azure.adoc +++ b/modules/machineset-yaml-azure.adoc @@ -16,8 +16,7 @@ You can define a machine set YAML to provision nodes by specifying parameters su The sample YAML defines a compute machine set that runs in the `1` {azure-first} zone in a region and creates nodes that are labeled with ifndef::infra[`node-role.kubernetes.io/: ""`.] -ifdef::infra[`node-role.kubernetes.io/infra: ""`.] -The YAML file specifies a taint to prevent user workloads from being scheduled on infra nodes. After adding the `NoSchedule` taint on the infrastructure node, existing DNS pods running on that node are marked as `misscheduled`. You must either delete or link:https://access.redhat.com/solutions/6592171[add toleration on `misscheduled` DNS pods]. +ifdef::infra[`node-role.kubernetes.io/infra: ""`. The YAML specifies a taint to prevent user workloads from being scheduled on infra nodes. After adding the `NoSchedule` taint on the infrastructure node, existing DNS pods running on that node are marked as `misscheduled`. You must either delete or link:https://access.redhat.com/solutions/6592171[add toleration on `misscheduled` DNS pods]. In the sample, `` is the infrastructure ID label that is based on the cluster ID that you set when you provisioned the cluster, and ifndef::infra[``] @@ -127,7 +126,7 @@ endif::infra[] where: -``:: Specifies the infrastructure ID that is based on the cluster ID that you set when you provisioned the cluster. If you have the OpenShift CLI installed, you can obtain the infrastructure ID by running the following command: +``:: Specifies the infrastructure ID that is based on the cluster ID that you set when you provisioned the cluster. If you have the {oc-first} installed, you can obtain the infrastructure ID by running the following command: + [source,terminal] ---- @@ -183,4 +182,4 @@ ifeval::["{context}" == "creating-infrastructure-machinesets"] endif::[] ifeval::["{context}" == "cluster-tasks"] :!infra: -endif::[] \ No newline at end of file +endif::[]