Skip to content

Commit

Permalink
Fix nonsensitive(azurerm_kubernetes_cluster.main.kube_config_raw) b…
Browse files Browse the repository at this point in the history
…reaks the 0.14 users (#98)

* Update docker file to use the current terraform-test image

* Remove deprecated  -check-variables from test script

* Add init step to validation test

* update

* update

* update

* update

* updatwe

* update

* update

* r1

* update README

* update

* update

* identity

* update

* update

* update

Co-authored-by: Malte Lantin <malantin@microsoft.com>
Co-authored-by: Ubuntu <weiyuping@ubuntu-wyp.4smfdm3ngeyufpdz0muw5zebpc.bx.internal.cloudapp.net>
Co-authored-by: root <root@ubuntu-wyp.4smfdm3ngeyufpdz0muw5zebpc.bx.internal.cloudapp.net>
Co-authored-by: Ubuntu <weiyuping@wyp-ubuntu.qiq11x12zo3e5gy3a0w4i3oaya.xx.internal.cloudapp.net>
  • Loading branch information
5 people authored May 6, 2021
1 parent 10f8a4c commit 1e7d9a3
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Pull the base image with given version.
ARG BUILD_TERRAFORM_VERSION="0.13.5"
ARG BUILD_TERRAFORM_VERSION="0.14.4"
FROM mcr.microsoft.com/terraform-test:${BUILD_TERRAFORM_VERSION}

ARG MODULE_NAME="terraform-azurerm-aks"
Expand Down
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ resource "azurerm_kubernetes_cluster" "main" {
}

dynamic "azure_active_directory" {
for_each = var.enable_role_based_access_control && ! var.rbac_aad_managed ? ["rbac"] : []
for_each = var.enable_role_based_access_control && !var.rbac_aad_managed ? ["rbac"] : []
content {
managed = false
client_app_id = var.rbac_aad_client_app_id
Expand Down
3 changes: 2 additions & 1 deletion outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ output "aks_id" {
}

output "kube_config_raw" {
value = nonsensitive(azurerm_kubernetes_cluster.main.kube_config_raw)
sensitive = true
value = azurerm_kubernetes_cluster.main.kube_config_raw
}

output "http_application_routing_zone_name" {
Expand Down
2 changes: 0 additions & 2 deletions test/fixture/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ module "aks" {
resource_group_name = azurerm_resource_group.main.name
client_id = var.client_id
client_secret = var.client_secret
kubernetes_version = "1.19.6"
orchestrator_version = "1.19.6"
network_plugin = "azure"
vnet_subnet_id = azurerm_subnet.test.id
os_disk_size_gb = 60
Expand Down
5 changes: 5 additions & 0 deletions test/fixture/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,8 @@ output "test_username" {
output "test_password" {
value = module.aks.password
}

output "test_kube_raw" {
sensitive = true
value = module.aks.kube_config_raw
}

0 comments on commit 1e7d9a3

Please sign in to comment.