Skip to content

Commit 1765795

Browse files
Merge pull request #228745 from schaffererin/aks-ubuntu-mariner-2
CBL-Mariner to just Mariner quick update
2 parents 41d9574 + 3e7e9e7 commit 1765795

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

articles/aks/concepts-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ You can control access to the API server using Kubernetes role-based access cont
4242
## Node security
4343

4444
AKS nodes are Azure virtual machines (VMs) that you manage and maintain.
45-
* Linux nodes run optimized versions of Ubuntu or CBL-Mariner.
45+
* Linux nodes run optimized versions of Ubuntu or 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, CBL-Mariner, macOS, Windows Subsystem for Linux).
33+
* Prepare a local machine with Unix-like operating system installed (for example, Ubuntu, 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 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.
29+
In an AKS cluster, your Kubernetes nodes run as Azure virtual machines (VMs). These Linux-based VMs use an Ubuntu or 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)