Skip to content

Commit

Permalink
clean up of resources
Browse files Browse the repository at this point in the history
  • Loading branch information
riragh committed Oct 2, 2024
1 parent ffdcee4 commit f272d52
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 21 deletions.
2 changes: 0 additions & 2 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,6 @@ module "node_pools" {
machine_type = each.value.machine_type
fips_enabled = var.fips_enabled
os_disk_size = each.value.os_disk_size
# TODO: enable with azurerm v2.37.0
# os_disk_type = each.value.os_disk_type
auto_scaling_enabled = each.value.min_nodes == each.value.max_nodes ? false : true
node_count = each.value.min_nodes
min_nodes = each.value.min_nodes == each.value.max_nodes ? null : each.value.min_nodes
Expand Down
4 changes: 0 additions & 4 deletions modules/aks_node_pool/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ resource "azurerm_kubernetes_cluster_node_pool" "autoscale_node_pool" {
proximity_placement_group_id = var.proximity_placement_group_id == "" ? null : var.proximity_placement_group_id
vm_size = var.machine_type
os_disk_size_gb = var.os_disk_size
# TODO: enable after azurerm v2.37.0
# os_disk_type = var.os_disk_type
os_type = var.os_type
auto_scaling_enabled = var.auto_scaling_enabled
node_public_ip_enabled = var.node_public_ip_enabled
Expand Down Expand Up @@ -44,8 +42,6 @@ resource "azurerm_kubernetes_cluster_node_pool" "static_node_pool" {
proximity_placement_group_id = var.proximity_placement_group_id == "" ? null : var.proximity_placement_group_id
vm_size = var.machine_type
os_disk_size_gb = var.os_disk_size
# TODO: enable after azurerm v2.37.0
# os_disk_type = var.os_disk_type
os_type = var.os_type
auto_scaling_enabled = var.auto_scaling_enabled
node_count = var.node_count
Expand Down
7 changes: 0 additions & 7 deletions modules/aks_node_pool/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,6 @@ variable "os_disk_size" {
default = 100
}

# TODO: enable after azurerm v2.37.0
# variable "os_disk_type" {
# description = "The type of disk which should be used for the Operating System. Possible values are Ephemeral and Managed. Defaults to Managed. Changing this forces a new resource to be created"
# type = string
# default = "Managed"
# }

variable "os_type" {
description = "The Operating System which should be used for this Node Pool. Changing this forces a new resource to be created. Possible values are Linux and Windows. Defaults to Linux"
type = string
Expand Down
7 changes: 0 additions & 7 deletions modules/azurerm_netapp/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@
# Terraform Registry - https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/netapp_volume
# Azure docs - https://docs.microsoft.com/en-us/azure/azure-netapp-files/


# TODO: changer after upgrading to v0.13
# https://github.com/terraform-providers/terraform-provider-azurerm/issues/5233
# data "azurerm_resource_group" "anf" {
# name = var.resource_group_name
# }

resource "azurerm_netapp_account" "anf" {
name = "${var.prefix}-netappaccount"
location = var.location
Expand Down
1 change: 0 additions & 1 deletion modules/azurerm_vm/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ resource "azurerm_network_interface" "vm_nic" {
tags = var.tags
}

# TODO : requires specific permissions
resource "azurerm_network_interface_security_group_association" "vm_nic_sg" {
network_interface_id = azurerm_network_interface.vm_nic.id
network_security_group_id = var.azure_nsg_id
Expand Down

0 comments on commit f272d52

Please sign in to comment.