Skip to content

Commit 1127ccf

Browse files
Merge pull request #3762 from MicrosoftDocs/main638893191187272146sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 39188b0 + 7f75b9c commit 1127ccf

12 files changed

+357
-665
lines changed

.openpublishing.redirection.azure-local.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,6 +1924,16 @@
19241924
"source_path": "azure-local/manage/manage-network-atc.md",
19251925
"redirect_url": "/windows-server/networking/network-atc/manage-network-atc",
19261926
"redirect_document_id": false
1927+
},
1928+
{
1929+
"source_path": "azure-local/migrate/migrate-cluster-same-hardware.md",
1930+
"redirect_url": "/azure-local/migrate/migration-azure-migrate-overview",
1931+
"redirect_document_id": false
1932+
},
1933+
{
1934+
"source_path": "azure-local/migrate/migrate-cluster-new-hardware.md",
1935+
"redirect_url": "/azure-local/migrate/migration-azure-migrate-overview",
1936+
"redirect_document_id": false
19271937
}
19281938
]
19291939
}

AKS-Arc/TOC.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@
8080
href: deploy-load-balancer-cli.md
8181
- name: Azure portal
8282
href: deploy-load-balancer-portal.md
83-
# - name: Troubleshoot issues
84-
# href: load-balancer-troubleshoot.md
8583
- name: Security
8684
items:
8785
- name: Encrypt etcd secrets
8886
href: encrypt-etcd-secrets.md
87+
- name: Validate signed container images
88+
href: validate-signed-container-images.md
8989
- name: AI and Machine Learning
9090
items:
9191
- name: Deploy an AI model with the AI toolchain operator
@@ -107,7 +107,7 @@
107107
- name: Restrict SSH access
108108
href: restrict-ssh-access.md
109109
- name: Deploy and configure Workload Identity
110-
href: workload-identity.md
110+
href: workload-identity.md
111111
- name: Storage
112112
href: concepts-storage.md
113113
items:

AKS-Arc/azure-rbac-local.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ ms.custom: devx-track-azurecli
66
author: sethmanheim
77
ms.author: sethm
88
ms.reviewer: leslielin
9-
ms.date: 05/21/2025
10-
ms.lastreviewed: 05/21/2025
9+
ms.date: 07/25/2025
10+
ms.lastreviewed: 07/25/2025
1111

1212
# Intent: As an IT Pro, I want to use Azure RBAC to authenticate connections to my AKS clusters over the Internet or on a private network.
1313
# Keyword: Kubernetes role-based access control AKS Azure RBAC AD
@@ -45,7 +45,17 @@ Before you begin, make sure you have the following prerequisites:
4545
az extension update --name connectedk8s
4646
```
4747

48-
- To interact with Kubernetes clusters, you must install [**kubectl**](https://kubernetes.io/docs/tasks/tools/) and [**kubelogin**](https://azure.github.io/kubelogin/install.html).
48+
- To interact with Kubernetes clusters, you must install [**kubectl**](https://kubernetes.io/docs/tasks/tools/) and [**kubelogin**](https://azure.github.io/kubelogin/install.html). You can use the following Azure CLI or Azure PowerShell commands to install both **kubectl** and **kubelogin**:
49+
50+
# [Azure CLI](#tab/cli)
51+
52+
Install kubectl locally using the [az aks install-cli](/cli/azure/aks?view=azure-cli-latest#az-aks-install-cli&preserve-view=true) command.
53+
54+
# [PowerShell](#tab/powershell)
55+
56+
Install kubectl locally using the [Install-AzAksCliTool](/powershell/module/az.aks/install-azaksclitool?view=azps-14.2.0&preserve-view=true) cmdlet.
57+
58+
---
4959
- The following permissions are required to enable Azure RBAC when creating a Kubernetes cluster:
5060
- To create a Kubernetes cluster, the [**Azure Kubernetes Service Arc Contributor**](/azure/role-based-access-control/built-in-roles/containers#azure-kubernetes-service-arc-contributor-role) role is required.
5161
- To use the `--enable-azure-rbac` parameter, the [**Role Based Access Control Administrator**](/azure/role-based-access-control/built-in-roles/privileged#role-based-access-control-administrator) role is required for access to the **Microsoft.Authorization/roleAssignments/write** permission.
@@ -222,4 +232,4 @@ az role definition delete -n "AKS Arc Deployment Reader"
222232
- [Access and identity options](concepts-security-access-identity.md) for AKS enabled by Azure Arc
223233
- [Create an Azure service principal with Azure CLI](/cli/azure/azure-cli-sp-tutorial-1)
224234
- Available Azure permissions for [Hybrid + Multicloud](/azure/role-based-access-control/resource-provider-operations#microsoftkubernetes)
225-
- Help to protect your cluster in other ways by following the guidance in the [security book for AKS enabled by Azure Arc](/azure/azure-arc/kubernetes/conceptual-security-book?toc=/azure/aks/aksarc/toc.json&bc=/azure/aks/aksarc/breadcrumb/toc.json).
235+
- Help to protect your cluster in other ways by following the guidance in the [security book for AKS enabled by Azure Arc](/azure/azure-arc/kubernetes/conceptual-security-book?toc=/azure/aks/aksarc/toc.json&bc=/azure/aks/aksarc/breadcrumb/toc.json).

AKS-Arc/kubernetes-rbac-local.md

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ title: Control access using Microsoft Entra ID and Kubernetes RBAC in AKS enable
33
description: Learn how to use Microsoft Entra group membership to restrict access to cluster resources using Kubernetes role-based access control (Kubernetes RBAC) in AKS Arc.
44
author: sethmanheim
55
ms.author: sethm
6-
ms.lastreviewed: 06/25/2025
7-
ms.reviewer: abha
6+
ms.lastreviewed: 07/25/2025
7+
ms.reviewer: leslielin
88
ms.topic: how-to
99
ms.custom:
1010
- devx-track-azurecli
11-
ms.date: 06/25/2025
11+
ms.date: 07/25/2025
1212

1313
# Intent: As an IT Pro, I need to learn how to enable Kubernetes role-based access control so that I can manage access to resources.
1414
# Keyword: Kubernetes role-based access control
@@ -20,16 +20,24 @@ ms.date: 06/25/2025
2020

2121
You can configure Azure Kubernetes Service (AKS) to use Microsoft Entra ID for user authentication. In this configuration, you sign in to a Kubernetes cluster using a Microsoft Entra authentication token. Once authenticated, you can use the built-in Kubernetes role-based access control (Kubernetes RBAC) to manage access to namespaces and cluster resources based on a user's identity or group membership.
2222

23-
This article describes how to control access using Kubernetes RBAC in a Kubernetes cluster based on Microsoft Entra group membership in AKS. You create a demo group and users in Microsoft Entra ID. Then, you create roles and role bindings in the cluster to grant the appropriate permissions to create and view resources.
23+
This article describes how to control access using Kubernetes RBAC in a Kubernetes cluster based on Microsoft Entra group membership in AKS. First, you create a demo group and users in Microsoft Entra ID. Then you create roles and role bindings in the cluster to grant the appropriate permissions to create and view resources.
2424

2525
## Prerequisites
2626

2727
Before you set up Kubernetes RBAC using Microsoft Entra ID, you must have the following prerequisites:
2828

29-
- An AKS enabled by Azure Arc cluster. If you need to set up your cluster, see the instructions for using the [Azure portal](aks-create-clusters-portal.md) or [Azure CLI](aks-create-clusters-cli.md).
29+
- An AKS Arc cluster. If you need to set up your cluster, see the instructions for using the [Azure portal](aks-create-clusters-portal.md) or [Azure CLI](aks-create-clusters-cli.md).
3030
- Azure CLI installed and configured. If you need to install CLI or upgrade, see [Install Azure CLI](/cli/azure/install-azure-cli).
31-
- **Azure CLI and the connectedk8s extension**. The Azure command-line interface (Azure CLI) is a set of commands used to create and manage Azure resources. To check whether you have the Azure CLI, open a command line tool, and type: `az -v`. Also, install the [connectedk8s extension](https://github.com/Azure/azure-cli-extensions/tree/main/src/connectedk8s) in order to open a channel to your Kubernetes cluster. For installation instructions, see [How to install the Azure CLI](/cli/azure/install-azure-cli).
32-
- **Kubectl**. The Kubernetes command-line tool, **kubectl**, enables you to run commands that target your Kubernetes clusters. To check whether you have installed kubectl, open a command line tool, and type: `kubectl version --client`. Make sure your kubectl client version is at least `v1.24.0`. For installation instructions, see [kubectl](https://kubernetes.io/docs/tasks/tools/#kubectl).
31+
- Azure CLI and the **connectedk8s** extension. The Azure command-line interface (Azure CLI) is a set of commands used to create and manage Azure resources. To check whether you have the Azure CLI, open a command prompt and type `az -v`. Also, install the [connectedk8s extension](https://github.com/Azure/azure-cli-extensions/tree/main/src/connectedk8s) in order to open a channel to your Kubernetes cluster. For installation instructions, see [How to install the Azure CLI](/cli/azure/install-azure-cli).
32+
- **Kubectl**. The Kubernetes command line tool, **kubectl**, enables you to run commands that target your Kubernetes clusters. To check whether you installed **kubectl**, open a command prompt and type `kubectl version --client`. Make sure your **kubectl** client version is at least **v1.24.0**. You can use the following Azure CLI or Azure PowerShell commands to install **kubectl**:
33+
34+
# [Azure CLI](#tab/cli)
35+
36+
Install kubectl locally using the [az aks install-cli](/cli/azure/aks?view=azure-cli-latest#az-aks-install-cli&preserve-view=true) command.
37+
38+
# [PowerShell](#tab/powershell)
39+
40+
Install kubectl locally using the [Install-AzAksCliTool](/powershell/module/az.aks/install-azaksclitool?view=azps-14.2.0&preserve-view=true) cmdlet.
3341
- You can access your Kubernetes cluster with the specified permissions either with direct mode or proxy mode.
3442
- To access the Kubernetes cluster directly using the `az aksarc get-credentials` command, you need the **Microsoft.HybridContainerService/provisionedClusterInstances/listUserKubeconfig/action**, which is included in the **Azure Kubernetes Service Arc Cluster User** role permissions
3543
- To access the Kubernetes cluster from anywhere with a proxy mode using `az connectedk8s proxy` command, you need the **Microsoft.Kubernetes/connectedClusters/listClusterUserCredential/action**, which is included in **Azure Arc-enabled Kubernetes Cluster User** role permission. Meanwhile, you need to verify that the agents and the machine performing the onboarding process meet the network requirements in [Azure Arc-enabled Kubernetes network requirements](/azure/azure-arc/kubernetes/network-requirements?tabs=azure-cloud#details).

0 commit comments

Comments
 (0)