Merge pull request #156 from Azure/merging-nvm-tf-to-private-scenario

merged NVM folder into private cluster folder
Azure · Oct 24, 2024 · 49990cd · 49990cd
2 parents 2d5314b + 2bb5b4c
commit 49990cd
Show file tree

Hide file tree

Showing 99 changed files with 5 additions and 3,512 deletions.
diff --git a/Scenarios/AKS-Secure-Baseline-Private-AVM/All-in-One-Bicep/README.md b/Scenarios/AKS-Secure-Baseline-Private-AVM/All-in-One-Bicep/README.md
diff --git a/Scenarios/AKS-Secure-Baseline-Private-AVM/Bicep/02-eid.md b/Scenarios/AKS-Secure-Baseline-Private-AVM/Bicep/02-eid.md
diff --git a/Scenarios/AKS-Secure-Baseline-Private-AVM/Bicep/03-network-hub.md b/Scenarios/AKS-Secure-Baseline-Private-AVM/Bicep/03-network-hub.md
diff --git a/Scenarios/AKS-Secure-Baseline-Private-AVM/Bicep/04-network-lz.md b/Scenarios/AKS-Secure-Baseline-Private-AVM/Bicep/04-network-lz.md
diff --git a/Scenarios/AKS-Secure-Baseline-Private-AVM/Bicep/05-aks-supporting.md b/Scenarios/AKS-Secure-Baseline-Private-AVM/Bicep/05-aks-supporting.md
diff --git a/Scenarios/AKS-Secure-Baseline-Private-AVM/Bicep/06-aks-cluster.md b/Scenarios/AKS-Secure-Baseline-Private-AVM/Bicep/06-aks-cluster.md
diff --git a/Scenarios/AKS-Secure-Baseline-Private-AVM/Bicep/07-workload.md b/Scenarios/AKS-Secure-Baseline-Private-AVM/Bicep/07-workload.md
diff --git a/Scenarios/AKS-Secure-Baseline-Private-AVM/README.md b/Scenarios/AKS-Secure-Baseline-Private-AVM/README.md
diff --git a/...rivate-AVM/Terraform/02-EID/ad_groups.ps1 → ...ateCluster/Terraform/02-EID/ad_groups.ps1 b/...rivate-AVM/Terraform/02-EID/ad_groups.ps1 → ...ateCluster/Terraform/02-EID/ad_groups.ps1
diff --git a/...-Baseline-Private-AVM/Terraform/02-eid.md → ...seline-PrivateCluster/Terraform/02-eid.md b/...-Baseline-Private-AVM/Terraform/02-eid.md → ...seline-PrivateCluster/Terraform/02-eid.md
@@ -29,10 +29,10 @@ Before creating the Microsoft Entra ID integrated cluster, groups must be create
 
 Depending on the needs of your organization, you may have a choice of existing groups to use or a new groups may need to be created for each cluster deployment.  
 
-Navigate to "/AKS-Secure-Baseline-Private-AVM/Bicep/02-EID" folder
+Navigate to "/AKS-Secure-Baseline-PrivateCluster/Bicep/02-EID" folder
 
 ```azurecli
-cd ./Scenarios/AKS-Secure-Baseline-Private-AVM/Bicep/02-EID
+cd ./Scenarios/AKS-Secure-Baseline-PrivateCluster/Bicep/02-EID
 ```
 
 Use the Azure CLI or Azure PowerShell to create the Microsoft Entra groups. Replace the Microsoft Entra group names below with the name of the Microsoft Entra groups you want to create, such as AKS_ES_dev, AKS_ES_ops. There should be no space in the names.

diff --git a/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/02-state-storage.md b/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/02-state-storage.md
diff --git a/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/03-AAD-import/ad_groups.tf b/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/03-AAD-import/ad_groups.tf
diff --git a/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/03-AAD-import/provider.tf b/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/03-AAD-import/provider.tf
diff --git a/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/03-AAD-import/variables.tf b/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/03-AAD-import/variables.tf
diff --git a/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/03-EID-create/ad_groups.tf b/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/03-EID-create/ad_groups.tf
diff --git a/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/03-EID-create/provider.tf b/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/03-EID-create/provider.tf
diff --git a/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/03-EID-create/variables.tf b/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/03-EID-create/variables.tf
diff --git a/...ate-AVM/Terraform/03-Network-Hub/input.tf → ...Cluster/Terraform/03-Network-Hub/input.tf b/...ate-AVM/Terraform/03-Network-Hub/input.tf → ...Cluster/Terraform/03-Network-Hub/input.tf
diff --git a/...vate-AVM/Terraform/03-Network-Hub/main.tf → ...eCluster/Terraform/03-Network-Hub/main.tf b/...vate-AVM/Terraform/03-Network-Hub/main.tf → ...eCluster/Terraform/03-Network-Hub/main.tf
diff --git a/...AVM/Terraform/03-Network-Hub/providers.tf → ...ter/Terraform/03-Network-Hub/providers.tf b/...AVM/Terraform/03-Network-Hub/providers.tf → ...ter/Terraform/03-Network-Hub/providers.tf
diff --git a/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/03-eid.md b/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/03-eid.md
diff --git a/...e-Private-AVM/Terraform/03-network-hub.md → ...rivateCluster/Terraform/03-network-hub.md b/...e-Private-AVM/Terraform/03-network-hub.md → ...rivateCluster/Terraform/03-network-hub.md
@@ -10,7 +10,7 @@ If you haven't yet, clone the repo and cd to the appropriate folder
 
 ```bash
 git clone https://github.com/Azure/AKS-Landing-Zone-Accelerator
-cd ./Scenarios/AKS-Secure-Baseline-Private-AVM/Terraform/02-EID
+cd ./Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/02-EID
 ```
 
 The following will be created:
@@ -20,7 +20,7 @@ The following will be created:
 * Azure Firewall
 * Azure Bastion Host
 
-Navigate to "/Scenarios/AKS-Secure-Baseline-Private-AVM/Terraform/" folder
+Navigate to "/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/" folder
 
 ```bash
 cd ./03-Network-Hub

diff --git a/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/04-Network-Hub/dev-setup.tf b/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/04-Network-Hub/dev-setup.tf
diff --git a/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/04-Network-Hub/firewall.tf b/Scenarios/AKS-Secure-Baseline-PrivateCluster/Terraform/04-Network-Hub/firewall.tf