Skip to content

Commit 4c55c20

Browse files
Merge pull request #228693 from schaffererin/aks-ubuntu-mariner-1
Mariner-Ubuntu parity in AKS docs - minor updates
2 parents 8a7c9f5 + 455a957 commit 4c55c20

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

articles/aks/concepts-clusters-workloads.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ To run your applications and supporting services, you need a Kubernetes *node*.
7777

7878
The Azure VM size for your nodes defines CPUs, memory, size, and the storage type available (such as high-performance SSD or regular HDD). Plan the node size around whether your applications may require large amounts of CPU and memory or high-performance storage. Scale out the number of nodes in your AKS cluster to meet demand. For more information on scaling, see [Scaling options for applications in AKS](/concepts-scale.md).
7979

80-
In AKS, the VM image for your cluster's nodes is based on Ubuntu Linux or Windows Server 2019. When you create an AKS cluster or scale out the number of nodes, the Azure platform automatically creates and configures the requested number of VMs. Agent nodes are billed as standard VMs, so any VM size discounts (including [Azure reservations][reservation-discounts]) are automatically applied.
80+
In AKS, the VM image for your cluster's nodes is based on Ubuntu Linux, [Mariner Linux](use-mariner.md), or Windows Server 2019. When you create an AKS cluster or scale out the number of nodes, the Azure platform automatically creates and configures the requested number of VMs. Agent nodes are billed as standard VMs, so any VM size discounts (including [Azure reservations][reservation-discounts]) are automatically applied.
8181

8282
For managed disks, the default disk size and performance will be assigned according to the selected VM SKU and vCPU count. For more information, see [Default OS disk sizing](cluster-configuration.md#default-os-disk-sizing).
8383

articles/aks/concepts-security.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ You can control access to the API server using Kubernetes role-based access cont
4141

4242
## Node security
4343

44-
AKS nodes are Azure virtual machines (VMs) that you manage and maintain.
45-
* Linux nodes run an optimized Ubuntu distribution using the `containerd` or Docker container runtime.
44+
AKS nodes are Azure virtual machines (VMs) that you manage and maintain.
45+
* Linux nodes run optimized versions of Ubuntu or CBL-Mariner.
4646
* Windows Server nodes run an optimized Windows Server 2019 release using the `containerd` or Docker container runtime.
4747

4848
When an AKS cluster is created or scaled up, the nodes are automatically deployed with the latest OS security updates and configurations.

articles/aks/howto-deploy-java-liberty-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This article uses the Azure Marketplace offer for Open/WebSphere Liberty to acce
3030

3131
* This article requires at least version 2.31.0 of Azure CLI. If using Azure Cloud Shell, the latest version is already installed.
3232
* If running the commands in this guide locally (instead of Azure Cloud Shell):
33-
* Prepare a local machine with Unix-like operating system installed (for example, Ubuntu, macOS, Windows Subsystem for Linux).
33+
* Prepare a local machine with Unix-like operating system installed (for example, Ubuntu, CBL-Mariner, macOS, Windows Subsystem for Linux).
3434
* Install a Java SE implementation (for example, [Eclipse Open J9](https://www.eclipse.org/openj9/)).
3535
* Install [Maven](https://maven.apache.org/download.cgi) 3.5.0 or higher.
3636
* Install [Docker](https://docs.docker.com/get-docker/) for your OS.

articles/aks/node-updates-kured.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ You need the Azure CLI version 2.0.59 or later installed and configured. Run `az
2626

2727
## Understand the AKS node update experience
2828

29-
In an AKS cluster, your Kubernetes nodes run as Azure virtual machines (VMs). These Linux-based VMs use an Ubuntu image, with the OS configured to automatically check for updates every day. If security or kernel updates are available, they are automatically downloaded and installed.
29+
In an AKS cluster, your Kubernetes nodes run as Azure virtual machines (VMs). These Linux-based VMs use an Ubuntu or CBL-Mariner image, with the OS configured to automatically check for updates every day. If security or kernel updates are available, they are automatically downloaded and installed.
3030

3131
![AKS node update and reboot process with kured](media/node-updates-kured/node-reboot-process.png)
3232

0 commit comments

Comments
 (0)