Skip to content
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

Feat/azurem version upgrade #30

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feat/azurem version upgrade #30

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
ec94fa6
feat: update to azurerm version 4.11.0
d4kverma Nov 27, 2024
e697b6c
fmt run
d4kverma Nov 27, 2024
7f5980b
remove commented attributes
d4kverma Dec 4, 2024
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
15 changes: 10 additions & 5 deletions examples/aks_with_microsoft_entra_id/example.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
provider "azurerm" {
features {}
subscription_id = "000001-11111-1223-XXX-XXXXXXXXXXXX"
}
data "azurerm_client_config" "current_client_config" {}

module "resource_group" {
source = "clouddrove/resource-group/azure"
version = "1.0.2"

name = "Public-app"
name = "app-aks"
environment = "test"
label_order = ["name", "environment", ]
location = "Canada Central"
Expand Down Expand Up @@ -52,7 +53,7 @@ module "subnet" {

module "log-analytics" {
source = "clouddrove/log-analytics/azure"
version = "1.0.1"
version = "2.0.0"
name = "app"
environment = "test"
label_order = ["name", "environment"]
Expand All @@ -63,9 +64,13 @@ module "log-analytics" {
}

module "vault" {
providers = {
azurerm.dns_sub = azurerm, #chagnge this to other alias if dns hosted in other subscription.
azurerm.main_sub = azurerm
}
source = "clouddrove/key-vault/azure"
version = "1.1.0"
name = "apptestwvshaks"
version = "1.2.0"
name = "appakstestcd222"
#environment = local.environment
resource_group_name = module.resource_group.resource_group_name
location = module.resource_group.resource_group_location
Expand Down Expand Up @@ -97,7 +102,7 @@ module "aks" {
resource_group_name = module.resource_group.resource_group_name
location = module.resource_group.resource_group_location

kubernetes_version = "1.27.7"
kubernetes_version = "1.30.5"
private_cluster_enabled = false
default_node_pool = {
name = "agentpool1"
Expand Down
2 changes: 1 addition & 1 deletion examples/aks_with_microsoft_entra_id/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "3.112.0"
version = ">=3.112.0"
}
}
}
1 change: 1 addition & 0 deletions examples/basic/example.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
provider "azurerm" {
features {}
subscription_id = "000001-11111-1223-XXX-XXXXXXXXXXXX"
}

module "aks" {
Expand Down
4 changes: 2 additions & 2 deletions examples/basic/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "3.112.0"
version = ">=3.112.0"
}
}
}
}
17 changes: 11 additions & 6 deletions examples/complete/example.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
provider "azurerm" {
features {}
subscription_id = "000001-11111-1223-XXX-XXXXXXXXXXXX"
}
data "azurerm_client_config" "current_client_config" {}

module "resource_group" {
source = "clouddrove/resource-group/azure"
version = "1.0.2"

name = "Public-app"
name = "aks-test"
environment = "test"
label_order = ["name", "environment", ]
location = "Canada Central"
Expand Down Expand Up @@ -52,7 +53,7 @@ module "subnet" {

module "log-analytics" {
source = "clouddrove/log-analytics/azure"
version = "1.0.1"
version = "2.0.0"
name = "app"
environment = "test"
label_order = ["name", "environment"]
Expand All @@ -63,9 +64,13 @@ module "log-analytics" {
}

module "vault" {
providers = {
azurerm.dns_sub = azurerm, #chagnge this to other alias if dns hosted in other subscription.
azurerm.main_sub = azurerm
}
source = "clouddrove/key-vault/azure"
version = "1.1.0"
name = "appakstest"
version = "1.2.0"
name = "appakstestcd2"
#environment = local.environment
resource_group_name = module.resource_group.resource_group_name
location = module.resource_group.resource_group_location
Expand Down Expand Up @@ -97,7 +102,7 @@ module "aks" {
resource_group_name = module.resource_group.resource_group_name
location = module.resource_group.resource_group_location

kubernetes_version = "1.27.7"
kubernetes_version = "1.30.5"
private_cluster_enabled = false
default_node_pool = {
name = "agentpool1"
Expand All @@ -109,7 +114,7 @@ module "aks" {
max_surge = "33%"
}

##### if requred more than one node group.
##### if required more than one node group.
nodes_pools = [
{
name = "nodegroup2"
Expand Down
2 changes: 1 addition & 1 deletion examples/complete/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "3.112.0"
version = ">=3.112.0"
}
}
}
35 changes: 16 additions & 19 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ resource "azurerm_kubernetes_cluster" "aks" {
resource_group_name = local.resource_group_name
dns_prefix = replace(module.labels.id, "/[\\W_]/", "-")
kubernetes_version = var.kubernetes_version
automatic_channel_upgrade = var.automatic_channel_upgrade
automatic_upgrade_channel = var.automatic_channel_upgrade
sku_tier = var.aks_sku_tier
node_resource_group = var.node_resource_group == null ? format("%s-aks-node-rg", module.labels.id) : var.node_resource_group
disk_encryption_set_id = var.key_vault_id != null ? azurerm_disk_encryption_set.main[0].id : null
Expand All @@ -94,9 +94,9 @@ resource "azurerm_kubernetes_cluster" "aks" {
content {
name = var.agents_pool_name
vm_size = var.agents_size
enable_auto_scaling = var.enable_auto_scaling
enable_host_encryption = var.enable_host_encryption
enable_node_public_ip = var.enable_node_public_ip
auto_scaling_enabled = var.enable_auto_scaling
host_encryption_enabled = var.enable_host_encryption
node_public_ip_enabled = var.enable_node_public_ip
fips_enabled = var.default_node_pool_fips_enabled
max_count = var.agents_max_count
max_pods = var.agents_max_pods
Expand Down Expand Up @@ -254,9 +254,7 @@ resource "azurerm_kubernetes_cluster" "aks" {
for_each = var.api_server_access_profile != null ? [1] : []

content {
authorized_ip_ranges = var.api_server_access_profile.authorized_ip_ranges
vnet_integration_enabled = var.api_server_access_profile.vnet_integration_enabled
subnet_id = var.api_server_access_profile.subnet_id
authorized_ip_ranges = var.api_server_access_profile.authorized_ip_ranges
}
}

Expand Down Expand Up @@ -333,7 +331,6 @@ resource "azurerm_kubernetes_cluster" "aks" {
dynamic "azure_active_directory_role_based_access_control" {
for_each = var.role_based_access_control == null ? [] : var.role_based_access_control
content {
managed = azure_active_directory_role_based_access_control.value.managed
tenant_id = azure_active_directory_role_based_access_control.value.tenant_id
admin_group_object_ids = !azure_active_directory_role_based_access_control.value.azure_rbac_enabled ? var.admin_group_id : null
azure_rbac_enabled = azure_active_directory_role_based_access_control.value.azure_rbac_enabled
Expand All @@ -343,7 +340,7 @@ resource "azurerm_kubernetes_cluster" "aks" {
name = local.default_node_pool.name
node_count = local.default_node_pool.count
vm_size = local.default_node_pool.vm_size
enable_auto_scaling = local.default_node_pool.enable_auto_scaling
auto_scaling_enabled = local.default_node_pool.enable_auto_scaling
min_count = local.default_node_pool.min_count
max_count = local.default_node_pool.max_count
max_pods = local.default_node_pool.max_pods
Expand All @@ -352,7 +349,7 @@ resource "azurerm_kubernetes_cluster" "aks" {
type = local.default_node_pool.type
vnet_subnet_id = local.default_node_pool.vnet_subnet_id
temporary_name_for_rotation = var.temporary_name_for_rotation
enable_host_encryption = local.default_node_pool.enable_host_encryption
host_encryption_enabled = local.default_node_pool.enable_host_encryption
dynamic "upgrade_settings" {
for_each = local.default_node_pool.max_surge == null ? [] : ["upgrade_settings"]

Expand Down Expand Up @@ -387,6 +384,7 @@ resource "azurerm_kubernetes_cluster" "aks" {
mode = var.service_mesh_profile.mode
external_ingress_gateway_enabled = var.service_mesh_profile.external_ingress_gateway_enabled
internal_ingress_gateway_enabled = var.service_mesh_profile.internal_ingress_gateway_enabled
revisions = var.service_mesh_profile.internal_ingress_gateway_enabled.revisions
}
}
dynamic "service_principal" {
Expand All @@ -403,7 +401,6 @@ resource "azurerm_kubernetes_cluster" "aks" {
content {
blob_driver_enabled = var.storage_profile.blob_driver_enabled
disk_driver_enabled = var.storage_profile.disk_driver_enabled
disk_driver_version = var.storage_profile.disk_driver_version
file_driver_enabled = var.storage_profile.file_driver_enabled
snapshot_controller_enabled = var.storage_profile.snapshot_controller_enabled
}
Expand Down Expand Up @@ -512,13 +509,13 @@ resource "azurerm_kubernetes_cluster_node_pool" "node_pools" {
os_disk_type = local.nodes_pools[count.index].os_disk_type
os_disk_size_gb = local.nodes_pools[count.index].os_disk_size_gb
vnet_subnet_id = local.nodes_pools[count.index].vnet_subnet_id
enable_auto_scaling = local.nodes_pools[count.index].enable_auto_scaling
enable_host_encryption = local.nodes_pools[count.index].enable_host_encryption
auto_scaling_enabled = local.nodes_pools[count.index].enable_auto_scaling
host_encryption_enabled = local.nodes_pools[count.index].enable_host_encryption
node_count = local.nodes_pools[count.index].count
min_count = local.nodes_pools[count.index].min_count
max_count = local.nodes_pools[count.index].max_count
max_pods = local.nodes_pools[count.index].max_pods
enable_node_public_ip = local.nodes_pools[count.index].enable_node_public_ip
node_public_ip_enabled = local.nodes_pools[count.index].enable_node_public_ip
mode = local.nodes_pools[count.index].mode
orchestrator_version = local.nodes_pools[count.index].orchestrator_version
node_taints = local.nodes_pools[count.index].node_taints
Expand Down Expand Up @@ -616,7 +613,7 @@ resource "azurerm_role_assignment" "aks_system_identity" {
count = var.enabled && var.cmk_enabled ? 1 : 0
principal_id = azurerm_kubernetes_cluster.aks[0].identity[0].principal_id
scope = azurerm_disk_encryption_set.main[0].id
role_definition_name = "Key Vault Crypto Service Encryption User"
role_definition_name = "Reader"
}

# Allow aks system indentiy access to ACR
Expand Down Expand Up @@ -796,7 +793,7 @@ resource "azurerm_monitor_diagnostic_setting" "aks_diag" {
}
}
lifecycle {
ignore_changes = [log_analytics_destination_type]
ignore_changes = [target_resource_id, log_analytics_destination_type]
}
}

Expand Down Expand Up @@ -838,7 +835,7 @@ resource "azurerm_monitor_diagnostic_setting" "pip_aks" {
}

lifecycle {
ignore_changes = [log_analytics_destination_type]
ignore_changes = [target_resource_id, log_analytics_destination_type]
}
}

Expand Down Expand Up @@ -873,7 +870,7 @@ resource "azurerm_monitor_diagnostic_setting" "aks-nsg" {
}

lifecycle {
ignore_changes = [log_analytics_destination_type]
ignore_changes = [target_resource_id, log_analytics_destination_type]
}
}

Expand Down Expand Up @@ -908,7 +905,7 @@ resource "azurerm_monitor_diagnostic_setting" "aks-nic" {
}

lifecycle {
ignore_changes = [log_analytics_destination_type]
ignore_changes = [log_analytics_destination_type, log_analytics_destination_type]
}
}

Expand Down
1 change: 1 addition & 0 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,7 @@ variable "service_mesh_profile" {
mode = string
internal_ingress_gateway_enabled = optional(bool, true)
external_ingress_gateway_enabled = optional(bool, true)
revisions = list(string)
})
default = null
description = <<-EOT
Expand Down
Loading