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

azurerm_kubernetes_cluster - set windows_profile.admin_password to required in 4.0 as well as various doc updates #22554

Merged
merged 2 commits into from
Jul 20, 2023
Merged

azurerm_kubernetes_cluster - set windows_profile.admin_password to required in 4.0 as well as various doc updates #22554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1962e94
update docs and make admin_password required in 4.0
stephybun Jul 17, 2023
ac05d6e
revert admin_username to Required
stephybun Jul 17, 2023
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
2 changes: 1 addition & 1 deletion internal/services/containers/kubernetes_cluster_network_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3486,7 +3486,7 @@ func (KubernetesClusterResource) publicNetworkAccess(data acceptance.TestData, e
authorizedIPConfig := ""
if !enabled {
authorizedIPConfig = `api_server_access_profile {
authorized_ip_ranges = ["0.0.0.0/32"]
authorized_ip_ranges = ["0.0.0.0/0"]
}`
}
return fmt.Sprintf(`
Expand Down
62 changes: 34 additions & 28 deletions internal/services/containers/kubernetes_cluster_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,24 +366,13 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
},
},

"monitor_metrics": {
"custom_ca_trust_certificates_base64": {
Type: pluginsdk.TypeList,
MaxItems: 1,
Optional: true,
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"annotations_allowed": {
Type: pluginsdk.TypeString,
Optional: true,
ValidateFunc: validation.StringIsNotEmpty,
},

"labels_allowed": {
Type: pluginsdk.TypeString,
Optional: true,
ValidateFunc: validation.StringIsNotEmpty,
},
},
MaxItems: 10,
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringIsBase64,
},
},

Expand Down Expand Up @@ -919,6 +908,27 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
},
},

"monitor_metrics": {
Type: pluginsdk.TypeList,
MaxItems: 1,
Optional: true,
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"annotations_allowed": {
Type: pluginsdk.TypeString,
Optional: true,
ValidateFunc: validation.StringIsNotEmpty,
},

"labels_allowed": {
Type: pluginsdk.TypeString,
Optional: true,
ValidateFunc: validation.StringIsNotEmpty,
},
},
},
},

"node_os_channel_upgrade": {
Type: pluginsdk.TypeString,
Optional: true,
Expand Down Expand Up @@ -1407,9 +1417,10 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
Required: true,
ForceNew: true,
},
// This needs to become Required in 4.0 - omitting it isn't accepted by the API
"admin_password": {
Type: pluginsdk.TypeString,
Optional: true,
Required: true,
Sensitive: true,
ValidateFunc: validation.StringLenBetween(8, 123),
},
Expand Down Expand Up @@ -1474,20 +1485,9 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
Optional: true,
Default: false,
},

"custom_ca_trust_certificates_base64": {
Type: pluginsdk.TypeList,
Optional: true,
MaxItems: 10,
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringIsBase64,
},
},
},
}

// CLEANUP: post-3.0 we should inline these?
for k, v := range schemaKubernetesAddOns() {
resource.Schema[k] = v
}
Expand Down Expand Up @@ -1521,6 +1521,12 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
"Overlay",
}, false),
}
resource.Schema["windows_profile"].Elem.(*pluginsdk.Resource).Schema["admin_password"] = &pluginsdk.Schema{
Type: pluginsdk.TypeString,
Optional: true,
Sensitive: true,
ValidateFunc: validation.StringLenBetween(8, 123),
}
}

return resource
Expand Down
10 changes: 6 additions & 4 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 @@ -101,6 +101,8 @@ In addition, one of either `identity` or `service_principal` blocks must be spec

* `confidential_computing` - (Optional) A `confidential_computing` block as defined below. For more details please [the documentation](https://learn.microsoft.com/en-us/azure/confidential-computing/confidential-nodes-aks-overview)

* `custom_ca_trust_certificates_base64` - (Optional) A list of up to 10 base64 encoded CAs that will be added to the trust store on nodes with the `custom_ca_trust_enabled` feature enabled.

* `disk_encryption_set_id` - (Optional) The ID of the Disk Encryption Set which should be used for the Nodes and Volumes. More information [can be found in the documentation](https://docs.microsoft.com/azure/aks/azure-disk-customer-managed-keys). Changing this forces a new resource to be created.

* `edge_zone` - (Optional) Specifies the Edge Zone within the Azure Region where this Managed Kubernetes Cluster should exist. Changing this forces a new resource to be created.
Expand Down Expand Up @@ -231,7 +233,7 @@ resource "azurerm_kubernetes_cluster" "example" {

* `public_network_access_enabled` - (Optional) Whether public network access is allowed for this Kubernetes Cluster. Defaults to `true`. Changing this forces a new resource to be created.

-> **Note:** When `public_network_access_enabled` is set to `true`, `0.0.0.0/32` must be added to `authorized_ip_ranges` in the `api_server_access_profile` block.
-> **Note:** When `public_network_access_enabled` is set to `true`, `0.0.0.0/0` must be added to `authorized_ip_ranges` in the `api_server_access_profile` block.

* `role_based_access_control_enabled` - (Optional) Whether Role Based Access Control for the Kubernetes Cluster should be enabled. Defaults to `true`. Changing this forces a new resource to be created.

Expand Down Expand Up @@ -671,13 +673,13 @@ A `network_profile` block supports the following:

~> **Note:** When `ebpf_data_plane` is set to `cilium`, the `network_plugin` field can only be set to `azure`.

~> **Note:** When `ebpf_data_plane` is set to `cilium`, one of either `network_plugin_mode = "Overlay"` or `pod_subnet_id` must be specified.
~> **Note:** When `ebpf_data_plane` is set to `cilium`, one of either `network_plugin_mode = "overlay"` or `pod_subnet_id` must be specified.

-> **Note:** This requires that the Preview Feature `Microsoft.ContainerService/CiliumDataplanePreview` is enabled and the Resource Provider is re-registered, see [the documentation](https://learn.microsoft.com/en-us/azure/aks/azure-cni-powered-by-cilium) for more information.

* `network_plugin_mode` - (Optional) Specifies the network plugin mode used for building the Kubernetes network. Possible value is `Overlay`. Changing this forces a new resource to be created.
* `network_plugin_mode` - (Optional) Specifies the network plugin mode used for building the Kubernetes network. Possible value is `overlay`. Changing this forces a new resource to be created.

~> **Note:** When `network_plugin_mode` is set to `Overlay`, the `network_plugin` field can only be set to `azure`.
~> **Note:** When `network_plugin_mode` is set to `overlay`, the `network_plugin` field can only be set to `azure`.

* `outbound_type` - (Optional) The outbound (egress) routing method which should be used for this Kubernetes Cluster. Possible values are `loadBalancer`, `userDefinedRouting`, `managedNATGateway` and `userAssignedNATGateway`. Defaults to `loadBalancer`. Changing this forces a new resource to be created.

Expand Down