rename aad to EID and remove OSM

Azure · Jan 8, 2024 · f52f255 · f52f255
1 parent 0831278
commit f52f255
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/02-eid.md b/Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/02-eid.md
@@ -40,16 +40,16 @@ Use az cli or Az PowerShell to create the AD groups. Replace the Entra ID group
 # [CLI](#tab/CLI)
 
 ```azurecli
-appdevs=<EID group name>
-aksops=<EID group name>
+appdevs=<Microsoft Entra group name>
+aksops=<Microsoft Entra group name>
 
 az ad group create --display-name $appdevs --mail-nickname $appdevs
 az ad group create --display-name $aksops --mail-nickname $aksops
 ```
 
 # [PowerShell](#tab/PowerShell)
 
-Running the command to create the new EID groups requires the New-AzADGroup cmdlet. More details can be found [here](https://learn.microsoft.com/powershell/azure/install-az-ps).
+Running the command to create the new Microsoft Entra groups requires the New-AzADGroup cmdlet. More details can be found [here](https://learn.microsoft.com/powershell/azure/install-az-ps).
 
 Install New-AzADGroup cmdlet
 
@@ -58,13 +58,13 @@ Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
 Install-Module -Name Az -Scope CurrentUser -Repository PSGallery -Force
 ```
 
-Run the command below to create two new EID groups in your tenant. 
+Run the command below to create two new Microsoft Entra groups in your tenant. 
 
 ```azurepowershell
 ./ad_groups.ps1 -appdevs <App Dev Group> -aksops <AKS Operations Team>
 ```
 
-## Ensure you are part of the EID group you just created or pointed to
+## Ensure you are part of the Microsoft Entra group you just created or pointed to
 
 1. Go to Azure portal and type Entra ID
 2. Select **Microsoft Entra ID**

diff --git a/Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/06-AKS-cluster/parameters-main.json b/Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/06-AKS-cluster/parameters-main.json
@@ -60,10 +60,10 @@
       "value": "AppGWSubnet-RT"
     },
     "aksuseraccessprincipalId": {
-      "value": "<service principal id for developers EID user group>"
+      "value": "<service principal id for developers Microsoft Entra user group>"
     },
     "aksadminaccessprincipalId": {
-      "value": "<service principal id for admin EID user group>"
+      "value": "<service principal id for admin Microsoft Entra user group>"
     },
     "aksIdentityName": {
       "value": "aksIdentity"

diff --git a/Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/06-aks-cluster.md b/Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/06-aks-cluster.md
@@ -71,7 +71,7 @@ You can choose which AKS network plugin you want to use when deploying the clust
 
 ## Deploy the cluster
 
-Review "**parameters-main.json**" file and update the values as required. Please make sure to update the Entra ID (EID) Group IDs with ones created in Step 02 and kubernetesVersion in the parameters file. Once the files are updated, deploy using az cli or Az PowerShell (code snippets are below).
+Review "**parameters-main.json**" file and update the values as required. Please make sure to update the Microsofr Entra ID Group IDs with ones created in Step 02 and kubernetesVersion in the parameters file. Once the files are updated, deploy using az cli or Az PowerShell (code snippets are below).
 
    > :warning: There are two groups you need to change in parameters-main.json:
    >

diff --git a/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/07-AKS-cluster/aks-pod-identity.tf b/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/07-AKS-cluster/aks-pod-identity.tf
@@ -1,5 +1,5 @@
 # These resources will set up the required permissions for 
-# EID Pod Identity (v1)
+# Microsoft Entra Pod Identity (v1)
 
 
 # Managed Identity for Pod Identity
@@ -26,7 +26,7 @@ resource "azurerm_role_assignment" "aks_vm_contributor" {
   principal_id         = each.value.kubelet_id
 }
 
-# Azure Key Vault Access Policy for Managed Identity for EID Pod Identity
+# Azure Key Vault Access Policy for Managed Identity for Microsoft Entra Pod Identity
 resource "azurerm_key_vault_access_policy" "aad_pod_identity" {
   key_vault_id = data.terraform_remote_state.aks-support.outputs.key_vault_id
   tenant_id    = data.azurerm_client_config.current.tenant_id
@@ -40,10 +40,10 @@ resource "azurerm_key_vault_access_policy" "aad_pod_identity" {
 # Outputs
 output "aad_pod_identity_resource_id" {
   value       = azurerm_user_assigned_identity.aks_pod_identity.id
-  description = "Resource ID for the Managed Identity for EID Pod Identity"
+  description = "Resource ID for the Managed Identity for Microsoft Entra Pod Identity"
 }
 
 output "aad_pod_identity_client_id" {
   value       = azurerm_user_assigned_identity.aks_pod_identity.client_id
-  description = "Client ID for the Managed Identity for EID Pod Identity"
+  description = "Client ID for the Managed Identity for Microsoft Entra Pod Identity"
 }
diff --git a/Scenarios/Backup-Restore/plan_backup_restore.md b/Scenarios/Backup-Restore/plan_backup_restore.md
@@ -80,7 +80,7 @@ Checkout the repo section on [High Availability Baseline](https://github.com/Azu
 
 * Run a Drill Tests:
 	* Create secondary AKS ecosystem (ACR, Keyvault, App Gateway, Firewall, NSG)
-	* Create secondary AKS Cluster (with its dependencies installed: eid-podid, velero, csi-drivers) + RBAC for Azure services & velero identity (backup tool)
+	* Create secondary AKS Cluster (with its dependencies installed: entra-podid, velero, csi-drivers) + RBAC for Azure services & velero identity (backup tool)
 
 	To restore **Stateless** Application: 
 	* Redeploy Application Configuration using Devops CICD