Skip to content

Commit

Permalink
Merge branch 'master' into feature/stackscli-support
Browse files Browse the repository at this point in the history
  • Loading branch information
russellseymour committed Aug 30, 2022
2 parents 5a6154a + 573ed97 commit 9dcca88
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.DS_Store

.terraform
.terraform.lock.hcl
tfplan

local
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 Amido

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
4 changes: 2 additions & 2 deletions deploy/azure/infra/stacks-aks/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variable "vnet_cidr" {
}

module "aks_bootstrap" {
source = "git::https://github.com/amido/stacks-terraform//azurerm/modules/azurerm-aks?ref=v1.5.0"
source = "git::https://github.com/amido/stacks-terraform//azurerm/modules/azurerm-aks?ref=v1.5.1"
resource_namer = module.default_label.id
resource_group_location = var.resource_group_location
spn_object_id = data.azurerm_client_config.current.object_id
Expand Down Expand Up @@ -54,7 +54,7 @@ module "aks_bootstrap" {
}

module "ssl_app_gateway" {
source = "git::https://github.com/amido/stacks-terraform//azurerm/modules/azurerm-app-gateway?ref=v1.4.3"
source = "git::https://github.com/amido/stacks-terraform//azurerm/modules/azurerm-app-gateway?ref=v1.5.1"
resource_namer = module.default_label.id
resource_group_name = module.aks_bootstrap.resource_group_name
resource_group_location = var.resource_group_location
Expand Down
51 changes: 51 additions & 0 deletions deploy/azure/infra/stacks-aks/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,58 @@ output "issuer_pem" {
sensitive = true
}

output "app_gateway_resource_group_name" {
description = "Resource group of the Application Gateway"
value = module.ssl_app_gateway.app_gateway_resource_group_name
}

output "app_gateway_name" {
description = "Name of the Application Gateway"
value = module.ssl_app_gateway.app_gateway_name
}

output "app_gateway_ip" {
description = "Application Gateway public IP. Should be used with DNS provider at a top level. Can have multiple subs pointing to it - e.g. app.sub.domain.com, app-uat.sub.domain.com. App Gateway will perform SSL termination for all "
value = module.ssl_app_gateway.app_gateway_ip
}

output "dns_resource_group_name" {
description = "Resource group name for the DNS zones"
value = module.aks_bootstrap.dns_resource_group_name
}

output "dns_internal_resource_group_name" {
description = "Resource group name for the internal DNS zones"
value = module.aks_bootstrap.dns_internal_resource_group_name
}

output "dns_base_domain" {
description = "Base domain for the applications"
value = module.aks_bootstrap.dns_base_domain
}

output "dns_base_domain_internal" {
description = "Base internal domain for the applications"
value = module.aks_bootstrap.dns_base_domain_internal
}

output "app_insights_resource_group_name" {
description = "Resource group for Application Insights"
value = module.aks_bootstrap.app_insights_resource_group_name
}

output "app_insights_name" {
description = "Name of the Application Insights instance"
value = module.aks_bootstrap.app_insights_name
}

output "app_insights_id" {
description = "ID of the Application Insights instance"
value = module.aks_bootstrap.app_insights_id
}

output "app_insights_key" {
description = "Shared key of the Application Insights instance"
value = module.aks_bootstrap.app_insights_key
sensitive = true
}

0 comments on commit 9dcca88

Please sign in to comment.