Skip to content

Commit e655730

Browse files
author
Allen Kim
committed
fix: fixed terraform plan issues
1 parent bf1dc3d commit e655730

8 files changed

+67
-52
lines changed

examples/.terraform.lock.hcl

-42
This file was deleted.

examples/main.tf

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@ data "azurerm_resource_group" "test_aks_rg" {
22
name = var.aks_rg_name
33
}
44

5+
data "azurerm_resource_group" "test_aks_net_rg" {
6+
name = var.aks_net_rg_name
7+
}
8+
59
data "azurerm_virtual_network" "aks_vnet" {
610
name = var.aks_vnet_name
7-
resource_group_name = data.azurerm_resource_group.test_aks_rg.name
11+
resource_group_name = data.azurerm_resource_group.test_aks_net_rg.name
812
}
913

1014
data "azurerm_subnet" "aks_subnet" {
1115
name = var.aks_subnet_name
1216
virtual_network_name = data.azurerm_virtual_network.aks_vnet.name
13-
resource_group_name = data.azurerm_resource_group.test_aks_rg.name
17+
resource_group_name = data.azurerm_resource_group.test_aks_net_rg.name
1418
}
1519

1620
module "test_aks" {

examples/provider.tf

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
terraform {
2+
required_providers {
3+
azurerm = {
4+
source = "hashicorp/azurerm"
5+
version = "~> 3.20"
6+
}
7+
random = {
8+
source = "hashicorp/random"
9+
version = "~> 3.4"
10+
}
11+
}
12+
}
13+
14+
provider "azurerm" {
15+
# Configuration options
16+
features {}
17+
18+
subscription_id = var.azure_subscription_id
19+
tenant_id = var.azure_tenant_id
20+
client_id = var.azure_client_id
21+
client_secret = var.azure_client_secret
22+
}
23+
24+
provider "random" {
25+
# Configuration options
26+
}

examples/variables.tf

+22-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ variable "worker_node_count" {
4040

4141
variable "worker_node_pool_name" {
4242
type = string
43-
default = "work-node-pool"
43+
default = "nodepool1"
4444
description = "The work node pool name"
4545
}
4646

@@ -66,3 +66,24 @@ variable "aks_network_plugin" {
6666
description = "The network plugin for AKS"
6767
default = "kubenet"
6868
}
69+
70+
# Credential
71+
variable "azure_client_id" {
72+
sensitive = true
73+
}
74+
75+
variable "azure_tenant_id" {
76+
sensitive = true
77+
}
78+
79+
variable "azure_subscription_id" {
80+
sensitive = true
81+
}
82+
83+
variable "azure_client_secret" {
84+
sensitive = true
85+
}
86+
87+
variable "azure_client_secret_id" {
88+
sensitive = true
89+
}

main.tf

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
resource "azurerm_kubernetes_cluster" "aks-rs" {
1+
resource "random_string" "name_postfix" {
2+
length = 4
3+
numeric = true
4+
special = false
5+
}
6+
7+
resource "azurerm_kubernetes_cluster" "aks_rs" {
28
name = "${var.name_prefix}-${random_string.name_postfix.result}"
39
location = var.location
410
resource_group_name = var.aks_rg.name
@@ -14,7 +20,7 @@ resource "azurerm_kubernetes_cluster" "aks-rs" {
1420

1521
enable_node_public_ip = false
1622

17-
vnet_subnet_id = var.ask_subnet.id
23+
vnet_subnet_id = var.aks_subnet.id
1824

1925
tags = {
2026
createdBy = var.owner

network.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "azurerm_role_assignment" "example" {
2-
scope = azurerm_resource_group.example.id
2+
scope = var.aks_subnet.id
33
role_definition_name = "Network Contributor"
4-
principal_id = azurerm_kubernetes_cluster.example.identity.0.principal_id
4+
principal_id = azurerm_kubernetes_cluster.aks_rs.identity.0.principal_id
55
}

outputs.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
output "client_certificate" {
2-
value = azurerm_kubernetes_cluster.aks-rs.kube_config.0.client_certificate
2+
value = azurerm_kubernetes_cluster.aks_rs.kube_config.0.client_certificate
33
sensitive = true
44
}
55

66
output "kube_config" {
7-
value = azurerm_kubernetes_cluster.aks-rs.kube_config_raw
7+
value = azurerm_kubernetes_cluster.aks_rs.kube_config_raw
88
sensitive = true
99
}

providers.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ terraform {
66
}
77
random = {
88
source = "hashicorp/random"
9-
version = "3.4.2"
9+
version = "~> 3.4"
1010
}
1111
}
1212
}

0 commit comments

Comments
 (0)