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 - Updates no longer fail when using managed AAD integration #7874

Merged
merged 3 commits into from
Jul 28, 2020

Conversation

aristosvo
Copy link
Collaborator

@aristosvo aristosvo commented Jul 23, 2020

Fixes #7325

Acceptance Tests:

make acctests SERVICE='containers' TESTARGS='-run=TestAccAzureRMKubernetesCluster_roleBasedAccessControlAAD'
==> Checking that code complies with gofmt requirements...
==> Checking that Custom Timeouts are used...
==> Checking that acceptance test packages are used...
TF_ACC=1 go test -v ./azurerm/internal/services/containers/tests/ -run=TestAccAzureRMKubernetesCluster_roleBasedAccessControlAAD -timeout 180m -ldflags="-X=github.com/terraform-providers/terraform-provider-azurerm/version.ProviderVersion=acc"
=== RUN   TestAccAzureRMKubernetesCluster_roleBasedAccessControlAAD
=== PAUSE TestAccAzureRMKubernetesCluster_roleBasedAccessControlAAD
=== RUN   TestAccAzureRMKubernetesCluster_roleBasedAccessControlAADUpdateToManaged
=== PAUSE TestAccAzureRMKubernetesCluster_roleBasedAccessControlAADUpdateToManaged
=== RUN   TestAccAzureRMKubernetesCluster_roleBasedAccessControlAADManaged
=== PAUSE TestAccAzureRMKubernetesCluster_roleBasedAccessControlAADManaged
=== RUN   TestAccAzureRMKubernetesCluster_roleBasedAccessControlAADManagedChange
=== PAUSE TestAccAzureRMKubernetesCluster_roleBasedAccessControlAADManagedChange
=== CONT  TestAccAzureRMKubernetesCluster_roleBasedAccessControlAAD
=== CONT  TestAccAzureRMKubernetesCluster_roleBasedAccessControlAADManagedChange
=== CONT  TestAccAzureRMKubernetesCluster_roleBasedAccessControlAADManaged
=== CONT  TestAccAzureRMKubernetesCluster_roleBasedAccessControlAADUpdateToManaged
--- PASS: TestAccAzureRMKubernetesCluster_roleBasedAccessControlAADManaged (720.09s)
--- PASS: TestAccAzureRMKubernetesCluster_roleBasedAccessControlAAD (776.63s)
--- PASS: TestAccAzureRMKubernetesCluster_roleBasedAccessControlAADUpdateToManaged (853.89s)
--- PASS: TestAccAzureRMKubernetesCluster_roleBasedAccessControlAADManagedChange (979.83s)
PASS
ok      github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/containers/tests      981.018s

@aristosvo aristosvo changed the title Update kubernetes_cluster - Updates to kubernetes_cluster no longer fail when using managed AAD integration Update kubernetes_cluster - Updates no longer fail when using managed AAD integration Jul 23, 2020
Copy link
Member

@mbfrahry mbfrahry left a comment

Choose a reason for hiding this comment

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

Hey @aristosvo, these changes seem sane but we should add some nil checks and a test to confirm it works!

@aristosvo
Copy link
Collaborator Author

aristosvo commented Jul 23, 2020

Hey @aristosvo, these changes seem sane but we should add some nil checks and a test to confirm it works!

I've added nil checks and updated the acceptance tests to confirm that the following scenario's are working:

  • Update from AAD-v1 to AAD-v2/Managed
  • Node pool change with AAD-v2/Managed

Copy link
Member

@mbfrahry mbfrahry left a comment

Choose a reason for hiding this comment

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

LGTM!

@mbfrahry mbfrahry changed the title Update kubernetes_cluster - Updates no longer fail when using managed AAD integration azurerm_kubernetes_cluster - Updates no longer fail when using managed AAD integration Jul 28, 2020
@mbfrahry mbfrahry merged commit 7447cd9 into hashicorp:master Jul 28, 2020
mbfrahry added a commit that referenced this pull request Jul 28, 2020
@aristosvo aristosvo deleted the aad-v2-ga branch July 28, 2020 18:08
@ghost
Copy link

ghost commented Jul 31, 2020

This has been released in version 2.21.0 of the provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading. As an example:

provider "azurerm" {
    version = "~> 2.21.0"
}
# ... other configuration ...

@ghost
Copy link

ghost commented Aug 28, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. If you feel I made an error 🤖 🙉 , please reach out to my human friends 👉 hashibot-feedback@hashicorp.com. Thanks!

@ghost ghost locked and limited conversation to collaborators Aug 28, 2020
@aristosvo aristosvo restored the aad-v2-ga branch April 14, 2023 07:00
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.

Updates to azurerm_kubernetes_cluster fail when cluster uses managed AAD integration
2 participants