Skip to content

Commit 1c065dc

Browse files
authored
Merge pull request #17494 from sethmanheim/ws3-27
AKS: WS only for 22H2
2 parents 9e9cd55 + 9e5df07 commit 1c065dc

File tree

97 files changed

+669
-686
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+669
-686
lines changed

AKS-Arc/TOC.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,8 @@
278278
items:
279279
- name: AKS Edge Essentials PowerShell
280280
href: ./reference/aks-edge-ps/index.md
281+
- name: Get support
282+
href: aks-edge-help-support.md
281283
- name: Troubleshooting
282284
href: aks-edge-troubleshoot-overview.md
283285
- name: Logs
@@ -364,7 +366,7 @@
364366
href: tutorial-kubernetes-prepare-application.md
365367
- name: 2 - Create container registry
366368
href: tutorial-kubernetes-prepare-azure-container-registry.md
367-
- name: 3 - Deploy a workload cluster
369+
- name: 3 - Deploy a Kubernetes cluster
368370
href: tutorial-kubernetes-deploy-cluster.md
369371
- name: 4 - Run an application
370372
href: tutorial-kubernetes-deploy-application.md
@@ -554,7 +556,7 @@
554556
- name: Use OpenFaaS
555557
href: openfaas.md
556558
- name: Use Bridge to Kubernetes with Visual Studio Code
557-
href: https://code.visualstudio.com/docs/containers/bridge-to-kubernetes
559+
href: /visualstudio/bridge/bridge-to-kubernetes-vs-code
558560
- name: Use Bridge to Kubernetes with Visual Studio
559561
href: /visualstudio/containers/bridge-to-kubernetes
560562
- name: Deploy a Java application with Open Liberty or WebSphere Liberty
@@ -573,7 +575,7 @@
573575
href: aks-hybrid-preview-uninstall.md
574576
- name: Troubleshooting overview
575577
href: troubleshoot-overview.md
576-
- name: Azure Arc enabled Kubernetes
578+
- name: Azure Arc-enabled Kubernetes
577579
href: known-issues-arc.yml
578580
- name: Pre-installation validation tests
579581
href: validation-tests.md
@@ -599,12 +601,6 @@
599601
href: known-issues-uninstall.yml
600602
- name: Other
601603
href: known-issues.yml
602-
- name: Azure Local issues
603-
items:
604-
- name: Cluster validation reporting in Azure Local
605-
href: /azure-stack/hci/manage/validate-qos
606-
- name: CredSSP in Azure Local
607-
href: /azure-stack/hci/manage/troubleshoot-credssp
608604
- name: Support policies
609605
href: support-policies.md
610606
- name: Get support

AKS-Arc/ad-sso.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
---
2-
title: Use Active Directory single sign-on for secure connection to Kubernetes API server in AKS enabled by Azure Arc
2+
title: Use Active Directory single sign-on for secure connection to Kubernetes API server in AKS on Windows Server
33
description: Use Active Directory Authentication to securely connect to the API server with SSO credentials
44
author: sethmanheim
55
ms.topic: how-to
6-
ms.date: 08/07/2024
6+
ms.date: 04/02/2025
77
ms.author: sethm
88
ms.lastreviewed: 1/14/2022
9-
ms.reviewer: sulahiri
9+
ms.reviewer: leslielin
1010

1111
# Intent: As an IT Pro, I want to ue Active Directory Authentication to securely connect to the Kubernetes API server with SSO credentials.
1212
# Keyword: secure connection to Kubernetes API server
1313

1414
---
1515

16-
# Use Active Directory single sign-on for secure connection to Kubernetes API server in AKS enabled by Azure Arc
16+
# Use Active Directory single sign-on for secure connection to Kubernetes API server in AKS on Windows Server
1717

1818
[!INCLUDE [applies-to-azure stack-hci-and-windows-server-skus](includes/aks-hci-applies-to-skus/aks-hybrid-applies-to-azure-stack-hci-windows-server-sku.md)]
1919

20-
You can create a secure connection to your Kubernetes API server in AKS enabled by Arc using Active Directory (AD) single sign-on (SSO) credentials.
20+
You can create a secure connection to your Kubernetes API server in AKS on Windows Server using Active Directory (AD) single sign-on (SSO) credentials.
2121

22-
## Overview of AD in AKS enabled by Arc
22+
## Overview of AD in AKS on Windows Server
2323

24-
Without Active Directory authentication, you must rely on a certificate-based _kubeconfig_ file when you connect to the API server via the `kubectl` command. The **kubeconfig** file contains secrets such as private keys and certificates that need to be carefully distributed, which can be a significant security risk.
24+
Without Active Directory authentication, you must rely on a certificate-based *kubeconfig* file when you connect to the API server via the `kubectl` command. The **kubeconfig** file contains secrets such as private keys and certificates that need to be carefully distributed, which can be a significant security risk.
2525

26-
As an alternative to using certificate-based kubeconfig, you can use AD SSO credentials as a secure way to connect to the API server. AD integration with AKS Arc lets users on a Windows domain-joined machine connect to the API server via `kubectl` using their SSO credentials. This removes the need to manage and distribute certificate-based kubeconfig files that contain private keys.
26+
As an alternative to using certificate-based **kubeconfig**, you can use AD SSO credentials as a secure way to connect to the API server. AD integration with AKS Arc lets users on a Windows domain-joined machine connect to the API server via `kubectl` using their SSO credentials. This removes the need to manage and distribute certificate-based **kubeconfig** files that contain private keys.
2727

28-
AD integration uses AD kubeconfig, which is distinct from the certificate-based kubeconfig files and doesn't contain any secrets. However, the certificate-based kubeconfig file can be used for backup purposes, such as troubleshooting, if there are issues with connecting using Active Directory credentials.
28+
AD integration uses AD **kubeconfig**, which is distinct from the certificate-based **kubeconfig** files and doesn't contain any secrets. However, the certificate-based **kubeconfig** file can be used for backup purposes, such as troubleshooting, if there are issues with connecting using Active Directory credentials.
2929

3030
Another security benefit with AD integration is that the users and groups are stored as [security identifiers (SIDs)](/troubleshoot/windows-server/identity/security-identifiers-in-windows). Unlike group names, SIDs are immutable and unique and therefore present no naming conflicts.
3131

@@ -77,7 +77,7 @@ Before you can install AD authentication, the workload cluster must be installed
7777

7878
#### Option 1
7979

80-
For a domain-joined Azure Local or Windows Server cluster, open PowerShell as an administrator and run the following command:
80+
For a domain-joined Windows Server cluster, open PowerShell as an administrator and run the following command:
8181

8282
```powershell
8383
Install-AksHciAdAuth -name mynewcluster1 -keytab .\current.keytab -SPN k8s/[email protected] -adminUser contoso\bob

AKS-Arc/adapt-apps-mixed-os-clusters.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Adapt applications for use in mixed-OS Kubernetes clusters
3-
description: Learn how to use node selectors or taints and tolerations on Azure Kubernetes Service to ensure applications in mixed OS Kubernetes clusters running on AKS Arc are scheduled on the correct worker node operating system.
3+
description: Learn how to use node selectors or taints and tolerations on Azure Kubernetes Service to ensure applications in mixed OS Kubernetes clusters running on AKS on Windows Server are scheduled on the correct worker node operating system.
44
author: sethmanheim
55
ms.topic: how-to
66
ms.date: 06/27/2024
@@ -16,9 +16,9 @@ ms.reviewer: abha
1616

1717
[!INCLUDE [applies-to-azure stack-hci-and-windows-server-skus](includes/aks-hci-applies-to-skus/aks-hybrid-applies-to-azure-stack-hci-windows-server-sku.md)]
1818

19-
AKS enabled by Arc enables you to run Kubernetes clusters with both Linux and Windows nodes, but you must make small edits to your apps for use in these mixed-OS clusters. This how-to guide describes how to ensure your application gets scheduled on the right host OS using either node selectors or taints and tolerations.
19+
AKS on Windows Server enables you to run Kubernetes clusters with both Linux and Windows nodes, but you must make small edits to your apps for use in these mixed-OS clusters. This how-to guide describes how to ensure your application gets scheduled on the right host OS using either node selectors or taints and tolerations.
2020

21-
This article assumes a basic understanding of Kubernetes concepts. For more information, see [Kubernetes core concepts for AKS enabled by Arc](kubernetes-concepts.md).
21+
This article assumes a basic understanding of Kubernetes concepts. For more information, see [Kubernetes core concepts for AKS on Windows Server](kubernetes-concepts.md).
2222

2323
## Node selectors
2424

AKS-Arc/add-ons.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Add-ons and extensions available for AKS enabled by Arc
3-
description: Learn about what add-ons and integrations are supported in AKS enabled by Azure Arc.
2+
title: Add-ons and extensions available for AKS on Windows Server
3+
description: Learn about what add-ons and integrations are supported in AKS on Windows Server.
44
author: sethmanheim
55
ms.topic: how-to
66
ms.date: 02/15/2024
@@ -9,9 +9,9 @@ ms.lastreviewed: 02/15/2023
99
ms.reviewer: baziwane
1010
---
1111

12-
# Add-ons, extensions, and other integrations with AKS enabled by Arc
12+
# Add-ons, extensions, and other integrations with AKS on Windows Server
1313

14-
Azure Kubernetes Service (AKS) enabled by Azure Arc provides augmented functionality for your Kubernetes cluster, mainly through extensions that are supported by Microsoft. There are also many integrations offered by open-source projects and third-party organizations. It's important to note that these integrations, which are not supported by AKS Arc, are not included in the [AKS Arc support policy](support-policies.md).
14+
Azure Kubernetes Service (AKS) on Windows Server provides augmented functionality for your Kubernetes cluster, mainly through extensions that are supported by Microsoft. There are also many integrations offered by open-source projects and third-party organizations. It's important to note that these integrations, which are not supported by AKS Arc, are not included in the [AKS Arc support policy](support-policies.md).
1515

1616
## Add-ons
1717

@@ -30,15 +30,15 @@ The following rules are used by AKS Arc for applying updates to installed add-on
3030
| [Install-AksHciCsiNfs](reference/ps/install-akshcicsinfs.md) | Installs the CSI NFS plug-in to a cluster. |
3131
| [Install-AksHciCsiSmb](reference/ps/install-akshcicsismb.md) | Installs the CSI SMB plug-in to a cluster. |
3232
| [Install-AksHciGmsaWebhook](reference/ps/install-akshcigmsawebhook.md) | Installs gMSA webhook add-on to the cluster. |
33-
| [Install-AksHciMonitoring](reference/ps/install-akshcimonitoring.md) | Installs Prometheus for monitoring in the AKS enabled by Arc deployment. |
33+
| [Install-AksHciMonitoring](reference/ps/install-akshcimonitoring.md) | Installs Prometheus for monitoring in the AKS on Windows Server deployment. |
3434

3535
## Azure Arc extensions
3636

3737
Cluster extensions build on top of certain Helm charts and provide an Azure Resource Manager-driven experience for installation and lifecycle management of different Azure capabilities on top of your Kubernetes cluster. You can [deploy these extensions to your clusters](/azure/azure-arc/kubernetes/extensions) to improve cluster management.
3838

3939
### Available extensions
4040

41-
For more information about the specific cluster extensions for AKS enabled by Arc, see [Currently available extensions](/azure/azure-arc/kubernetes/extensions-release).
41+
For more information about the specific cluster extensions for AKS on Windows Server, see [Currently available extensions](/azure/azure-arc/kubernetes/extensions-release).
4242

4343
## Difference between extensions and add-ons
4444

@@ -58,4 +58,4 @@ The following table shows examples of open-source and third-party integrations:
5858

5959
## Next steps
6060

61-
- [AKS enabled by Arc overview](aks-overview.md)
61+
- [AKS on Windows Server overview](overview.md)

AKS-Arc/aks-edge-help-support.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
---
2+
title: Get support for AKS Edge Essentials
3+
description: Learn about how to get support and open a support request for AKS Edge Essentials.
4+
author: sethmanheim
5+
ms.topic: conceptual
6+
ms.date: 04/07/2025
7+
ms.author: sethm
8+
9+
# Intent: As an IT Pro, I want to find out what options are available to get help and support, such as creating a ticket.
10+
# Keyword: AKS Edge Essentials support help requests
11+
---
12+
13+
# Get support for AKS Edge Essentials
14+
15+
If you encounter an issue with AKS Edge Essentials, this article describes how to open a support request.
16+
17+
## Go to Support + troubleshooting in the Azure portal
18+
19+
1. Sign in to the [Azure portal](https://portal.azure.com).
20+
1. Browse to the subscription you're using for AKS Edge Essentials. Select the subscription to open its dashboard.
21+
1. From the **Support + troubleshooting** category in the navigation menu in the left-hand pane, select **New Support Request**:
22+
23+
:::image type="content" source="media/help-support/new-support-request-sidebar.png" alt-text="Screenshot of the Azure portal Help and Support sidebar." lightbox="media/help-support/new-support-request-sidebar.png":::
24+
25+
1. From the dropdown, select the **Technical** issue type:
26+
27+
:::image type="content" source="media/help-support/select-type.png" alt-text="Screenshot of issue type selection." lightbox="media/help-support/select-type.png":::
28+
29+
1. Your subscription name should auto-populate in the **Subscription** field. If it doesn't, select it from the dropdown.
30+
31+
1. Select the **All services** button, then select the **Service type** dropdown. Begin typing **Edge** in the search box to locate the **AKS Edge Essentials** service in the **Compute** category.
32+
33+
:::image type="content" source="media/help-support/service-type-edge.png" alt-text="Screenshot showing service selection." lightbox="media/help-support/service-type-edge.png":::
34+
35+
1. Add a short description of your issue in the **Summary** field.
36+
37+
1. Select the appropriate **Problem type** from the dropdown menu for your issue (for example, **Setup and configuration**). Also, select a **Problem subtype** (for example, **Deployment**):
38+
39+
:::image type="content" source="media/help-support/problem-type-edge.png" alt-text="Screenshot of completed problem type form." lightbox="media/help-support/problem-type-edge.png":::
40+
41+
1. Select **Next**.
42+
43+
1. Review the proposed **Solutions** to determine if they address your issue.
44+
45+
1. If the solutions are not applicable, select **Return to support request** at the top of the page.
46+
47+
1. Select **Next**.
48+
49+
1. Fill in the problem details and description in the appropriate fields:
50+
51+
:::image type="content" source="media/help-support/service-request-details.png" alt-text="Screenshot showing details of service request." lightbox="media/help-support/service-request-details.png":::
52+
53+
1. Scroll down and fill in your preferred support method of contact:
54+
55+
:::image type="content" source="media/help-support/service-request-support-method.png" alt-text="Screenshot showing support method preferences." lightbox="media/help-support/service-request-support-method.png":::
56+
57+
1. Select **Next**. Review the information you submitted. If anything is incorrect, select **Previous** and correct it. When all looks correct, select **Create**.
58+
59+
:::image type="content" source="media/help-support/review-create-edge.png" alt-text="Screenshot of confirmation screen to create support request." lightbox="media/help-support/review-create-edge.png":::
60+
61+
## Next steps
62+
63+
- [Troubleshoot common issues in AKS Edge Essentials](aks-edge-troubleshoot-overview.md)

AKS-Arc/aks-edge-licensing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The volume licensing model is only available in the Microsoft Enterprise Agreeme
3232
3333
### Third party access for software purchased via hoster's enterprise agreement
3434

35-
Third-party access to solutions built on the volume licensing model procured via EA is granted via the [Azure Customer Solution](https://wwlpdocumentsearch.blob.core.windows.net/prodv2/Licensing_brief_PLT_Microsoft_Azure_Customer_Solution%20(9).pdf?sv=2020-08-04&se=2123-03-31T18:47:42Z&sr=b&sp=r&sig=dXbUQPxSo4dF1eANpQ8Zkr6ZA%2FgXxGBhCeUMEeoIdA0%3D). This means that, if the end customer needs to deploy a disconnected AKS Edge Essentials, a hoster/service provider needing a disconnected scenario is able to use the AKS Edge Essentials volume licensing model purchased with an EA. The volume licensing model doesn't offer the same per-tenant billing and CSP Partner Center integration benefits as the pay-as-you-use model, but it eliminates the need to connect the AKS Edge Essentials clusters to Azure to report usage.
35+
Third-party access to solutions built on the volume licensing model procured via EA is granted via the Azure Customer Solution. This means that, if the end customer needs to deploy a disconnected AKS Edge Essentials, a hoster/service provider needing a disconnected scenario is able to use the AKS Edge Essentials volume licensing model purchased with an EA. The volume licensing model doesn't offer the same per-tenant billing and CSP Partner Center integration benefits as the pay-as-you-use model, but it eliminates the need to connect the AKS Edge Essentials clusters to Azure to report usage.
3636

3737
> [!CAUTION]
3838
> Microsoft will be a controller of [personal data](https://www.microsoft.com/licensing/terms/product/Glossary/all) processed in connection with your use of AKS Edge Essentials, and Microsoft handles the [personal data](https://www.microsoft.com/licensing/terms/product/Glossary/all) in accordance with the [Microsoft Privacy Statement](https://aka.ms/privacy).

AKS-Arc/aks-hybrid-preview-uninstall.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Before you begin - uninstall the AKS cluster provisioning preview
33
description: Learn how to uninstall the AKS cluster provisioning from Azure preview.
44
ms.topic: overview
55
ms.custom: devx-track-azurecli
6-
ms.date: 01/30/2024
6+
ms.date: 04/03/2025
77
author: sethmanheim
88
ms.author: sethm
99
ms.reviewer: guanghu
@@ -14,7 +14,7 @@ ms.lastreviewed: 01/30/2024
1414

1515
[!INCLUDE [aks-hybrid-applies-to-azure-stack-hci-windows-server-sku](includes/aks-hci-applies-to-skus/aks-hybrid-applies-to-azure-stack-hci-windows-server-sku.md)]
1616

17-
This step is only required if you installed the AKS cluster provisioning from Azure preview. The preview ended with the release of [AKS enabled by Azure Arc on Azure Local](aks-overview.md). This article describes the steps to uninstall the preview bits before upgrading to AKS Arc.
17+
This step is only required if you installed the AKS cluster provisioning from Azure preview. The preview ended with the release of [AKS on Azure Local](aks-overview.md). This article describes the steps to uninstall the preview bits before upgrading to AKS Arc.
1818

1919
## Step 1: delete all preview AKS clusters and Azure vnets created using Az CLI
2020

0 commit comments

Comments
 (0)