Skip to content

azurerm_kubernetes_cluster - fix capacity_reservation_group_id loss during node pool cycling #30654

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+113 −21
Open

azurerm_kubernetes_cluster - fix capacity_reservation_group_id loss during node pool cycling #30654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
91 changes: 91 additions & 0 deletions internal/services/containers/kubernetes_cluster_other_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,28 @@ func TestAccKubernetesCluster_capacityReservationGroup(t *testing.T) {
})
}

func TestAccKubernetesCluster_capacityReservationGroupCycling(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.capacityReservationGroupCycling(data, 30),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep("default_node_pool.0.temporary_name_for_rotation"),
{
Config: r.capacityReservationGroupCycling(data, 60),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep("default_node_pool.0.temporary_name_for_rotation"),
})
}

func TestAccKubernetesCluster_completeMaintenanceConfigAutoUpgrade(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kubernetes_cluster", "test")
r := KubernetesClusterResource{}
Expand Down Expand Up @@ -2590,6 +2612,75 @@ resource "azurerm_kubernetes_cluster" "test" {
`, data.RandomInteger, data.Locations.Primary)
}

func (KubernetesClusterResource) capacityReservationGroupCycling(data acceptance.TestData, maxPods int) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-aks-%[1]d"
location = "%[2]s"
}

resource "azurerm_capacity_reservation_group" "test" {
name = "acctest-ccrg-%[1]d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
}

resource "azurerm_capacity_reservation" "test" {
name = "acctest-ccr-%[1]d"
capacity_reservation_group_id = azurerm_capacity_reservation_group.test.id

sku {
name = "Standard_D2s_v3"
capacity = 2
}
}

resource "azurerm_user_assigned_identity" "test" {
name = "acctest%[1]d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
}

resource "azurerm_role_assignment" "test" {
scope = azurerm_capacity_reservation_group.test.id
principal_id = azurerm_user_assigned_identity.test.principal_id
role_definition_name = "Owner"
}

resource "azurerm_kubernetes_cluster" "test" {
name = "acctestaks%[1]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
dns_prefix = "acctestaks%[1]d"
default_node_pool {
name = "default"
temporary_name_for_rotation = "temp"
node_count = 1
vm_size = "Standard_D2s_v3"
max_pods = %[3]d
capacity_reservation_group_id = azurerm_capacity_reservation.test.capacity_reservation_group_id
upgrade_settings {
max_surge = "10%%"
}
}

identity {
type = "UserAssigned"
identity_ids = [azurerm_user_assigned_identity.test.id]
}

depends_on = [
azurerm_capacity_reservation.test,
azurerm_role_assignment.test
]
}
`, data.RandomInteger, data.Locations.Primary, maxPods)
}

func (KubernetesClusterResource) completeMaintenanceConfigAutoUpgrade(data acceptance.TestData) string {
startDate := time.Now().Format("2006-01-02T00:00:00Z")
endDate := time.Now().AddDate(0, 0, 4).Format("2006-01-02T00:00:00Z")
Expand Down
43 changes: 22 additions & 21 deletions internal/services/containers/kubernetes_nodepool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,27 +676,28 @@ func ConvertDefaultNodePoolToAgentPool(input *[]managedclusters.ManagedClusterAg
agentpool := agentpools.AgentPool{
Name: &defaultCluster.Name,
Properties: &agentpools.ManagedClusterAgentPoolProfileProperties{
Count: defaultCluster.Count,
VMSize: defaultCluster.VMSize,
OsDiskSizeGB: defaultCluster.OsDiskSizeGB,
VnetSubnetID: defaultCluster.VnetSubnetID,
MaxPods: defaultCluster.MaxPods,
MaxCount: defaultCluster.MaxCount,
MinCount: defaultCluster.MinCount,
EnableAutoScaling: defaultCluster.EnableAutoScaling,
EnableEncryptionAtHost: defaultCluster.EnableEncryptionAtHost,
EnableFIPS: defaultCluster.EnableFIPS,
EnableUltraSSD: defaultCluster.EnableUltraSSD,
OrchestratorVersion: defaultCluster.OrchestratorVersion,
ProximityPlacementGroupID: defaultCluster.ProximityPlacementGroupID,
AvailabilityZones: defaultCluster.AvailabilityZones,
EnableNodePublicIP: defaultCluster.EnableNodePublicIP,
NodePublicIPPrefixID: defaultCluster.NodePublicIPPrefixID,
SpotMaxPrice: defaultCluster.SpotMaxPrice,
NodeLabels: defaultCluster.NodeLabels,
NodeTaints: defaultCluster.NodeTaints,
PodSubnetID: defaultCluster.PodSubnetID,
Tags: defaultCluster.Tags,
Count: defaultCluster.Count,
VMSize: defaultCluster.VMSize,
OsDiskSizeGB: defaultCluster.OsDiskSizeGB,
VnetSubnetID: defaultCluster.VnetSubnetID,
MaxPods: defaultCluster.MaxPods,
MaxCount: defaultCluster.MaxCount,
MinCount: defaultCluster.MinCount,
EnableAutoScaling: defaultCluster.EnableAutoScaling,
EnableEncryptionAtHost: defaultCluster.EnableEncryptionAtHost,
EnableFIPS: defaultCluster.EnableFIPS,
EnableUltraSSD: defaultCluster.EnableUltraSSD,
OrchestratorVersion: defaultCluster.OrchestratorVersion,
ProximityPlacementGroupID: defaultCluster.ProximityPlacementGroupID,
AvailabilityZones: defaultCluster.AvailabilityZones,
EnableNodePublicIP: defaultCluster.EnableNodePublicIP,
NodePublicIPPrefixID: defaultCluster.NodePublicIPPrefixID,
SpotMaxPrice: defaultCluster.SpotMaxPrice,
NodeLabels: defaultCluster.NodeLabels,
NodeTaints: defaultCluster.NodeTaints,
PodSubnetID: defaultCluster.PodSubnetID,
Tags: defaultCluster.Tags,
CapacityReservationGroupID: defaultCluster.CapacityReservationGroupID,
},
}

Expand Down
Loading