From 266fb14af89d8a86d992888d9287f56f0b9a5641 Mon Sep 17 00:00:00 2001 From: Chris Phillipson Date: Wed, 8 Nov 2023 05:37:44 -0800 Subject: [PATCH] Update Azure virtual network Terraform and Github Action workflows --- .github/workflows/azure-virtual-network-dispatch.yml | 4 ---- .github/workflows/azure-virtual-network.yml | 5 ----- terraform/azure/virtual-network/outputs.tf | 8 -------- 3 files changed, 17 deletions(-) diff --git a/.github/workflows/azure-virtual-network-dispatch.yml b/.github/workflows/azure-virtual-network-dispatch.yml index d8792928..d281e01d 100644 --- a/.github/workflows/azure-virtual-network-dispatch.yml +++ b/.github/workflows/azure-virtual-network-dispatch.yml @@ -15,9 +15,6 @@ on: aksSubnetCidr: description: "The Subnet CIDR block hosting AKS cluster (e.g., 10.1.128.0/18)" required: true - agwSubnetCidr: - description: "The Subnet CIDR block hosting the Application Ingress Gateway (e.g., 10.1.1.0/24)" - required: true action: required: true type: choice @@ -34,7 +31,6 @@ jobs: resourceGroupName: ${{ github.event.inputs.resourceGroupName }} operatorSubnetCidr: ${{ github.event.inputs.operatorSubnetCidr }} aksSubnetCidr: ${{ github.event.inputs.aksSubnetCidr }} - agwSubnetCidr: ${{ github.event.inputs.agwSubnetCidr }} action: ${{ github.event.inputs.action }} secrets: AZURE_AD_CLIENT_ID: ${{ secrets.AZURE_AD_CLIENT_ID }} diff --git a/.github/workflows/azure-virtual-network.yml b/.github/workflows/azure-virtual-network.yml index 8a9de762..72a9a6d6 100644 --- a/.github/workflows/azure-virtual-network.yml +++ b/.github/workflows/azure-virtual-network.yml @@ -19,10 +19,6 @@ on: description: "The Subnet CIDR block hosting AKS cluster (e.g., 10.1.128.0/18)" required: true type: string - agwSubnetCidr: - description: "The Subnet CIDR block hosting the Application Ingress Gateway (e.g., 10.1.1.0/24)" - required: true - type: string action: required: true type: string @@ -57,7 +53,6 @@ jobs: TF_VAR_vnet_cidr: ${{ inputs.virtualNetworkCidr }} TF_VAR_operator_subnet_cidr: ${{ inputs.operatorSubnetCidr }} TF_VAR_aks_subnet_cidr: ${{ inputs.aksSubnetCidr }} - TF_VAR_agw_subnet_cidr: ${{ inputs.agwSubnetCidr }} runs-on: ubuntu-22.04 outputs: diff --git a/terraform/azure/virtual-network/outputs.tf b/terraform/azure/virtual-network/outputs.tf index 552dc152..76f6cd80 100644 --- a/terraform/azure/virtual-network/outputs.tf +++ b/terraform/azure/virtual-network/outputs.tf @@ -22,14 +22,6 @@ output "aks_subnet_id" { value = azurerm_subnet.aks_subnet.id } -output "agw_subnet_name" { - value = azurerm_subnet.agw_subnet.name -} - -output "agw_subnet_id" { - value = azurerm_subnet.agw_subnet.id -} - output "vnet_suffix" { value = random_string.suffix.result }