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

Containerservices agentpoolprofile maxpods #1753

Merged
merged 12 commits into from
Aug 14, 2018
Merged

Containerservices agentpoolprofile maxpods #1753

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
448249f
Added max_pods to agent_pool_profiles in azurerm_kubernetes_cluster
lfshr Aug 10, 2018
eaeb6b9
Added ForceNew and Default to max_pods
lfshr Aug 10, 2018
ee594cd
Added max_pods to data_source_kubernetes_cluster agent_profile
lfshr Aug 10, 2018
d1b7f37
Updated the docs to include max_pods
lfshr Aug 10, 2018
462f35b
Fixed my terrible English. (I'm a flawed person)
lfshr Aug 10, 2018
8a40400
Changed max_pods to computed field
lfshr Aug 11, 2018
a4dca9d
Fixed max_pods field (added optional flag back in)
lfshr Aug 11, 2018
354dc26
Conditionally passing max_pods to SDK
lfshr Aug 11, 2018
eae9efe
Removed default pod count from documentation
lfshr Aug 14, 2018
7da78bc
Added test coverage for max_pods
lfshr Aug 14, 2018
f06a2f6
Fixed intentation
lfshr Aug 14, 2018
2481a78
Trying to fix indentations
lfshr Aug 14, 2018
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
9 changes: 9 additions & 0 deletions azurerm/data_source_kubernetes_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,11 @@ func dataSourceArmKubernetesCluster() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},

"max_pods": {
Type: schema.TypeInt,
Computed: true,
},
},
},
},
Expand Down Expand Up @@ -339,6 +344,10 @@ func flattenKubernetesClusterDataSourceAgentPoolProfiles(input *[]containerservi
agentPoolProfile["os_type"] = string(profile.OsType)
}

if profile.MaxPods != nil {
agentPoolProfile["max_pods"] = int(*profile.MaxPods)
}

agentPoolProfiles = append(agentPoolProfiles, agentPoolProfile)
}

Expand Down
15 changes: 15 additions & 0 deletions azurerm/resource_arm_kubernetes_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,13 @@ func resourceArmKubernetesCluster() *schema.Resource {
}, true),
DiffSuppressFunc: ignoreCaseDiffSuppressFunc,
},

"max_pods": {
Type: schema.TypeInt,
Optional: true,
Computed: true,
ForceNew: true,
},
},
},
},
Expand Down Expand Up @@ -532,6 +539,10 @@ func flattenAzureRmKubernetesClusterAgentPoolProfiles(profiles *[]containerservi
agentPoolProfile["os_type"] = string(profile.OsType)
}

if profile.MaxPods != nil {
agentPoolProfile["max_pods"] = int(*profile.MaxPods)
}

agentPoolProfiles = append(agentPoolProfiles, agentPoolProfile)
}

Expand Down Expand Up @@ -691,6 +702,10 @@ func expandAzureRmKubernetesClusterAgentProfiles(d *schema.ResourceData) []conta
OsType: containerservice.OSType(osType),
}

if maxPods := int32(config["max_pods"].(int)); maxPods > 0 {
profile.MaxPods = utils.Int32(maxPods)
}
Copy link
Contributor

Choose a reason for hiding this comment

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

could we update the acceptance tests (for the internal network probably makes the most sense, rather than a new test?) to set this value?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done :)


vnetSubnetID := config["vnet_subnet_id"].(string)
if vnetSubnetID != "" {
profile.VnetSubnetID = utils.String(vnetSubnetID)
Expand Down
1 change: 1 addition & 0 deletions website/docs/d/kubernetes_cluster.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ provider "kubernetes" {
* `os_disk_size_gb` - The size of the Agent VM's Operating System Disk in GB.
* `os_type` - The Operating System used for the Agents.
* `vnet_subnet_id` - The ID of the Subnet where the Agents in the Pool are provisioned.
* `max_pods` - The maximum number of pods that can run on each agent.

`service_principal` supports the following:

Expand Down
1 change: 1 addition & 0 deletions website/docs/r/kubernetes_cluster.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ The following arguments are supported:
* `os_disk_size_gb` - (Optional) The Agent Operating System disk size in GB. Changing this forces a new resource to be created.
* `os_type` - (Optional) The Operating System used for the Agents. Possible values are `Linux` and `Windows`. Changing this forces a new resource to be created. Defaults to `Linux`.
* `vnet_subnet_id` - (Optional) The ID of the Subnet where the Agents in the Pool should be provisioned. Changing this forces a new resource to be created.
* `max_pods` - (Optional) The maximum number of pods that can run on each agent. Default is 30.
Copy link
Contributor

Choose a reason for hiding this comment

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

This no longer defaults to 30 - so can we remove this?


`service_principal` supports the following:

Expand Down