From e881b3ca3869792e0514cea085e002e2f831b26c Mon Sep 17 00:00:00 2001 From: modridi Date: Mon, 18 Sep 2023 15:41:27 +0200 Subject: [PATCH] update --- examples/aks/stack.tf | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/aks/stack.tf b/examples/aks/stack.tf index 412ffd4f26..82ed0a07a1 100644 --- a/examples/aks/stack.tf +++ b/examples/aks/stack.tf @@ -18,17 +18,17 @@ provider "kubernetes" { password = module.cluster.admin_password } -module "argocd" { +module "argocd_bootstrap" { source = "git::https://github.com/camptocamp/devops-stack-module-argocd.git//bootstrap?ref=v1.1.0" } provider "argocd" { server_addr = "127.0.0.1:8080" - auth_token = module.argocd.argocd_auth_token + auth_token = module.argocd_bootstrap.argocd_auth_token insecure = true plain_text = true port_forward = true - port_forward_with_namespace = module.argocd.argocd_namespace + port_forward_with_namespace = module.argocd_bootstrap.argocd_namespace kubernetes { host = module.cluster.admin_host @@ -43,7 +43,7 @@ module "ingress" { cluster_name = local.cluster_name base_domain = azurerm_dns_zone.this.name - argocd_namespace = module.argocd.argocd_namespace + argocd_namespace = module.argocd_bootstrap.argocd_namespace enable_service_monitor = false node_resource_group_name = module.cluster.node_resource_group @@ -53,7 +53,7 @@ module "ingress" { module "azure-workload-identity" { source = "git::https://github.com/camptocamp/devops-stack-module-azure-workload-identity.git?ref=v0.1.0" - argocd_namespace = module.argocd.argocd_namespace + argocd_namespace = module.argocd_bootstrap.argocd_namespace azure_tenant_id = data.azuread_client_config.current.tenant_id } @@ -63,7 +63,7 @@ module "cert-manager" { cluster_name = local.cluster_name base_domain = azurerm_dns_zone.this.name - argocd_namespace = module.argocd.argocd_namespace + argocd_namespace = module.argocd_bootstrap.argocd_namespace cluster_oidc_issuer_url = module.cluster.oidc_issuer_url node_resource_group_name = module.cluster.node_resource_group @@ -78,7 +78,7 @@ module "cert-manager" { module "loki-stack" { source = "git::https://github.com/camptocamp/devops-stack-module-loki-stack.git//aks?ref=v2.2.0" - argocd_namespace = module.argocd.argocd_namespace + argocd_namespace = module.argocd_bootstrap.argocd_namespace distributed_mode = true @@ -99,7 +99,7 @@ module "thanos" { cluster_name = local.cluster_name base_domain = azurerm_dns_zone.this.name - argocd_namespace = module.argocd.argocd_namespace + argocd_namespace = module.argocd_bootstrap.argocd_namespace cluster_issuer = local.cluster_issuer metrics_storage = { @@ -122,7 +122,7 @@ module "kube-prometheus-stack" { cluster_name = local.cluster_name base_domain = azurerm_dns_zone.this.name - argocd_namespace = module.argocd.argocd_namespace + argocd_namespace = module.argocd_bootstrap.argocd_namespace cluster_issuer = "letsencrypt-staging" alertmanager = { @@ -158,9 +158,9 @@ module "argocd_final" { cluster_issuer = "letsencrypt-staging" admin_enabled = "true" - namespace = module.argocd.argocd_namespace - accounts_pipeline_tokens = module.argocd.argocd_accounts_pipeline_tokens - server_secretkey = module.argocd.argocd_server_secretkey + namespace = module.argocd_bootstrap.argocd_namespace + accounts_pipeline_tokens = module.argocd_bootstrap.argocd_accounts_pipeline_tokens + server_secretkey = module.argocd_bootstrap.argocd_server_secretkey oidc = { name = "OIDC"