Skip to content

Fixes Azure aks module key issues #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hernan82arg merged 3 commits into from
May 14, 2025
Merged

Fixes Azure aks module key issues #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cffa994
AzureRM Terraform backend (#420)
rmvangun May 13, 2025
00f8e7e
Fixes azure-aks module
hernan82arg May 13, 2025
10fc0c3
merge main in
hernan82arg May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 32 additions & 13 deletions terraform/cluster/azure-aks/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 49 additions & 24 deletions terraform/cluster/azure-aks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,22 @@ resource "azurerm_resource_group" "aks" {
# Key Vault
#-----------------------------------------------------------------------------------------------------------------------

resource "random_string" "key" {
length = 3
special = false
upper = false
}

resource "azurerm_key_vault" "key_vault" {
# checkov:skip=CKV2_AZURE_32: We are using a public cluster for testing, there is no need for private endpoints.
name = "aks-keyvault-${var.context_id}"
name = "keyvault-${var.context_id}-${random_string.key.result}"
location = azurerm_resource_group.aks.location
resource_group_name = azurerm_resource_group.aks.name
tenant_id = data.azurerm_client_config.current.tenant_id
sku_name = "premium"
enabled_for_disk_encryption = true
purge_protection_enabled = true
soft_delete_retention_days = 7
soft_delete_retention_days = var.soft_delete_retention_days
# checkov:skip=CKV_AZURE_189: We are using a public cluster for testing
# private services are encouraged for production
public_network_access_enabled = var.public_network_access_enabled
Expand All @@ -73,26 +79,28 @@ resource "azurerm_key_vault" "key_vault" {
default_action = var.network_acls_default_action
bypass = "AzureServices"
}
}

access_policy {
tenant_id = data.azurerm_client_config.current.tenant_id
object_id = data.azurerm_client_config.current.object_id

key_permissions = [
"Create",
"Delete",
"Get",
"Purge",
"Recover",
"Update",
"GetRotationPolicy",
"SetRotationPolicy"
]
resource "azurerm_key_vault_access_policy" "key_vault_access_policy" {
key_vault_id = azurerm_key_vault.key_vault.id

secret_permissions = [
"Set",
]
}
tenant_id = data.azurerm_client_config.current.tenant_id
object_id = data.azurerm_client_config.current.object_id

key_permissions = [
"Create",
"Delete",
"Get",
"Purge",
"Recover",
"Update",
"GetRotationPolicy",
"SetRotationPolicy"
]

secret_permissions = [
"Set",
]
}

resource "azurerm_key_vault_access_policy" "key_vault_access_policy_disk" {
Expand All @@ -119,7 +127,7 @@ resource "azurerm_key_vault_access_policy" "key_vault_access_policy_disk" {
resource "time_static" "expiry" {}

resource "azurerm_key_vault_key" "key_vault_key" {
name = "aks-key-${var.context_id}"
name = "key-${var.context_id}-${random_string.key.result}"
key_vault_id = azurerm_key_vault.key_vault.id
key_type = "RSA-HSM"
key_size = 2048
Expand All @@ -145,7 +153,7 @@ resource "azurerm_key_vault_key" "key_vault_key" {
}

resource "azurerm_disk_encryption_set" "main" {
name = "des-${var.context_id}"
name = "des-${var.context_id}-${random_string.key.result}"
resource_group_name = azurerm_resource_group.aks.name
location = azurerm_resource_group.aks.location
key_vault_key_id = azurerm_key_vault_key.key_vault_key.id
Expand Down Expand Up @@ -178,6 +186,12 @@ data "azurerm_subnet" "private" {
virtual_network_name = var.vnet_name == null ? "windsor-vnet-${var.context_id}" : var.vnet_name
}

resource "azurerm_user_assigned_identity" "cluster" {
name = "${var.context_id}-cluster-identity"
location = var.region
resource_group_name = azurerm_resource_group.aks.name
}

resource "azurerm_kubernetes_cluster" "main" {
name = local.cluster_name
location = azurerm_resource_group.aks.location
Expand Down Expand Up @@ -243,12 +257,17 @@ resource "azurerm_kubernetes_cluster" "main" {
}

identity {
type = "SystemAssigned"
type = "UserAssigned"
identity_ids = concat(
[azurerm_user_assigned_identity.cluster.id],
var.additional_cluster_identity_ids
)
}

lifecycle {
ignore_changes = [
default_node_pool[0].node_count
default_node_pool[0].upgrade_settings,
workload_autoscaler_profile
]
}
}
Expand All @@ -269,6 +288,12 @@ resource "azurerm_kubernetes_cluster_node_pool" "autoscaled" {
# checkov:skip=CKV_AZURE_168: This is set in the variable by default to 50
max_pods = var.autoscaled_node_pool.max_pods
host_encryption_enabled = var.autoscaled_node_pool.host_encryption_enabled

lifecycle {
ignore_changes = [
upgrade_settings
]
}
}

resource "local_file" "kube_config" {
Expand Down
12 changes: 12 additions & 0 deletions terraform/cluster/azure-aks/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,15 @@ variable "expiration_date" {
description = "The expiration date for the AKS cluster's key vault"
default = null
}

variable "additional_cluster_identity_ids" {
type = list(string)
description = "Additional user assigned identity IDs for the AKS cluster"
default = []
}

variable "soft_delete_retention_days" {
type = number
description = "The number of days to retain the AKS cluster's key vault"
default = 7
}
Loading