diff --git a/README.md b/README.md index cb54c02b..93029933 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,6 @@ The module also deploys a `tenant` repository with the necessary configuration f | [aws.management-tenant-dns](#provider\_aws.management-tenant-dns) | 4.67.0 | | [aws.primaryregion](#provider\_aws.primaryregion) | 4.67.0 | | [random](#provider\_random) | 3.5.1 | -| [tls](#provider\_tls) | n/a | ## Modules @@ -44,7 +43,7 @@ The module also deploys a `tenant` repository with the necessary configuration f | [captain\_repository](#module\_captain\_repository) | ./modules/github-captain-repository/0.1.0 | n/a | | [common\_s3](#module\_common\_s3) | ./modules/multy-s3-bucket/0.1.0 | n/a | | [dnssec\_key](#module\_dnssec\_key) | git::https://github.com/GlueOps/terraform-module-cloud-aws-dnssec-kms-key.git | v0.1.0 | -| [glueops\_platform\_helm\_values](#module\_glueops\_platform\_helm\_values) | git::https://github.com/GlueOps/platform-helm-chart-platform.git | v0.13.3 | +| [glueops\_platform\_helm\_values](#module\_glueops\_platform\_helm\_values) | git::https://github.com/GlueOps/platform-helm-chart-platform.git | v0.13.5 | | [loki\_s3](#module\_loki\_s3) | ./modules/multy-s3-bucket/0.1.0 | n/a | | [opsgenie\_teams](#module\_opsgenie\_teams) | ./modules/opsgenie/0.1.0 | n/a | | [tenant\_readmes](#module\_tenant\_readmes) | ./modules/tenant-readme/0.1.0 | n/a | @@ -91,7 +90,6 @@ The module also deploys a `tenant` repository with the necessary configuration f | [random_password.dex_pomerium_client_secret](https://registry.terraform.io/providers/hashicorp/random/3.5.1/docs/resources/password) | resource | | [random_password.dex_vault_client_secret](https://registry.terraform.io/providers/hashicorp/random/3.5.1/docs/resources/password) | resource | | [random_password.grafana_admin_secret](https://registry.terraform.io/providers/hashicorp/random/3.5.1/docs/resources/password) | resource | -| [tls_private_key.tenant_stack_repostory_key](https://registry.terraform.io/providers/hashicorp/tls/latest/docs/resources/private_key) | resource | | [aws_route53_zone.management_tenant_dns](https://registry.terraform.io/providers/hashicorp/aws/4.67.0/docs/data-sources/route53_zone) | data source | ## Inputs @@ -99,8 +97,8 @@ The module also deploys a `tenant` repository with the necessary configuration f | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [backup\_region](#input\_backup\_region) | The secondary S3 region to create S3 bucket in used for backups. This should be different than the primary region and will have the data from the primary region replicated to it. | `string` | n/a | yes | -| [cluster\_environments](#input\_cluster\_environments) | The cluster environments and their respective github app ids | 
list(object({
    environment_name         = string
    github_app_client_id     = string
    github_app_client_secret = string
    github_api_token         = string
    admin_github_org_name    = string
    tenant_github_org_name   = string
    vault_github_org_team_policy_mappings = list(object({
      oidc_groups = list(string)
      policy_name = string
    }))
    argocd_rbac_policies = string

  }))
| 
[
  {
    "admin_github_org_name": "GlueOps",
    "argocd_rbac_policies": "      g, GlueOps:argocd_super_admins, role:admin\n      g, glueops-rocks:developers, role:developers\n      p, role:developers, clusters, get, *, allow\n      p, role:developers, *, get, development, allow\n      p, role:developers, repositories, *, development/*, allow\n      p, role:developers, applications, *, development/*, allow\n      p, role:developers, exec, *, development/*, allow\n",
    "environment_name": "test",
    "github_api_token": "apitokengoeshere",
    "github_app_client_id": "apidgoeshere",
    "github_app_client_secret": "secretgoeshere",
    "tenant_github_org_name": "glueops-rocks",
    "vault_github_org_team_policy_mappings": [
      {
        "oidc_groups": [
          "GlueOps:vault_super_admins"
        ],
        "policy_name": "editor"
      },
      {
        "oidc_groups": [
          "GlueOps:vault_super_admins",
          "testing-okta:developers"
        ],
        "policy_name": "reader"
      }
    ]
  }
]
| no | -| [github\_owner](#input\_github\_owner) | The GitHub Owner | `string` | n/a | yes | +| [cluster\_environments](#input\_cluster\_environments) | The cluster environments and their respective github app ids | 
list(object({
    environment_name                     = string
    github_oauth_app_client_id           = string
    github_oauth_app_client_secret       = string
    github_tenant_app_id                 = string
    github_tenant_app_installation_id    = string
    github_tenant_app_b64enc_private_key = string
    admin_github_org_name                = string
    tenant_github_org_name               = string
    vault_github_org_team_policy_mappings = list(object({
      oidc_groups = list(string)
      policy_name = string
    }))
    argocd_rbac_policies = string

  }))
| 
[
  {
    "admin_github_org_name": "GlueOps",
    "argocd_rbac_policies": "      g, GlueOps:argocd_super_admins, role:admin\n      g, glueops-rocks:developers, role:developers\n      p, role:developers, clusters, get, *, allow\n      p, role:developers, *, get, development, allow\n      p, role:developers, repositories, *, development/*, allow\n      p, role:developers, applications, *, development/*, allow\n      p, role:developers, exec, *, development/*, allow\n",
    "environment_name": "test",
    "github_oauth_app_client_id": "oauth-app-id",
    "github_oauth_app_client_secret": "oauth-app-secret",
    "github_tenant_app_b64enc_private_key": "tenant-github-app-b64enc-private-key",
    "github_tenant_app_id": "tenant-github-app-id",
    "github_tenant_app_installation_id": "tenant-github-app-installation-id",
    "tenant_github_org_name": "glueops-rocks",
    "vault_github_org_team_policy_mappings": [
      {
        "oidc_groups": [
          "GlueOps:vault_super_admins"
        ],
        "policy_name": "editor"
      },
      {
        "oidc_groups": [
          "GlueOps:vault_super_admins",
          "testing-okta:developers"
        ],
        "policy_name": "reader"
      }
    ]
  }
]
| no | +| [github\_owner](#input\_github\_owner) | The GitHub Owner where the tenant repo will be deployed. | `string` | n/a | yes | | [management\_tenant\_dns\_aws\_account\_id](#input\_management\_tenant\_dns\_aws\_account\_id) | The company AWS account id for the management-tenant-dns account | `string` | n/a | yes | | [management\_tenant\_dns\_zoneid](#input\_management\_tenant\_dns\_zoneid) | The Route53 ZoneID that all the delegation is coming from. | `string` | n/a | yes | | [opsgenie\_emails](#input\_opsgenie\_emails) | List of user email addresses | `list(string)` | n/a | yes | diff --git a/captain-repo.tf b/captain-repo.tf index dc3ce385..888aaa1e 100644 --- a/captain-repo.tf +++ b/captain-repo.tf @@ -3,25 +3,23 @@ module "captain_repository" { source = "./modules/github-captain-repository/0.1.0" repository_name = "${each.value.environment_name}.${aws_route53_zone.main.name}" files_to_create = { - "argocd.yaml" = module.argocd_helm_values[each.value.environment_name].helm_values - "platform.yaml" = module.glueops_platform_helm_values[each.value.environment_name].helm_values - "README.md" = module.tenant_readmes[each.value.environment_name].tenant_readme - - "${each.value.tenant_github_org_name}-glueops-${var.tenant_key}-${each.value.environment_name}-stack.pub" = tls_private_key.tenant_stack_repostory_key[each.value.environment_name].public_key_openssh - "terraform/kubernetes/.gitkeep" = "" - ".gitignore" = <