Skip to content

Commit 1e156ad

Browse files
authored
Merge pull request #104052 from bmoore-msft/patch-19
Update cluster-configuration.md
2 parents 786b8c4 + 3137a93 commit 1e156ad

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

articles/aks/cluster-configuration.md

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,8 @@ Mariner can be deployed on AKS through Azure CLI or ARM templates.
130130

131131
### Prerequisites
132132

133-
1. You need the latest version of Azure CLI. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][azure-cli-install].
134-
2. You need the `aks-preview` Azure CLI extension for the ability to select the Mariner 2.0 operating system SKU. Run `az extension remove --name aks-preview` to clear any previous versions, then run `az extension add --name aks-preview`.
135-
3. If you don't already have kubectl installed, install it through Azure CLI using `az aks install-cli` or follow the [upstream instructions](https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/).
133+
1. You need the Azure CLI version 2.44.1 or later installed and configured. Run `az --version` to find the version currently installed. If you need to install or upgrade, see [Install Azure CLI][azure-cli-install].
134+
1. If you don't already have kubectl installed, install it through Azure CLI using `az aks install-cli` or follow the [upstream instructions](https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/).
136135

137136
### Deploy an AKS Mariner cluster with Azure CLI
138137

@@ -141,7 +140,7 @@ Use the following example commands to create a Mariner cluster.
141140
```azurecli
142141
az group create --name MarinerTest --location eastus
143142
144-
az aks create --name testMarinerCluster --resource-group MarinerTest --os-sku mariner
143+
az aks create --name testMarinerCluster --resource-group MarinerTest --os-sku mariner --generate-ssh-keys
145144
146145
az aks get-credentials --resource-group MarinerTest --name testMarinerCluster
147146
@@ -150,9 +149,14 @@ kubectl get pods --all-namespaces
150149

151150
### Deploy an AKS Mariner cluster with an ARM template
152151

153-
To add Mariner to an existing ARM template, you need to add `"osSKU": "mariner"` and `"mode": "System"` to `agentPoolProfiles` and set the apiVersion to 2021-03-01 or newer (`"apiVersion": "2021-03-01"`). The following deployment uses the ARM template "marineraksarm.yml".
152+
To add Mariner to an existing ARM template, you need to do the following:
154153

155-
```yml
154+
- Add `"osSKU": "mariner"` and `"mode": "System"` to agentPoolProfiles property.
155+
- Set the apiVersion to 2021-03-01 or newer: `"apiVersion": "2021-03-01"`
156+
157+
The following deployment uses the ARM template `marineraksarm.json`.
158+
159+
```json
156160
{
157161
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
158162
"contentVersion": "1.0.0.1",
@@ -173,6 +177,7 @@ To add Mariner to an existing ARM template, you need to add `"osSKU": "mariner"`
173177
},
174178
"dnsPrefix": {
175179
"type": "string",
180+
"defaultValue": "mariner",
176181
"metadata": {
177182
"description": "Optional DNS prefix to use with hosted Kubernetes API server FQDN."
178183
}
@@ -281,12 +286,12 @@ To add Mariner to an existing ARM template, you need to add `"osSKU": "mariner"`
281286
}
282287
```
283288

284-
Create this file on your system and fill it with the contents of the Mariner AKS YAML file.
289+
Create this file on your system and include the settings defined in the `marineraksarm.json` file.
285290

286291
```azurecli
287292
az group create --name MarinerTest --location eastus
288293
289-
az deployment group create --resource-group MarinerTest --template-file marineraksarm.yml --parameters clusterName=testMarinerCluster dnsPrefix=marineraks1 linuxAdminUsername=azureuser sshRSAPublicKey=`<contents of your id_rsa.pub>`
294+
az deployment group create --resource-group MarinerTest --template-file marineraksarm.json --parameters linuxAdminUsername=azureuser sshRSAPublicKey=`<contents of your id_rsa.pub>`
290295
291296
az aks get-credentials --resource-group MarinerTest --name testMarinerCluster
292297

0 commit comments

Comments
 (0)