Merge pull request #314386 from dominicbetts/removeVKS

prmerger-automator[bot] · web-flow · commit 573a9474d424 · 2026-04-07T10:50:26.000Z
AIO: Revert VKS changes
diff --git a/articles/iot-operations/deploy-iot-ops/howto-deploy-iot-operations.md b/articles/iot-operations/deploy-iot-ops/howto-deploy-iot-operations.md
@@ -170,9 +170,6 @@ One at a time, run each Azure CLI command on the **Automation** tab in a termina
    > [!TIP]
    > The `init` command only needs to be run once per cluster. If you're reusing a cluster that already had Azure IoT Operations version 0.8.0 deployed on it, you can skip this step.
 
-    > [!IMPORTANT]
-    > When you initialize your Azure IoT Operations instance on a VKS cluster with its [pod security admission controller running in restricted mode](https://techdocs.broadcom.com/us/en/vmware-cis/vcf/vsphere-supervisor-services-and-standalone-components/latest/managing-vsphere-kuberenetes-service-clusters-and-workloads/managing-security-for-tkg-service-clusters/configure-psa-for-tkr-1-25-and-later.html) you must include the `--cm-config global.telemetry.logs.enabled=false` flag when you run `az iot ops init`.
-
    This command might take several minutes to complete. You can watch the progress in the deployment progress display in the terminal.
 
 1. Deploy Azure IoT Operations. Copy and run the provided [az iot ops create](/cli/azure/iot/ops#az-iot-ops-create) command. This command might take several minutes to complete. You can watch the progress in the deployment progress display in the terminal.
diff --git a/articles/iot-operations/deploy-iot-ops/howto-deploy-iot-test-operations.md b/articles/iot-operations/deploy-iot-ops/howto-deploy-iot-test-operations.md
@@ -155,9 +155,6 @@ One at a time, run each Azure CLI command on the **Automation** tab in a termina
 
     This command might take several minutes to complete. You can watch the progress in the deployment progress display in the terminal.
 
-    > [!IMPORTANT]
-    > When you initialize your Azure IoT Operations instance on a VKS cluster with its [pod security admission controller running in restricted mode](https://techdocs.broadcom.com/us/en/vmware-cis/vcf/vsphere-supervisor-services-and-standalone-components/latest/managing-vsphere-kuberenetes-service-clusters-and-workloads/managing-security-for-tkg-service-clusters/configure-psa-for-tkr-1-25-and-later.html) you must include the `--cm-config global.telemetry.logs.enabled=false` flag when you run `az iot ops init`.
-
 1. To deploy Azure IoT Operations, copy and run the provided [az iot ops create](/cli/azure/iot/ops#az-iot-ops-create) command. This command might take several minutes to complete. You can watch the progress in the deployment progress display in the terminal.
 
 1. Once all of the Azure CLI commands complete successfully, you can close the **Install Azure IoT Operations** wizard.
diff --git a/articles/iot-operations/deploy-iot-ops/howto-prepare-cluster.md b/articles/iot-operations/deploy-iot-ops/howto-prepare-cluster.md
@@ -12,19 +12,19 @@ ms.date: 10/23/2024
 
 # Prepare your Azure Arc-enabled Kubernetes cluster
 
-An Azure Arc-enabled Kubernetes cluster is a prerequisite for deploying Azure IoT Operations. This article describes how to prepare a cluster before you deploy Azure IoT Operations. This article includes guidance for Ubuntu, Windows, Azure Local, and vSphere Kubernetes Service (VKS), formerly Tanzu Kubernetes Grid Service.
+An Azure Arc-enabled Kubernetes cluster is a prerequisite for deploying Azure IoT Operations. This article describes how to prepare a cluster before you deploy Azure IoT Operations. This article includes guidance for Ubuntu, Windows, Azure Local, and Tanzu Kubernetes Grid (TKG).
 
 If you want to deploy Azure IoT Operations quickly and run a sample workload in a test environment, see the [Quickstart: Run Azure IoT Operations in GitHub Codespaces with K3s](../get-started-end-to-end-sample/quickstart-deploy.md).
 
 ## Prerequisites
 
-For multi-node deployments, K3s for deployments on Ubuntu, AKS deployments on Azure Local, and VKS. Azure Kubernetes Service (AKS) Edge Essentials for Windows only supports single-node deployments.
+For multi-node deployments, K3s for deployments on Ubuntu, AKS deployments on Azure Local, and Tanzu Kubernetes release (TKr) on TKG. Azure Kubernetes Service (AKS) Edge Essentials for Windows only supports single-node deployments.
 
 ### [Ubuntu](#tab/ubuntu)
 
 To prepare an Azure Arc-enabled Kubernetes cluster, you need:
 
-[!INCLUDE [Cluster prerequisites for Ubuntu and VKS](../includes/cluster-prerequisites.md)]
+[!INCLUDE [Cluster prerequisites for Ubuntu and Tanzu](../includes/cluster-prerequisites.md)]
 
 * Hardware that meets the system requirements:
 
@@ -60,20 +60,20 @@ To prepare an Azure Arc-enabled Kubernetes cluster, you need:
   * [Azure IoT Operations supported environments](./overview-deploy.md#supported-environments).
   * [Azure Arc-enabled Kubernetes system requirements](/azure/azure-arc/kubernetes/system-requirements).
     
-### [VKS](#tab/vks)
+### [TKG with a management cluster](#tab/tkgm)
 
-To prepare a VKS cluster, you need:
+To prepare a TKG workload cluster, you need:
 
-[!INCLUDE [Cluster prerequisites for Ubuntu and VKS](../includes/cluster-prerequisites.md)]
+[!INCLUDE [Cluster prerequisites for Ubuntu and Tanzu](../includes/cluster-prerequisites.md)]
 
-- [vSphere Kubernetes Service](https://techdocs.broadcom.com/us/en/vmware-cis/vcf/vsphere-supervisor-services-and-standalone-components/latest/release-notes/vmware-tanzu-kubernetes-grid-service-release-notes.html)
+- [TKG with a standalone management cluster.](https://techdocs.broadcom.com/us/en/vmware-tanzu/standalone-components/tanzu-kubernetes-grid/2-5/tkg/mgmt-index.html)
 
 - Hardware that meets the system requirements:
 
   - [Azure IoT Operations supported environments](./overview-deploy.md#supported-environments).
   - [Azure Arc-enabled Kubernetes system requirements](/azure/azure-arc/kubernetes/system-requirements).
     
-  - [Requirements for running VKS clusters](https://techdocs.broadcom.com/us/en/vmware-cis/vcf/vsphere-supervisor-services-and-standalone-components/latest/managing-vsphere-kubernetes-service/running-tkg-service-clusters.html)
+  - [TKG standalone management cluster requirements.](https://techdocs.broadcom.com/us/en/vmware-tanzu/standalone-components/tanzu-kubernetes-grid/2-5/tkg/mgmt-reqs-index.html)
     
 ---
 
@@ -239,12 +239,21 @@ By default, a Kubernetes cluster is created with a node pool that can run Linux
 
 Then, once you have an Azure Arc-enabled Kubernetes cluster, you can [deploy Azure IoT Operations](howto-deploy-iot-operations.md).
 
-### [VKS](#tab/vks)
+### [TKG with a management cluster](#tab/tkgm)
 
-For guidance on setting up a VKS cluster, see [Deploying VKS Service Clusters](https://techdocs.broadcom.com/us/en/vmware-cis/vcf/vsphere-supervisor-services-and-standalone-components/latest/managing-vsphere-kubernetes-service/running-tkg-service-clusters/deploying-tkg-service-clusters.html).
+To prepare a TKG workload cluster, you need:
 
-> [!IMPORTANT]
-> When you initialize your Azure IoT Operations instance on a VKS cluster with its [pod security admission controller running in restricted mode](https://techdocs.broadcom.com/us/en/vmware-cis/vcf/vsphere-supervisor-services-and-standalone-components/latest/managing-vsphere-kuberenetes-service-clusters-and-workloads/managing-security-for-tkg-service-clusters/configure-psa-for-tkr-1-25-and-later.html) you must include the `--cm-config global.telemetry.logs.enabled=false` flag when you run `az iot ops init`.
+- A single-node or multi-node TKG workload cluster. For guidance, see the [Tanzu documentation](https://techdocs.broadcom.com/us/en/vmware-tanzu/standalone-components/tanzu-kubernetes-grid/2-5/tkg/workload-clusters-index.html).
+
+### Update pod security admission settings
+
+Before deploying Azure IoT Operations, you will need to update the Pod Security Admission settings on your TKG cluster. Applying this file will pre-create namespace labels and set pod security to `privileged`.
+
+
+
+```azurecli
+kubectl apply -f https://raw.githubusercontent.com/Azure-Samples/explore-iot-operations/main/samples/tanzu-config/psa.yaml
+```
 
 ### Arc-enable your cluster
 
@@ -299,7 +308,7 @@ Connect your cluster to Azure Arc so that it can be managed remotely.
    
   Save the output of this command to use in the next steps.
 
-1. Connect to the VKS cluster. Edit the custom resource for the workload cluster with the issuer URL from the previous step.
+1. Connect to the TKG management cluster. Edit the custom resource for the workload cluster with the issuer URL from the previous step.
 
    ```azurecli
    kubectl edit cluster <CLUSTER_NAME> 
diff --git a/articles/iot-operations/includes/cluster-prerequisites.md b/articles/iot-operations/includes/cluster-prerequisites.md
@@ -1,6 +1,6 @@
 ---
 title: include file
-description: include file with cluster prerequisites for Ubuntu and VKS
+description: include file with cluster prerequisites for Ubuntu and Tanzu
 author: dominicbetts
 ms.topic: include
 ms.date: 06/16/2025
diff --git a/articles/iot-operations/includes/supported-environments-table.md b/articles/iot-operations/includes/supported-environments-table.md
@@ -24,7 +24,7 @@ Microsoft supports the following Kubernetes distributions for Azure IoT Operatio
 | Kubernetes distribution           | Architecture         | Support level        | *Minimum validated version*         | *Minimum validated OS*                |
 |-----------------------------------|----------------------|----------------------|-------------------------------------|---------------------------------------|
 | [K3s](https://www.rancher.com/products/k3s)                             | x86_64               | General availability | *1.33.6*                            | *Ubuntu 24.04*, <br> Red Hat Enterprise Linux (RHEL) 9.x                        |
-| [vSphere Kubernetes Service (VKS)](https://techdocs.broadcom.com/us/en/vmware-cis/vcf/vsphere-supervisor-services-and-standalone-components/latest/release-notes/vmware-tanzu-kubernetes-grid-service-release-notes.html)    | x86_64               | General availability | *1.32.7*                           | *VKS*         |
+| [Tanzu Kubernetes release (TKr)](https://www.vmware.com/products/app-platform/tanzu-kubernetes-grid)    | x86_64               | General availability | *1.28.11*                           | *Tanzu Kubernetes Grid 2.5.2*         |
 | [RKE2](https://docs.rke2.io/)                             | x86_64               | General availability | *v1.35.0+rke2r1*                   | [Operating systems](https://docs.rke2.io/install/requirements#operating-systems)    |
 
 * The *minimum validated version* is the lowest version of the Kubernetes distribution that Microsoft uses to validate Azure IoT Operations deployments.
diff --git a/articles/iot-operations/includes/supported-environments.md b/articles/iot-operations/includes/supported-environments.md
@@ -10,4 +10,4 @@ ms.custom:
 ---
 
 > [!IMPORTANT]
-> Currently, K3s on Ubuntu 24.04 and vSphere Kubernetes Service are the only platforms for deploying Azure IoT Operations in production. To learn more, see [Supported environments](../deploy-iot-ops/overview-deploy.md#supported-environments).
+> Currently, K3s on Ubuntu 24.04 and Tanzu Kubernetes are the only platforms for deploying Azure IoT Operations in production. To learn more, see [Supported environments](../deploy-iot-ops/overview-deploy.md#supported-environments).
