diff --git a/README.md b/README.md index 854dd9b..304418f 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ data "azurerm_subnet" "agents" { module "terraform-azurerm-vmss-devops-agent" { source = "tonyskidmore/vmss-devops-agent/azurerm" - version = "0.2.5" + version = "0.2.6" ado_org = var.ado_org ado_pool_name = var.ado_pool_name ado_project = var.ado_project diff --git a/examples/001-admin_password/README.md b/examples/001-admin_password/README.md index 9d635e3..0da9ace 100644 --- a/examples/001-admin_password/README.md +++ b/examples/001-admin_password/README.md @@ -56,7 +56,7 @@ To use this example update the `terraform.tfvars` file to match your Azure requi | Name | Source | Version | |------|--------|---------| -| terraform-azurerm-vmss-devops-agent | tonyskidmore/vmss-devops-agent/azurerm | 0.2.5 | +| terraform-azurerm-vmss-devops-agent | tonyskidmore/vmss-devops-agent/azurerm | 0.2.6 | ## Inputs | Name | Description | Type | Default | Required | @@ -100,7 +100,7 @@ data "azurerm_subnet" "agents" { module "terraform-azurerm-vmss-devops-agent" { source = "tonyskidmore/vmss-devops-agent/azurerm" - version = "0.2.5" + version = "0.2.6" ado_org = var.ado_org ado_pool_name = var.ado_pool_name ado_project = var.ado_project diff --git a/examples/001-admin_password/main.tf b/examples/001-admin_password/main.tf index 0800d95..8b40c0b 100644 --- a/examples/001-admin_password/main.tf +++ b/examples/001-admin_password/main.tf @@ -16,7 +16,7 @@ data "azurerm_subnet" "agents" { module "terraform-azurerm-vmss-devops-agent" { source = "tonyskidmore/vmss-devops-agent/azurerm" - version = "0.2.5" + version = "0.2.6" ado_org = var.ado_org ado_pool_name = var.ado_pool_name ado_project = var.ado_project diff --git a/examples/002-certificate_chain/README.md b/examples/002-certificate_chain/README.md index 1a35622..4aa2ffb 100644 --- a/examples/002-certificate_chain/README.md +++ b/examples/002-certificate_chain/README.md @@ -24,7 +24,7 @@ It demonstrates how to add a custom certificate chain to VMSS instances. This m | Name | Source | Version | |------|--------|---------| -| terraform-azurerm-vmss-devops-agent | tonyskidmore/vmss-devops-agent/azurerm | 0.2.5 | +| terraform-azurerm-vmss-devops-agent | tonyskidmore/vmss-devops-agent/azurerm | 0.2.6 | ## Inputs | Name | Description | Type | Default | Required | @@ -75,7 +75,7 @@ resource "tls_private_key" "vmss_ssh" { module "terraform-azurerm-vmss-devops-agent" { source = "tonyskidmore/vmss-devops-agent/azurerm" - version = "0.2.5" + version = "0.2.6" ado_org = var.ado_org ado_pool_name = var.ado_pool_name ado_project = var.ado_project diff --git a/examples/002-certificate_chain/main.tf b/examples/002-certificate_chain/main.tf index dba9b85..c7a3764 100644 --- a/examples/002-certificate_chain/main.tf +++ b/examples/002-certificate_chain/main.tf @@ -25,7 +25,7 @@ resource "tls_private_key" "vmss_ssh" { module "terraform-azurerm-vmss-devops-agent" { source = "tonyskidmore/vmss-devops-agent/azurerm" - version = "0.2.5" + version = "0.2.6" ado_org = var.ado_org ado_pool_name = var.ado_pool_name ado_project = var.ado_project diff --git a/examples/003-multi_zone/README.md b/examples/003-multi_zone/README.md index e5e5b61..49411b1 100644 --- a/examples/003-multi_zone/README.md +++ b/examples/003-multi_zone/README.md @@ -51,7 +51,7 @@ terraform plan -var ado_project_visibility=public -out tfplan | Name | Source | Version | |------|--------|---------| -| terraform-azurerm-vmss-devops-agent | tonyskidmore/vmss-devops-agent/azurerm | 0.2.5 | +| terraform-azurerm-vmss-devops-agent | tonyskidmore/vmss-devops-agent/azurerm | 0.2.6 | ## Inputs | Name | Description | Type | Default | Required | @@ -105,7 +105,7 @@ locals { module "terraform-azurerm-vmss-devops-agent" { source = "tonyskidmore/vmss-devops-agent/azurerm" - version = "0.2.5" + version = "0.2.6" ado_org = var.ado_org ado_pool_name = var.ado_pool_name ado_project = var.ado_project diff --git a/examples/003-multi_zone/main.tf b/examples/003-multi_zone/main.tf index cca3f07..e8fab7a 100644 --- a/examples/003-multi_zone/main.tf +++ b/examples/003-multi_zone/main.tf @@ -25,7 +25,7 @@ locals { module "terraform-azurerm-vmss-devops-agent" { source = "tonyskidmore/vmss-devops-agent/azurerm" - version = "0.2.5" + version = "0.2.6" ado_org = var.ado_org ado_pool_name = var.ado_pool_name ado_project = var.ado_project diff --git a/examples/004-docker_data_disk/README.md b/examples/004-docker_data_disk/README.md index b6404f2..da45adf 100644 --- a/examples/004-docker_data_disk/README.md +++ b/examples/004-docker_data_disk/README.md @@ -39,7 +39,7 @@ If using the `demo_environment` pipeline it will deploy 2 instances to begin wit | Name | Source | Version | |------|--------|---------| -| terraform-azurerm-vmss-devops-agent | tonyskidmore/vmss-devops-agent/azurerm | 0.2.5 | +| terraform-azurerm-vmss-devops-agent | tonyskidmore/vmss-devops-agent/azurerm | 0.2.6 | ## Inputs | Name | Description | Type | Default | Required | @@ -88,7 +88,7 @@ data "azurerm_subnet" "agents" { module "terraform-azurerm-vmss-devops-agent" { source = "tonyskidmore/vmss-devops-agent/azurerm" - version = "0.2.5" + version = "0.2.6" ado_org = var.ado_org ado_pool_name = var.ado_pool_name ado_project = var.ado_project diff --git a/examples/004-docker_data_disk/main.tf b/examples/004-docker_data_disk/main.tf index b0f4ca8..dff4c33 100644 --- a/examples/004-docker_data_disk/main.tf +++ b/examples/004-docker_data_disk/main.tf @@ -20,7 +20,7 @@ data "azurerm_subnet" "agents" { module "terraform-azurerm-vmss-devops-agent" { source = "tonyskidmore/vmss-devops-agent/azurerm" - version = "0.2.5" + version = "0.2.6" ado_org = var.ado_org ado_pool_name = var.ado_pool_name ado_project = var.ado_project diff --git a/examples/005-additional_packages/README.md b/examples/005-additional_packages/README.md index 59d3f40..c27825c 100644 --- a/examples/005-additional_packages/README.md +++ b/examples/005-additional_packages/README.md @@ -36,7 +36,7 @@ If using the `demo_environment`, to keep costs down ensure that after running an | Name | Source | Version | |------|--------|---------| -| terraform-azurerm-vmss-devops-agent | tonyskidmore/vmss-devops-agent/azurerm | 0.2.5 | +| terraform-azurerm-vmss-devops-agent | tonyskidmore/vmss-devops-agent/azurerm | 0.2.6 | ## Inputs | Name | Description | Type | Default | Required | @@ -84,7 +84,7 @@ data "azurerm_subnet" "agents" { module "terraform-azurerm-vmss-devops-agent" { source = "tonyskidmore/vmss-devops-agent/azurerm" - version = "0.2.5" + version = "0.2.6" ado_org = var.ado_org ado_pool_name = var.ado_pool_name ado_project = var.ado_project diff --git a/examples/005-additional_packages/main.tf b/examples/005-additional_packages/main.tf index ee01e2a..c14edb0 100644 --- a/examples/005-additional_packages/main.tf +++ b/examples/005-additional_packages/main.tf @@ -20,7 +20,7 @@ data "azurerm_subnet" "agents" { module "terraform-azurerm-vmss-devops-agent" { source = "tonyskidmore/vmss-devops-agent/azurerm" - version = "0.2.5" + version = "0.2.6" ado_org = var.ado_org ado_pool_name = var.ado_pool_name ado_project = var.ado_project diff --git a/examples/006-managed_identity/README.md b/examples/006-managed_identity/README.md index 27c3d7e..e03759a 100644 --- a/examples/006-managed_identity/README.md +++ b/examples/006-managed_identity/README.md @@ -55,7 +55,7 @@ To keep costs down ensure that after running and testing that you run `006-manag | Name | Source | Version | |------|--------|---------| -| terraform-azurerm-vmss-devops-agent | tonyskidmore/vmss-devops-agent/azurerm | 0.2.5 | +| terraform-azurerm-vmss-devops-agent | tonyskidmore/vmss-devops-agent/azurerm | 0.2.6 | ## Inputs | Name | Description | Type | Default | Required | @@ -104,7 +104,7 @@ data "azurerm_subnet" "agents" { module "terraform-azurerm-vmss-devops-agent" { source = "tonyskidmore/vmss-devops-agent/azurerm" - version = "0.2.5" + version = "0.2.6" ado_org = var.ado_org ado_pool_name = var.ado_pool_name ado_project = var.ado_project diff --git a/examples/006-managed_identity/main.tf b/examples/006-managed_identity/main.tf index 1f3dc63..5997c09 100644 --- a/examples/006-managed_identity/main.tf +++ b/examples/006-managed_identity/main.tf @@ -20,7 +20,7 @@ data "azurerm_subnet" "agents" { module "terraform-azurerm-vmss-devops-agent" { source = "tonyskidmore/vmss-devops-agent/azurerm" - version = "0.2.5" + version = "0.2.6" ado_org = var.ado_org ado_pool_name = var.ado_pool_name ado_project = var.ado_project diff --git a/examples/007-aks-agents/.terraform-docs.yml b/examples/007-aks-agents/.terraform-docs.yml index 51597f8..7e284ef 100644 --- a/examples/007-aks-agents/.terraform-docs.yml +++ b/examples/007-aks-agents/.terraform-docs.yml @@ -26,7 +26,7 @@ content: |- Example ```hcl - {{ include "aks/main.tf" }} + {{ include "aks-agents/main.tf" }} ``` output: file: "README.md" diff --git a/examples/007-aks-agents/README.md b/examples/007-aks-agents/README.md index 04cfcd6..dc2df7d 100644 --- a/examples/007-aks-agents/README.md +++ b/examples/007-aks-agents/README.md @@ -38,32 +38,20 @@ No outputs. Example ```hcl - provider "azurerm" { features {} } -resource "random_id" "prefix" { - byte_length = 8 -} - -data "azurerm_subnet" "agents" { - name = var.aks_subnet_name - resource_group_name = var.resource_group_name - virtual_network_name = var.vmss_vnet_name +data "azurerm_kubernetes_cluster" "default" { + name = var.cluster_name + resource_group_name = var.resource_group_name } -module "aks" { - source = "Azure/aks/azurerm" - version = "6.8.0" - prefix = "prefix-${random_id.prefix.hex}" - resource_group_name = var.resource_group_name - cluster_name = var.cluster_name - node_resource_group = var.node_resource_group - vnet_subnet_id = data.azurerm_subnet.agents.id - rbac_aad = var.rbac_aad - log_analytics_workspace_enabled = var.log_analytics_workspace_enabled - private_cluster_enabled = var.private_cluster_enabled +module "terraform-kubernetes-azure-devops-agent" { + source = "tonyskidmore/azure-devops-agent/kubernetes" + version = "0.0.4" + ado_ext_pat = var.ado_ext_pat + ado_org = var.ado_org } ```