1
0
Форкнуть 0

Fix flux ns destroy & azuread caf var

This commit is contained in:
Hieu Nguyen Nhu 2021-07-25 07:28:09 +08:00
Родитель 4838ba13ed
Коммит 0dca1c9ad5
3 изменённых файлов: 6 добавлений и 5 удалений

Просмотреть файл

@ -56,7 +56,6 @@ jobs:
if: contains(github.event.comment.body, '/deploy-all') || contains(github.event.comment.body, '/deploy-launchpad') || github.event_name != 'issue_comment'
run: |
cd /tf/caf/enterprise_scale/construction_sets/aks/online/aks_secure_baseline/test
export ACTION="output -json -o /tf/caf/rover.output"
/tf/caf/enterprise_scale/construction_sets/aks/online/aks_secure_baseline/landingzone/scripts/launchpad.sh
prefix_output=$(cat /tf/caf/rover.output | jq -r .objects.value.launchpad.global_settings.prefixes[0])

Просмотреть файл

@ -1,5 +1,5 @@
module "flux_addon" {
source = "github.com/Azure/caf-terraform-landingzones//caf_solution/add-ons/aks_secure_baseline_v2/flux"
source = "github.com/Azure/caf-terraform-landingzones?ref=hieumoscow-patch-fluxns//caf_solution/add-ons/aks_secure_baseline_v2/flux"
for_each = var.flux_settings
setting = each.value
}

Просмотреть файл

@ -6,12 +6,14 @@ module "caf" {
logged_user_objectId = var.logged_user_objectId
tags = var.tags
resource_groups = var.resource_groups
azuread_apps = var.azuread_apps
azuread_users = var.azuread_users
azuread_groups = var.azuread_groups
keyvaults = var.keyvaults
managed_identities = var.managed_identities
role_mapping = var.role_mapping
azuread = {
azuread_apps = var.azuread_apps
azuread_users = var.azuread_users
azuread_groups = var.azuread_groups
}
networking = {
application_gateways = var.application_gateways