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.

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 - Support for KMS arguments #19893

Merged
merged 7 commits into from
Jan 18, 2023

Conversation

mkilchhofer
Copy link
Contributor

@mkilchhofer mkilchhofer commented Jan 6, 2023

Resolves #17957

Our security guys at @swisspost asked to implement Add Key Management Service (KMS) etcd encryption to an Azure Kubernetes Service (AKS) cluster. Unfortunately the provider did not implement it, so I implemented it for us and the community :-).

Example of implementation:

resource "azurerm_kubernetes_cluster" "aks" {
   
  # ...

  identity {
    type         = "UserAssigned"
    identity_ids = ["/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/rg-my-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id-acctestaks"]
  }

  key_management_service {
    key_vault_key_id  = "https://kv-acctestaks.vault.azure.net/keys/acctestaks/dummykeyversion"
  }
}

website/docs/r/kubernetes_cluster.html.markdown Outdated Show resolved Hide resolved
website/docs/r/kubernetes_cluster.html.markdown Outdated Show resolved Hide resolved
Enabled: utils.Bool(raw["enabled"].(bool)),
KeyId: utils.String(raw["key_id"].(string)),
KeyVaultNetworkAccess: &kvAccess,
KeyVaultResourceId: utils.String(raw["key_vault_resource_id"].(string)),
Copy link
Contributor

Choose a reason for hiding this comment

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

Would raw["key_vault_resource_id"] here be nil?

Copy link
Contributor

Choose a reason for hiding this comment

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

Hi @mkilchhofer , since the key_vault_resource_id is an optional argument, would raw["key_vault_resource_id"] return a nil and cause panic here?

Copy link
Contributor Author

@mkilchhofer mkilchhofer Jan 9, 2023

Choose a reason for hiding this comment

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

I didn't set it in my tests and did not get a panic here :-)

Will try to refactor this and remove it. (see comment of @stephybun #19893 (comment))

Copy link
Contributor Author

@mkilchhofer mkilchhofer Jan 11, 2023

Choose a reason for hiding this comment

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

As I don't know if its possible to attach a debugger to a provider I tested it with adding some logging:

$ git di
diff --git a/internal/services/containers/kubernetes_cluster_resource.go b/internal/services/containers/kubernetes_cluster_resource.go
index 0f4a4d70d9..1a3959cff5 100644
--- a/internal/services/containers/kubernetes_cluster_resource.go
+++ b/internal/services/containers/kubernetes_cluster_resource.go
@@ -3,6 +3,7 @@ package containers
 import (
        "context"
        "encoding/base64"
+       "encoding/json"
        "fmt"
        "log"
        "strconv"
@@ -3427,6 +3428,18 @@ func expandKubernetesClusterAzureKeyVaultKms(d *pluginsdk.ResourceData, input []
        }

        raw := input[0].(map[string]interface{})
+       rawJson, _ := json.Marshal(raw)
+
+       log.Printf("[DEBUG] AzureKeyVaultKms - raw %v", raw)
+       log.Printf("[DEBUG] AzureKeyVaultKms - raw %v", string(rawJson))
+
+       log.Printf("[DEBUG] AzureKeyVaultKms - raw[key_vault_key_id]: %v", raw["key_vault_key_id"])
+       log.Printf("[DEBUG] AzureKeyVaultKms - raw[key_vault_key_id](string): %v", raw["key_vault_key_id"].(string))
+
+       log.Printf("[DEBUG] AzureKeyVaultKms - raw[key_vault_resource_id]: %v", raw["key_vault_resource_id"])
+       log.Printf("[DEBUG] AzureKeyVaultKms - raw[key_vault_resource_id](string): %v", raw["key_vault_resource_id"].(string))
+
        kvAccess := managedclusters.KeyVaultNetworkAccessTypes(raw["key_vault_network_access"].(string))

        azureKeyVaultKms := &managedclusters.AzureKeyVaultKms{

Output of this is:

$ grep AzureKeyVaultKms runlog3.log
2023-01-11T15:59:32.812+0100 [DEBUG] provider.terraform-provider-azurerm: AzureKeyVaultKms - raw map[key_vault_key_id:https://kv-aks-ci-m98ln0012-gj9j.vault.azure.net/keys/aks-ci-m98ln0012-gj9jjw-etcd-encryption/c059c6be19c441df9520ced5f08efc72 key_vault_network_access:Public key_vault_resource_id:]: timestamp=2023-01-11T15:59:32.811+0100
2023-01-11T15:59:32.812+0100 [DEBUG] provider.terraform-provider-azurerm: AzureKeyVaultKms - raw {"key_vault_key_id":"https://kv-aks-ci-m98ln0012-gj9j.vault.azure.net/keys/aks-ci-m98ln0012-gj9jjw-etcd-encryption/c059c6be19c441df9520ced5f08efc72","key_vault_network_access":"Public","key_vault_resource_id":""}: timestamp=2023-01-11T15:59:32.811+0100

2023-01-11T15:59:32.812+0100 [DEBUG] provider.terraform-provider-azurerm: AzureKeyVaultKms - raw[key_vault_key_id]: https://kv-aks-ci-m98ln0012-gj9j.vault.azure.net/keys/aks-ci-m98ln0012-gj9jjw-etcd-encryption/c059c6be19c441df9520ced5f08efc72: timestamp=2023-01-11T15:59:32.812+0100
2023-01-11T15:59:32.812+0100 [DEBUG] provider.terraform-provider-azurerm: AzureKeyVaultKms - raw[key_vault_key_id](string): https://kv-aks-ci-m98ln0012-gj9j.vault.azure.net/keys/aks-ci-m98ln0012-gj9jjw-etcd-encryption/c059c6be19c441df9520ced5f08efc72: timestamp=2023-01-11T15:59:32.812+0100

2023-01-11T15:59:32.812+0100 [DEBUG] provider.terraform-provider-azurerm: AzureKeyVaultKms - raw[key_vault_resource_id]:: timestamp=2023-01-11T15:59:32.812+0100
2023-01-11T15:59:32.812+0100 [DEBUG] provider.terraform-provider-azurerm: AzureKeyVaultKms - raw[key_vault_resource_id](string):: timestamp=2023-01-11T15:59:32.812+0100

As you can see in the first 2 lines, raw["key_vault_resource_id"] is empty string when unset in HCL.

}

private := managedclusters.KeyVaultNetworkAccessTypesPrivate
if kvAccess == private && len(*azureKeyVaultKms.KeyVaultResourceId) == 0 {
Copy link
Contributor

Choose a reason for hiding this comment

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

If azureKeyVaultKms.KeyVaultResourceId is nil, then the dereference here would cause a panic.
If not, then what we're checking here is *azureKeyVaultKms.KeyVaultResourceId == ""

Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

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

Thanks for this PR @mkilchhofer. This is off to a great start, some changes need to be made to the schema but once that's done we can take another look through this 👍

@mkilchhofer mkilchhofer force-pushed the feature/aks_key_vault_kms branch 3 times, most recently from af2d767 to 988640c Compare January 10, 2023 16:39
@mkilchhofer mkilchhofer requested review from stephybun and lonegunmanb and removed request for stephybun and lonegunmanb January 13, 2023 19:07
Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

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

Thanks so much for making those changes @mkilchhofer!

I had one more comment regarding some nil checks in the flatten function which I unfortunately missed in the initial review, but once that's done this should be good to go!

No need to squash the commits, that will happen when this gets merged.

Great work and thanks again! 🙂

Apply suggestions from code review

Co-authored-by: stephybun <[email protected]>
Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

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

Thanks for this @mkilchhofer LGTM 💯

@stephybun stephybun merged commit 31237e9 into hashicorp:main Jan 18, 2023
@github-actions github-actions bot added this to the v3.40.0 milestone Jan 18, 2023
stephybun added a commit that referenced this pull request Jan 18, 2023
@mkilchhofer mkilchhofer deleted the feature/aks_key_vault_kms branch January 18, 2023 12:35
@mkilchhofer
Copy link
Contributor Author

Thank you for the approve and the merge. Your review was excellent 👍

@github-actions
Copy link

This functionality has been released in v3.40.0 of the Terraform Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 20, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support for KMS etcd encryption to an Azure Kubernetes Service (AKS)
3 participants