@@ -22,6 +22,14 @@ resource "random_string" "rg_suffix" {
2222 numeric = true
2323}
2424
25+ resource "random_string" "storage_account_suffix" {
26+ length = 8
27+ special = false
28+ lower = true
29+ upper = false
30+ numeric = false
31+ }
32+
2533locals {
2634 tenant_id = data. azurerm_client_config . current . tenant_id
2735 subscription_id = data. azurerm_client_config . current . subscription_id
@@ -39,14 +47,6 @@ locals {
3947 log_analytics_retention_days = 30
4048}
4149
42- resource "random_string" "storage_account_suffix" {
43- length = 8
44- special = false
45- lower = true
46- upper = false
47- numeric = false
48- }
49-
5050resource "azurerm_resource_group" "rg" {
5151 name = " ${ var . resource_group_name_prefix } -${ local . random_id } -rg"
5252 location = var. location
@@ -151,32 +151,6 @@ module "key_vault" {
151151 log_analytics_retention_days = local. log_analytics_retention_days
152152}
153153
154- module "deployment_script" {
155- source = " ./modules/deployment_script"
156- name = " DeployBashScript"
157- location = var. location
158- resource_group_name = azurerm_resource_group. rg . name
159-
160- tenant_id = local. tenant_id
161- subscription_id = local. subscription_id
162- script_path = " ./install-nginx-via-helm-and-create-sa.sh"
163-
164- azure_cli_version = " 2.64.0"
165- aks_cluster_id = module. aks_cluster . id
166- aks_cluster_name = module. aks_cluster . name
167- hostname = " magic8ball.contoso.com"
168- namespace = local. namespace
169- service_account_name = local. service_account_name
170- email = var. email
171-
172- managed_identity_name = " ScriptManagedIdentity"
173- workload_managed_identity_client_id = azurerm_user_assigned_identity. aks_workload_identity . client_id
174-
175- depends_on = [
176- module . aks_cluster
177- ]
178- }
179-
180154module "log_analytics_workspace" {
181155 source = " ./modules/log_analytics"
182156 name = local. log_analytics_workspace_name
0 commit comments