From 84022f9adfcba6538c870f484d04b521c4b81154 Mon Sep 17 00:00:00 2001
From: Tom Archer <tarcher@microsoft.com>
Date: Wed, 10 Jul 2024 08:56:57 -0700
Subject: [PATCH] Fixing code

---
 .../101-aks-standard-lb-and-vmss/main.tf      | 46 +++++++++----------
 .../101-aks-standard-lb-and-vmss/outputs.tf   | 39 ----------------
 .../101-aks-standard-lb-and-vmss/providers.tf | 10 ----
 .../101-aks-standard-lb-and-vmss/variables.tf | 18 --------
 4 files changed, 21 insertions(+), 92 deletions(-)

diff --git a/quickstart/101-aks-standard-lb-and-vmss/main.tf b/quickstart/101-aks-standard-lb-and-vmss/main.tf
index 4c06f732..9b06db3c 100644
--- a/quickstart/101-aks-standard-lb-and-vmss/main.tf
+++ b/quickstart/101-aks-standard-lb-and-vmss/main.tf
@@ -1,4 +1,3 @@
-# Generate random resource group name
 resource "random_pet" "rg_name" {
   prefix = var.resource_group_name_prefix
 }
@@ -8,38 +7,35 @@ resource "azurerm_resource_group" "rg" {
   name     = random_pet.rg_name.id
 }
 
-resource "random_pet" "azurerm_kubernetes_cluster_name" {
-  prefix = "cluster"
+resource "random_string" "aks_cluster_name" {
+  length  = 12
+  special = false
 }
 
-resource "random_pet" "azurerm_kubernetes_cluster_dns_prefix" {
-  prefix = "dns"
-}
-
-resource "azurerm_kubernetes_cluster" "k8s" {
+resource "azurerm_kubernetes_cluster" "aks_cluster" {
+  name                = random_string.aks_cluster_name.result
   location            = azurerm_resource_group.rg.location
-  name                = random_pet.azurerm_kubernetes_cluster_name.id
   resource_group_name = azurerm_resource_group.rg.name
-  dns_prefix          = random_pet.azurerm_kubernetes_cluster_dns_prefix.id
+  dns_prefix = "myakscluster"
+
+  default_node_pool {
+    type       = "VirtualMachineScaleSets"
+    name       = "default"
+    node_count = 1
+    vm_size    = "Standard_DS2_v2"
+    enable_auto_scaling = true
+  }
+
+  network_profile {
+    network_plugin = "azure"
+    load_balancer_sku = "Standard"
+  }
 
   identity {
     type = "SystemAssigned"
   }
 
-  default_node_pool {
-    name       = "agentpool"
-    vm_size    = "Standard_D2_v2"
-    node_count = var.node_count
-  }
-  linux_profile {
-    admin_username = var.username
-
-    ssh_key {
-      key_data = azapi_resource_action.ssh_public_key_gen.output.publicKey
-    }
-  }
-  network_profile {
-    network_plugin    = "kubenet"
-    load_balancer_sku = "standard"
+  tags = {
+    Environment = "Production"
   }
 }
\ No newline at end of file
diff --git a/quickstart/101-aks-standard-lb-and-vmss/outputs.tf b/quickstart/101-aks-standard-lb-and-vmss/outputs.tf
index 0d82c446..62816bd7 100644
--- a/quickstart/101-aks-standard-lb-and-vmss/outputs.tf
+++ b/quickstart/101-aks-standard-lb-and-vmss/outputs.tf
@@ -1,42 +1,3 @@
 output "resource_group_name" {
   value = azurerm_resource_group.rg.name
 }
-
-output "kubernetes_cluster_name" {
-  value = azurerm_kubernetes_cluster.k8s.name
-}
-
-output "client_certificate" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config[0].client_certificate
-  sensitive = true
-}
-
-output "client_key" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config[0].client_key
-  sensitive = true
-}
-
-output "cluster_ca_certificate" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config[0].cluster_ca_certificate
-  sensitive = true
-}
-
-output "cluster_password" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config[0].password
-  sensitive = true
-}
-
-output "cluster_username" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config[0].username
-  sensitive = true
-}
-
-output "host" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config[0].host
-  sensitive = true
-}
-
-output "kube_config" {
-  value     = azurerm_kubernetes_cluster.k8s.kube_config_raw
-  sensitive = true
-}
\ No newline at end of file
diff --git a/quickstart/101-aks-standard-lb-and-vmss/providers.tf b/quickstart/101-aks-standard-lb-and-vmss/providers.tf
index 7eff0179..7261b1fb 100644
--- a/quickstart/101-aks-standard-lb-and-vmss/providers.tf
+++ b/quickstart/101-aks-standard-lb-and-vmss/providers.tf
@@ -1,11 +1,5 @@
 terraform {
-  required_version = ">=1.0"
-
   required_providers {
-    azapi = {
-      source  = "azure/azapi"
-      version = "~>1.5"
-    }
     azurerm = {
       source  = "hashicorp/azurerm"
       version = "~>3.0"
@@ -14,10 +8,6 @@ terraform {
       source  = "hashicorp/random"
       version = "~>3.0"
     }
-    time = {
-      source  = "hashicorp/time"
-      version = "0.9.1"
-    }
   }
 }
 
diff --git a/quickstart/101-aks-standard-lb-and-vmss/variables.tf b/quickstart/101-aks-standard-lb-and-vmss/variables.tf
index 1eada683..1a8c6abb 100644
--- a/quickstart/101-aks-standard-lb-and-vmss/variables.tf
+++ b/quickstart/101-aks-standard-lb-and-vmss/variables.tf
@@ -8,22 +8,4 @@ variable "resource_group_name_prefix" {
   type        = string
   default     = "rg"
   description = "Prefix of the resource group name that's combined with a random ID so name is unique in your Azure subscription."
-}
-
-variable "node_count" {
-  type        = number
-  description = "The initial quantity of nodes for the node pool."
-  default     = 3
-}
-
-variable "msi_id" {
-  type        = string
-  description = "The Managed Service Identity ID. Set this value if you're running this example using Managed Identity as the authentication method."
-  default     = null
-}
-
-variable "username" {
-  type        = string
-  description = "The admin username for the new cluster."
-  default     = "azureadmin"
 }
\ No newline at end of file