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

upgrade azurerm to latest version #2812

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

upgrade azurerm to latest version #2812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21a6bb5
upgrade azurerm to latest 3.x version
Adam-D-Lewis Oct 31, 2024
673b340
upgrade to latest azurerm provider version
Adam-D-Lewis Oct 31, 2024
9f7ba1f
Merge branch 'main' into upgrade_azurerm_provider
dcmcand Nov 6, 2024
a327a67
Merge branch 'main' into upgrade_azurerm_provider
Adam-D-Lewis Nov 6, 2024
f27ff93
Merge branch 'main' into upgrade_azurerm_provider
Adam-D-Lewis Nov 12, 2024
f68d62b
Merge branch 'main' into upgrade_azurerm_provider
dcmcand Nov 15, 2024
81f7aa8
Update azurerm implementation
dcmcand Jan 29, 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
25 changes: 12 additions & 13 deletions src/_nebari/stages/infrastructure/template/azure/modules/kubernetes/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,22 @@ resource "azurerm_kubernetes_cluster" "main" {
dynamic "network_profile" {
for_each = var.network_profile != null ? [var.network_profile] : []
content {
network_plugin = network_profile.value.network_plugin != null ? network_profile.value.network_plugin : null
network_policy = network_profile.value.network_policy != null ? network_profile.value.network_policy : null
service_cidr = network_profile.value.service_cidr != null ? network_profile.value.service_cidr : null
dns_service_ip = network_profile.value.dns_service_ip != null ? network_profile.value.dns_service_ip : null
docker_bridge_cidr = network_profile.value.docker_bridge_cidr != null ? network_profile.value.docker_bridge_cidr : null
network_plugin = network_profile.value.network_plugin != null ? network_profile.value.network_plugin : null
network_policy = network_profile.value.network_policy != null ? network_profile.value.network_policy : null
service_cidr = network_profile.value.service_cidr != null ? network_profile.value.service_cidr : null
dns_service_ip = network_profile.value.dns_service_ip != null ? network_profile.value.dns_service_ip : null
}
}

kubernetes_version = var.kubernetes_version
default_node_pool {
vnet_subnet_id = var.vnet_subnet_id
name = var.node_groups[0].name
vm_size = var.node_groups[0].instance_type
enable_auto_scaling = "true"
min_count = var.node_groups[0].min_size
max_count = var.node_groups[0].max_size
max_pods = var.max_pods
vnet_subnet_id = var.vnet_subnet_id
name = var.node_groups[0].name
vm_size = var.node_groups[0].instance_type
auto_scaling_enabled = "true"
min_count = var.node_groups[0].min_size
max_count = var.node_groups[0].max_size
max_pods = var.max_pods

orchestrator_version = var.kubernetes_version
node_labels = {
Expand Down Expand Up @@ -76,7 +75,7 @@ resource "azurerm_kubernetes_cluster_node_pool" "node_group" {
name = each.value.name
kubernetes_cluster_id = azurerm_kubernetes_cluster.main.id
vm_size = each.value.instance_type
enable_auto_scaling = "true"
auto_scaling_enabled = "true"
mode = "User" # "System" or "User", only "User" nodes can scale down to 0
min_count = each.value.min_size
max_count = each.value.max_size
Expand Down
9 changes: 4 additions & 5 deletions src/_nebari/stages/infrastructure/template/azure/modules/kubernetes/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,10 @@ variable "tags" {
variable "network_profile" {
description = "Network profile"
type = object({
network_plugin = string
network_policy = string
service_cidr = string
dns_service_ip = string
docker_bridge_cidr = string
network_plugin = string
network_policy = string
service_cidr = string
dns_service_ip = string
})
default = null
}
Expand Down
9 changes: 4 additions & 5 deletions src/_nebari/stages/infrastructure/template/azure/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,10 @@ variable "tags" {
variable "network_profile" {
description = "Network profile"
type = object({
network_plugin = string
network_policy = string
service_cidr = string
dns_service_ip = string
docker_bridge_cidr = string
network_plugin = string
network_policy = string
service_cidr = string
dns_service_ip = string
})
default = null
}
Expand Down
2 changes: 1 addition & 1 deletion src/_nebari/stages/infrastructure/template/azure/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "=3.97.1"
version = "=4.7.0"
}
}
required_version = ">= 1.0"
Expand Down
2 changes: 1 addition & 1 deletion src/_nebari/stages/terraform_state/template/azure/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "=3.97.1"
version = "=4.7.0"
}
}
required_version = ">= 1.0"
Expand Down
Loading