Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo in folder name #2

Merged
merged 1 commit into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions terraform/argo-workflows.tf
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ resource "kubectl_manifest" "application_argocd_argo_workflows" {
terraform_data.argo_workflows_keycloak_setup
]

yaml_body = templatefile("${path.module}/tempaltes/argocd-apps/argo-workflows.yaml", {
yaml_body = templatefile("${path.module}/templates/argocd-apps/argo-workflows.yaml", {
GITHUB_URL = local.repo_url
KEYCLOAK_CNOE_URL = local.kc_cnoe_url
ARGO_REDIRECT_URL = local.argo_redirect_url
Expand All @@ -106,7 +106,7 @@ resource "kubectl_manifest" "application_argocd_argo_workflows_templates" {
terraform_data.argo_workflows_keycloak_setup
]

yaml_body = templatefile("${path.module}/tempaltes/argocd-apps/argo-workflows-templates.yaml", {
yaml_body = templatefile("${path.module}/templates/argocd-apps/argo-workflows-templates.yaml", {
GITHUB_URL = local.repo_url
}
)
Expand All @@ -117,7 +117,7 @@ resource "kubectl_manifest" "application_argocd_argo_workflows_sso_config" {
terraform_data.argo_workflows_keycloak_setup
]

yaml_body = templatefile("${path.module}/tempaltes/argocd-apps/argo-workflows-sso-config.yaml", {
yaml_body = templatefile("${path.module}/templates/argocd-apps/argo-workflows-sso-config.yaml", {
GITHUB_URL = local.repo_url
}
)
Expand All @@ -128,7 +128,7 @@ resource "kubectl_manifest" "ingress_argo_workflows" {
kubectl_manifest.application_argocd_argo_workflows,
]

yaml_body = templatefile("${path.module}/tempaltes/manifests/ingress-argo-workflows.yaml", {
yaml_body = templatefile("${path.module}/templates/manifests/ingress-argo-workflows.yaml", {
ARGO_WORKFLOWS_DOMAIN_NAME = local.argo_domain_name
}
)
Expand Down
2 changes: 1 addition & 1 deletion terraform/aws-load-balancer.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module "aws_load_balancer_role" {

resource "kubectl_manifest" "application_argocd_aws_load_balancer_controller" {
depends_on = [ module.aws_load_balancer_role ]
yaml_body = templatefile("${path.module}/tempaltes/argocd-apps/aws-load-balancer.yaml", {
yaml_body = templatefile("${path.module}/templates/argocd-apps/aws-load-balancer.yaml", {
CLUSTER_NAME = local.cluster_name
ROLE_ARN = module.aws_load_balancer_role.iam_role_arn
}
Expand Down
4 changes: 2 additions & 2 deletions terraform/backstage.tf
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ resource "kubectl_manifest" "application_argocd_backstage" {
terraform_data.backstage_keycloak_setup
]

yaml_body = templatefile("${path.module}/tempaltes/argocd-apps/backstage.yaml", {
yaml_body = templatefile("${path.module}/templates/argocd-apps/backstage.yaml", {
GITHUB_URL = local.repo_url
}
)
Expand All @@ -73,7 +73,7 @@ resource "kubectl_manifest" "ingress_backstage" {
kubectl_manifest.application_argocd_backstage,
]

yaml_body = templatefile("${path.module}/tempaltes/manifests/ingress-backstage.yaml", {
yaml_body = templatefile("${path.module}/templates/manifests/ingress-backstage.yaml", {
BACKSTAGE_DOMAIN_NAME = local.backstage_domain_name
}
)
Expand Down
4 changes: 2 additions & 2 deletions terraform/cert-manager.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resource "kubectl_manifest" "application_argocd_cert_manager" {
yaml_body = templatefile("${path.module}/tempaltes/argocd-apps/cert-manager.yaml", {
yaml_body = templatefile("${path.module}/templates/argocd-apps/cert-manager.yaml", {
REPO_URL = local.repo_url
})

Expand All @@ -15,7 +15,7 @@ resource "kubectl_manifest" "cluster_issuer_prod" {
kubectl_manifest.application_argocd_cert_manager,
kubectl_manifest.application_argocd_ingress_nginx
]
yaml_body = templatefile("${path.module}/tempaltes/manifests/cluster-issuer.yaml", {
yaml_body = templatefile("${path.module}/templates/manifests/cluster-issuer.yaml", {
REPO_URL = local.repo_url
})
}
8 changes: 4 additions & 4 deletions terraform/crossplane.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module "crossplane_aws_provider_role" {
}

resource "kubectl_manifest" "application_argocd_crossplane" {
yaml_body = templatefile("${path.module}/tempaltes/argocd-apps/crossplane.yaml", {
yaml_body = templatefile("${path.module}/templates/argocd-apps/crossplane.yaml", {
GITHUB_URL = local.repo_url
}
)
Expand All @@ -42,7 +42,7 @@ resource "kubectl_manifest" "crossplane_provider_controller_config" {
depends_on = [
kubectl_manifest.application_argocd_crossplane,
]
yaml_body = templatefile("${path.module}/tempaltes/manifests/crossplane-aws-controller-config.yaml", {
yaml_body = templatefile("${path.module}/templates/manifests/crossplane-aws-controller-config.yaml", {
ROLE_ARN = module.crossplane_aws_provider_role.iam_role_arn
}
)
Expand All @@ -52,7 +52,7 @@ resource "kubectl_manifest" "application_argocd_crossplane_provider" {
depends_on = [
kubectl_manifest.application_argocd_crossplane,
]
yaml_body = templatefile("${path.module}/tempaltes/argocd-apps/crossplane-provider.yaml", {
yaml_body = templatefile("${path.module}/templates/argocd-apps/crossplane-provider.yaml", {
GITHUB_URL = local.repo_url
}
)
Expand All @@ -62,7 +62,7 @@ resource "kubectl_manifest" "application_argocd_crossplane_compositions" {
depends_on = [
kubectl_manifest.application_argocd_crossplane,
]
yaml_body = templatefile("${path.module}/tempaltes/argocd-apps/crossplane-compositions.yaml", {
yaml_body = templatefile("${path.module}/templates/argocd-apps/crossplane-compositions.yaml", {
GITHUB_URL = local.repo_url
}
)
Expand Down
2 changes: 1 addition & 1 deletion terraform/external-dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ module "external_dns_role" {
}

resource "kubectl_manifest" "application_argocd_external_dns" {
yaml_body = templatefile("${path.module}/tempaltes/argocd-apps/external-dns.yaml", {
yaml_body = templatefile("${path.module}/templates/argocd-apps/external-dns.yaml", {
GITHUB_URL = local.repo_url
ROLE_ARN = module.external_dns_role[0].iam_role_arn
DOMAIN_NAME = data.aws_route53_zone.selected[0].name
Expand Down
2 changes: 1 addition & 1 deletion terraform/external-secrets.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resource "kubectl_manifest" "application_argocd_external_secrets" {
yaml_body = templatefile("${path.module}/tempaltes/argocd-apps/external-secrets.yaml", {
yaml_body = templatefile("${path.module}/templates/argocd-apps/external-secrets.yaml", {
GITHUB_URL = local.repo_url
}
)
Expand Down
2 changes: 1 addition & 1 deletion terraform/ingress-nginx.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ resource "kubectl_manifest" "application_argocd_ingress_nginx" {
depends_on = [
kubectl_manifest.application_argocd_aws_load_balancer_controller
]
yaml_body = templatefile("${path.module}/tempaltes/argocd-apps/ingress-nginx.yaml", {
yaml_body = templatefile("${path.module}/templates/argocd-apps/ingress-nginx.yaml", {
GITHUB_URL = local.repo_url
}
)
Expand Down
6 changes: 3 additions & 3 deletions terraform/keycloak.tf
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ resource "kubectl_manifest" "keycloak_secret_store" {
kubernetes_manifest.serviceaccount_external_secret_keycloak
]

yaml_body = templatefile("${path.module}/tempaltes/manifests/keycloak-secret-store.yaml", {
yaml_body = templatefile("${path.module}/templates/manifests/keycloak-secret-store.yaml", {
REGION = local.region
}
)
Expand Down Expand Up @@ -206,7 +206,7 @@ resource "kubectl_manifest" "application_argocd_keycloak" {
kubectl_manifest.application_argocd_ingress_nginx
]

yaml_body = templatefile("${path.module}/tempaltes/argocd-apps/keycloak.yaml", {
yaml_body = templatefile("${path.module}/templates/argocd-apps/keycloak.yaml", {
GITHUB_URL = local.repo_url
PATH = "${local.secret_count == 1 ? "packages/keycloak/dev-external-secrets/" : "packages/keycloak/dev/"}"
}
Expand All @@ -232,7 +232,7 @@ resource "kubectl_manifest" "ingress_keycloak" {
kubectl_manifest.application_argocd_keycloak,
]

yaml_body = templatefile("${path.module}/tempaltes/manifests/ingress-keycloak.yaml", {
yaml_body = templatefile("${path.module}/templates/manifests/ingress-keycloak.yaml", {
KEYCLOAK_DOMAIN_NAME = local.kc_domain_name
}
)
Expand Down