Skip to content

Commit a5c2c90

Browse files
Address review comments for pod_ip_allocation_mode
- Use pointer.From() in default_node_pool flatten (kubernetes_nodepool.go) - Use pointer.From() in node_pool resource Read - Add test step to switch from StaticBlock to DynamicIndividual - Simplifies code and follows established patterns
1 parent 0f4083f commit a5c2c90

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

internal/services/containers/kubernetes_cluster_node_pool_resource.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,9 +1248,7 @@ func resourceKubernetesClusterNodePoolRead(d *pluginsdk.ResourceData, meta inter
12481248
return fmt.Errorf("setting `node_network_profile`: %+v", err)
12491249
}
12501250

1251-
if props.PodIPAllocationMode != nil {
1252-
d.Set("pod_ip_allocation_mode", string(*props.PodIPAllocationMode))
1253-
}
1251+
d.Set("pod_ip_allocation_mode", string(pointer.From(props.PodIPAllocationMode)))
12541252
}
12551253

12561254
return tags.FlattenAndSet(d, resp.Model.Properties.Tags)

internal/services/containers/kubernetes_cluster_resource_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,13 @@ func TestAccKubernetesCluster_defaultNodePoolPodIPAllocationMode(t *testing.T) {
6969
),
7070
},
7171
data.ImportStep(),
72+
{
73+
Config: r.defaultNodePoolPodIPAllocationMode(data, "DynamicIndividual"),
74+
Check: acceptance.ComposeTestCheckFunc(
75+
check.That(data.ResourceName).ExistsInAzure(r),
76+
),
77+
},
78+
data.ImportStep(),
7279
})
7380
}
7481

internal/services/containers/kubernetes_nodepool.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,11 +1302,6 @@ func FlattenDefaultNodePool(input *[]managedclusters.ManagedClusterAgentPoolProf
13021302
podSubnetId = *agentPool.PodSubnetID
13031303
}
13041304

1305-
podIPAllocationMode := ""
1306-
if agentPool.PodIPAllocationMode != nil {
1307-
podIPAllocationMode = string(*agentPool.PodIPAllocationMode)
1308-
}
1309-
13101305
vnetSubnetId := ""
13111306
if agentPool.VnetSubnetID != nil {
13121307
vnetSubnetId = *agentPool.VnetSubnetID
@@ -1410,7 +1405,7 @@ func FlattenDefaultNodePool(input *[]managedclusters.ManagedClusterAgentPoolProf
14101405
"vm_size": vmSize,
14111406
"workload_runtime": workloadRunTime,
14121407
"pod_subnet_id": podSubnetId,
1413-
"pod_ip_allocation_mode": podIPAllocationMode,
1408+
"pod_ip_allocation_mode": string(pointer.From(agentPool.PodIPAllocationMode)),
14141409
"orchestrator_version": orchestratorVersion,
14151410
"proximity_placement_group_id": proximityPlacementGroupId,
14161411
"upgrade_settings": upgradeSettings,

0 commit comments

Comments
 (0)