Skip to content

Commit 6d208c0

Browse files
authored
azurerm_kubernetes_cluster[_node_pool] - add support for Ubuntu2404 (#32070)
[ENHANCEMENT] * `azurerm_kubernetes_cluster` - add support for the `Ubuntu2404` OS SKU
1 parent f3a4394 commit 6d208c0

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

internal/services/containers/kubernetes_cluster_node_pool_resource.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ func resourceKubernetesClusterNodePoolSchema() map[string]*pluginsdk.Schema {
333333
string(agentpools.OSSKUAzureLinuxThree),
334334
string(agentpools.OSSKUUbuntu),
335335
string(agentpools.OSSKUUbuntuTwoTwoZeroFour),
336+
string(agentpools.OSSKUUbuntuTwoFourZeroFour),
336337
string(agentpools.OSSKUWindowsTwoZeroOneNine),
337338
string(agentpools.OSSKUWindowsTwoZeroTwoTwo),
338339
}, false),

internal/services/containers/kubernetes_nodepool.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ func SchemaDefaultNodePool() *pluginsdk.Schema {
191191
string(agentpools.OSSKUAzureLinuxThree),
192192
string(agentpools.OSSKUUbuntu),
193193
string(agentpools.OSSKUUbuntuTwoTwoZeroFour),
194+
string(agentpools.OSSKUUbuntuTwoFourZeroFour),
194195
string(agentpools.OSSKUWindowsTwoZeroOneNine),
195196
string(agentpools.OSSKUWindowsTwoZeroTwoTwo),
196197
}, false),

website/docs/r/kubernetes_cluster.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ A `default_node_pool` block supports the following:
423423

424424
* `os_disk_type` - (Optional) The type of disk which should be used for the Operating System. Possible values are `Ephemeral` and `Managed`. Defaults to `Managed`. `temporary_name_for_rotation` must be specified when attempting a change.
425425

426-
* `os_sku` - (Optional) Specifies the OS SKU used by the agent pool. Possible values are `AzureLinux`, `AzureLinux3`, `Ubuntu`, `Ubuntu2204`, `Windows2019` and `Windows2022`. If not specified, the default is `Ubuntu` when os_type=Linux or `Windows2019` if os_type=Windows (`Windows2022` Kubernetes ≥1.33). Changing between `AzureLinux` and `Ubuntu` does not replace the resource; otherwise `temporary_name_for_rotation` must be specified when attempting a change.
426+
* `os_sku` - (Optional) Specifies the OS SKU used by the agent pool. Possible values are `AzureLinux`, `AzureLinux3`, `Ubuntu`, `Ubuntu2204`, `Ubuntu2404`, `Windows2019` and `Windows2022`. If not specified, the default is `Ubuntu` when os_type=Linux or `Windows2019` if os_type=Windows (`Windows2022` Kubernetes ≥1.33). Changing between `AzureLinux` and `Ubuntu` does not replace the resource; otherwise `temporary_name_for_rotation` must be specified when attempting a change.
427427

428428
-> **Note:** `Windows2019` is deprecated and not supported for Kubernetes version ≥1.33.
429429

website/docs/r/kubernetes_cluster_node_pool.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ The following arguments are supported:
124124

125125
* `pod_subnet_id` - (Optional) The ID of the Subnet where the pods in the Node Pool should exist. Changing this property requires specifying `temporary_name_for_rotation`.
126126

127-
* `os_sku` - (Optional) Specifies the OS SKU used by the agent pool. Possible values are `AzureLinux`, `AzureLinux3`, `Ubuntu`, `Ubuntu2204`, `Windows2019` and `Windows2022`. If not specified, the default is `Ubuntu` when os_type=Linux or `Windows2019` if os_type=Windows (`Windows2022` Kubernetes ≥1.33). Changing between `AzureLinux` and `Ubuntu` does not replace the resource; any other change forces a new resource to be created.
127+
* `os_sku` - (Optional) Specifies the OS SKU used by the agent pool. Possible values are `AzureLinux`, `AzureLinux3`, `Ubuntu`, `Ubuntu2204`, `Ubuntu2404`, `Windows2019` and `Windows2022`. If not specified, the default is `Ubuntu` when os_type=Linux or `Windows2019` if os_type=Windows (`Windows2022` Kubernetes ≥1.33). Changing between `AzureLinux` and `Ubuntu` does not replace the resource; any other change forces a new resource to be created.
128128

129129
-> **Note:** `Windows2019` is deprecated and not supported for Kubernetes version ≥1.33.
130130

0 commit comments

Comments
 (0)