Skip to content

chore(azurerm): upgrade to 3.3.0 #157

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
lonegunmanb merged 5 commits into from
Jun 16, 2022
Merged

chore(azurerm): upgrade to 3.3.0 #157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7be2812
chore(azurerm): upgrade to 3.3.0
eyenx Apr 22, 2022
6f7f6fd
Update variables.tf
eyenx Jun 15, 2022
08061c5
Update outputs.tf
eyenx Jun 15, 2022
75925c5
fix(outputs.tf) sensitive values
eyenx Jun 15, 2022
c6c308c
fix(ouptuts): sensitive tests
eyenx Jun 16, 2022
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ module "aks" {
"Agent" : "defaultnodepoolagent"
}

enable_ingress_application_gateway = true
ingress_application_gateway_name = "aks-agw"
enable_ingress_application_gateway = true
ingress_application_gateway_name = "aks-agw"
ingress_application_gateway_subnet_cidr = "10.52.1.0/24"

network_policy = "azure"
Expand Down
73 changes: 31 additions & 42 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ resource "azurerm_kubernetes_cluster" "main" {
max_count = null
min_count = null
enable_node_public_ip = var.enable_node_public_ip
availability_zones = var.agents_availability_zones
zones = var.agents_availability_zones
node_labels = var.agents_labels
type = var.agents_type
tags = merge(var.tags, var.agents_tags)
Expand All @@ -60,7 +60,7 @@ resource "azurerm_kubernetes_cluster" "main" {
max_count = var.agents_max_count
min_count = var.agents_min_count
enable_node_public_ip = var.enable_node_public_ip
availability_zones = var.agents_availability_zones
zones = var.agents_availability_zones
node_labels = var.agents_labels
type = var.agents_type
tags = merge(var.tags, var.agents_tags)
Expand All @@ -80,60 +80,49 @@ resource "azurerm_kubernetes_cluster" "main" {
dynamic "identity" {
for_each = var.client_id == "" || var.client_secret == "" ? ["identity"] : []
content {
type = var.identity_type
user_assigned_identity_id = var.user_assigned_identity_id
type = var.identity_type
identity_ids = var.identity_ids
}
}

addon_profile {
http_application_routing {
enabled = var.enable_http_application_routing
}
http_application_routing_enabled = var.enable_http_application_routing

kube_dashboard {
enabled = var.enable_kube_dashboard
}
azure_policy_enabled = var.enable_azure_policy

azure_policy {
enabled = var.enable_azure_policy
}

oms_agent {
enabled = var.enable_log_analytics_workspace
dynamic "oms_agent" {
for_each = var.enable_log_analytics_workspace ? ["oms_agent"] : []
Copy link
Copy Markdown
Member

@lonegunmanb lonegunmanb Jun 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if var.enable_log_analytics_workspace is null? Should we add nullable = false to the variable?

Copy link
Copy Markdown
Contributor Author

@eyenx eyenx Jun 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did the same as on line 80 with identity. As far as I can see we do not check there either if it's null or false

content {
log_analytics_workspace_id = var.enable_log_analytics_workspace ? azurerm_log_analytics_workspace.main[0].id : null
}
}

dynamic "ingress_application_gateway" {
for_each = var.enable_ingress_application_gateway == null ? [] : ["ingress_application_gateway"]
content {
enabled = var.enable_ingress_application_gateway
gateway_id = var.ingress_application_gateway_id
gateway_name = var.ingress_application_gateway_name
subnet_cidr = var.ingress_application_gateway_subnet_cidr
subnet_id = var.ingress_application_gateway_subnet_id
}
dynamic "ingress_application_gateway" {
for_each = var.enable_ingress_application_gateway == null ? [] : ["ingress_application_gateway"]
Copy link
Copy Markdown
Member

@lonegunmanb lonegunmanb Jun 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if var.enable_ingress_application_gateway is false?

Copy link
Copy Markdown
Contributor Author

@eyenx eyenx Jun 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did the same as on line 80 with identity. As far as I can see we do not check there either if it's null or false

content {
gateway_id = var.ingress_application_gateway_id
gateway_name = var.ingress_application_gateway_name
subnet_cidr = var.ingress_application_gateway_subnet_cidr
subnet_id = var.ingress_application_gateway_subnet_id
}
}

role_based_access_control {
enabled = var.enable_role_based_access_control
role_based_access_control_enabled = var.enable_role_based_access_control

dynamic "azure_active_directory" {
for_each = var.enable_role_based_access_control && var.rbac_aad_managed ? ["rbac"] : []
content {
managed = true
admin_group_object_ids = var.rbac_aad_admin_group_object_ids
}
dynamic "azure_active_directory_role_based_access_control" {
for_each = var.enable_role_based_access_control && var.rbac_aad_managed ? ["rbac"] : []
content {
managed = true
admin_group_object_ids = var.rbac_aad_admin_group_object_ids
}
}

dynamic "azure_active_directory" {
for_each = var.enable_role_based_access_control && !var.rbac_aad_managed ? ["rbac"] : []
content {
managed = false
client_app_id = var.rbac_aad_client_app_id
server_app_id = var.rbac_aad_server_app_id
server_app_secret = var.rbac_aad_server_app_secret
}
dynamic "azure_active_directory_role_based_access_control" {
for_each = var.enable_role_based_access_control && !var.rbac_aad_managed ? ["rbac"] : []
content {
managed = false
client_app_id = var.rbac_aad_client_app_id
server_app_id = var.rbac_aad_server_app_id
server_app_secret = var.rbac_aad_server_app_secret
}
}

Expand Down
2 changes: 1 addition & 1 deletion outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ output "kube_admin_config_raw" {
}

output "http_application_routing_zone_name" {
value = length(azurerm_kubernetes_cluster.main.addon_profile) > 0 && length(azurerm_kubernetes_cluster.main.addon_profile[0].http_application_routing) > 0 ? azurerm_kubernetes_cluster.main.addon_profile[0].http_application_routing[0].http_application_routing_zone_name : ""
value = length(azurerm_kubernetes_cluster.main) > 0 && azurerm_kubernetes_cluster.main.http_application_routing_enabled ? azurerm_kubernetes_cluster.main.http_application_routing_zone_name : ""
Comment thread
eyenx marked this conversation as resolved.
Outdated
}

output "system_assigned_identity" {
Expand Down
8 changes: 4 additions & 4 deletions test/fixture/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ module "aks" {
"Agent" : "agentTag"
}

enable_ingress_application_gateway = true
ingress_application_gateway_name = "${random_id.prefix.hex}-agw"
enable_ingress_application_gateway = true
ingress_application_gateway_name = "${random_id.prefix.hex}-agw"
ingress_application_gateway_subnet_cidr = "10.52.1.0/24"

network_policy = "azure"
Expand Down Expand Up @@ -93,6 +93,6 @@ module "aks_cluster_name" {
enable_kube_dashboard = false
net_profile_pod_cidr = "10.1.0.0/16"
identity_type = "UserAssigned"
user_assigned_identity_id = azurerm_user_assigned_identity.test.id
identity_ids = [azurerm_user_assigned_identity.test.id]
depends_on = [azurerm_resource_group.main]
}
}
7 changes: 4 additions & 3 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,15 +301,16 @@ variable "ingress_application_gateway_subnet_id" {
type = string
default = null
}

variable "identity_type" {
description = "(Optional) The type of identity used for the managed cluster. Conflict with `client_id` and `client_secret`. Possible values are `SystemAssigned` and `UserAssigned`. If `UserAssigned` is set, a `user_assigned_identity_id` must be set as well."
type = string
default = "SystemAssigned"
}

variable "user_assigned_identity_id" {
description = "(Optional) The ID of a user assigned identity."
type = string
variable "identity_ids" {
description = "(Optional) The IDs of a user assigned identity."
Comment thread
eyenx marked this conversation as resolved.
Outdated
type = list(string)
default = null
}

Expand Down
2 changes: 1 addition & 1 deletion versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.46"
version = "~> 3.3"
}
}

Expand Down
⚡