Skip to content

Commit

Permalink
feat: Created domain diego-container-apps + dapr apps (#49)
Browse files Browse the repository at this point in the history
* changed file names

* removed container apps from diego-app

* created dedicated domain diego-container-apps

* azurerm upgrated to 3.45

* minor fix

* container app for dapr showcase

* pre-commit fixs

* created env for dapr apps

* added backendapp

* pre-commit fixs
  • Loading branch information
diegolagospagopa authored Feb 28, 2023
1 parent 9ef61db commit d4a162d
Show file tree
Hide file tree
Showing 28 changed files with 1,009 additions and 171 deletions.
37 changes: 19 additions & 18 deletions src/.env/dev/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,25 @@ key_vault_name = "dvopla-d-neu-kv"
key_vault_rg_name = "dvopla-d-sec-rg"

# ☁️ networking
cidr_vnet = ["10.1.0.0/16"]
cidr_subnet_k8s = ["10.1.0.0/17"]
cidr_subnet_appgateway = ["10.1.128.0/24"]
cidr_subnet_postgres = ["10.1.129.0/24"]
cidr_subnet_azdoa = ["10.1.130.0/24"]
cidr_subnet_app_docker = ["10.1.132.0/24"]
cidr_subnet_flex_dbms = ["10.1.133.0/24"]
cidr_subnet_apim = ["10.1.136.0/24"]
cidr_subnet_appgateway_beta = ["10.1.138.0/24"]
cidr_subnet_vpn = ["10.1.139.0/24"]
cidr_subnet_dnsforwarder = ["10.1.140.0/29"]
cidr_subnet_private_endpoints = ["10.1.141.0/24"]
cidr_subnet_eventhub = ["10.1.142.0/24"]
cidr_subnet_redis = ["10.1.143.0/24"]
cidr_subnet_funcs_diego_domain = ["10.1.144.0/24"]
cidr_subnet_app_diego_app = ["10.1.145.0/24"]
cidr_subnet_container_apps = ["10.1.146.0/23"]
cidr_subnet_placeholder = ["10.1.148.0/24"]
cidr_vnet = ["10.1.0.0/16"]
cidr_subnet_k8s = ["10.1.0.0/17"]
cidr_subnet_appgateway = ["10.1.128.0/24"]
cidr_subnet_postgres = ["10.1.129.0/24"]
cidr_subnet_azdoa = ["10.1.130.0/24"]
cidr_subnet_app_docker = ["10.1.132.0/24"]
cidr_subnet_flex_dbms = ["10.1.133.0/24"]
cidr_subnet_apim = ["10.1.136.0/24"]
cidr_subnet_appgateway_beta = ["10.1.138.0/24"]
cidr_subnet_vpn = ["10.1.139.0/24"]
cidr_subnet_dnsforwarder = ["10.1.140.0/29"]
cidr_subnet_private_endpoints = ["10.1.141.0/24"]
cidr_subnet_eventhub = ["10.1.142.0/24"]
cidr_subnet_redis = ["10.1.143.0/24"]
cidr_subnet_funcs_diego_domain = ["10.1.144.0/24"]
cidr_subnet_app_diego_app = ["10.1.145.0/24"]
cidr_subnet_container_apps = ["10.1.146.0/23"] #placeholder
dvopla-d-neu-core-github-runner-snet = ["10.1.148.0/23"] #placeholder
cidr_subnet_container_apps_dapr = ["10.1.150.0/23"] #placeholder

# dns
prod_dns_zone_prefix = "devopslab"
Expand Down
71 changes: 0 additions & 71 deletions src/domains/diego-app/05_container_app_0.tf

This file was deleted.

36 changes: 0 additions & 36 deletions src/domains/diego-app/05_container_app_amassador.tf

This file was deleted.

35 changes: 0 additions & 35 deletions src/domains/diego-app/05_container_app_devops_color_java.tf

This file was deleted.

2 changes: 1 addition & 1 deletion src/domains/diego-app/99_main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "<= 3.38.0"
version = "<= 3.45.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
10 changes: 1 addition & 9 deletions src/domains/diego-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
| Name | Version |
|------|---------|
| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | = 2.21.0 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | <= 3.38.0 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | <= 3.45.0 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | = 2.5.1 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | = 2.11.0 |
| <a name="requirement_null"></a> [null](#requirement\_null) | = 3.1.1 |
Expand All @@ -14,7 +14,6 @@

| Name | Source | Version |
|------|--------|---------|
| <a name="module_container_apps_snet"></a> [container\_apps\_snet](#module\_container\_apps\_snet) | git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet | v4.1.0 |
| <a name="module_domain_key_vault_secrets_query"></a> [domain\_key\_vault\_secrets\_query](#module\_domain\_key\_vault\_secrets\_query) | git::https://github.com/pagopa/terraform-azurerm-v3.git//key_vault_secrets_query | v4.1.0 |
| <a name="module_domain_pod_identity"></a> [domain\_pod\_identity](#module\_domain\_pod\_identity) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_pod_identity | v4.1.0 |

Expand All @@ -26,21 +25,14 @@
| [azurerm_key_vault_secret.app_insights_connection_string](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource |
| [azurerm_key_vault_secret.azure_devops_sa_cacrt](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource |
| [azurerm_key_vault_secret.azure_devops_sa_token](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource |
| [azurerm_resource_group.container_app_diego](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/resource_group) | resource |
| [helm_release.reloader](https://registry.terraform.io/providers/hashicorp/helm/2.5.1/docs/resources/release) | resource |
| [kubernetes_namespace.domain_namespace](https://registry.terraform.io/providers/hashicorp/kubernetes/2.11.0/docs/resources/namespace) | resource |
| [kubernetes_namespace.system_domain_namespace](https://registry.terraform.io/providers/hashicorp/kubernetes/2.11.0/docs/resources/namespace) | resource |
| [kubernetes_role_binding.deployer_binding](https://registry.terraform.io/providers/hashicorp/kubernetes/2.11.0/docs/resources/role_binding) | resource |
| [kubernetes_role_binding.system_deployer_binding](https://registry.terraform.io/providers/hashicorp/kubernetes/2.11.0/docs/resources/role_binding) | resource |
| [kubernetes_service_account.azure_devops](https://registry.terraform.io/providers/hashicorp/kubernetes/2.11.0/docs/resources/service_account) | resource |
| [local_file.save_yaml_file_ambassador](https://registry.terraform.io/providers/hashicorp/local/latest/docs/resources/file) | resource |
| [local_file.save_yaml_file_devops_color](https://registry.terraform.io/providers/hashicorp/local/latest/docs/resources/file) | resource |
| [null_resource.aks_with_iac_aad_plus_namespace](https://registry.terraform.io/providers/hashicorp/null/3.1.1/docs/resources/resource) | resource |
| [null_resource.aks_with_iac_aad_plus_namespace_system](https://registry.terraform.io/providers/hashicorp/null/3.1.1/docs/resources/resource) | resource |
| [null_resource.apply_container_app_yaml_ambassador](https://registry.terraform.io/providers/hashicorp/null/3.1.1/docs/resources/resource) | resource |
| [null_resource.apply_container_app_yaml_devops_color](https://registry.terraform.io/providers/hashicorp/null/3.1.1/docs/resources/resource) | resource |
| [null_resource.container_app_create_env](https://registry.terraform.io/providers/hashicorp/null/3.1.1/docs/resources/resource) | resource |
| [null_resource.update_az_cli](https://registry.terraform.io/providers/hashicorp/null/3.1.1/docs/resources/resource) | resource |
| [azuread_group.adgroup_admin](https://registry.terraform.io/providers/hashicorp/azuread/2.21.0/docs/data-sources/group) | data source |
| [azuread_group.adgroup_developers](https://registry.terraform.io/providers/hashicorp/azuread/2.21.0/docs/data-sources/group) | data source |
| [azuread_group.adgroup_externals](https://registry.terraform.io/providers/hashicorp/azuread/2.21.0/docs/data-sources/group) | data source |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,5 @@ properties:
failureThreshold: 6
timeoutSeconds: 10
scale:
minReplicas: 1
minReplicas: 0
maxReplicas: 3
61 changes: 61 additions & 0 deletions src/domains/diego-container-apps/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions src/domains/diego-container-apps/00_azuread.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Azure AD
data "azuread_group" "adgroup_admin" {
display_name = "${local.product}-adgroup-admin"
}

data "azuread_group" "adgroup_developers" {
display_name = "${local.product}-adgroup-developers"
}

data "azuread_group" "adgroup_externals" {
display_name = "${local.product}-adgroup-externals"
}

data "azuread_group" "adgroup_security" {
display_name = "${local.product}-adgroup-security"
}
15 changes: 15 additions & 0 deletions src/domains/diego-container-apps/00_key_vault.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# data "azurerm_key_vault" "kv_domain" {
# name = "${local.product}-${var.domain}-kv"
# resource_group_name = "${local.product}-${var.domain}-sec-rg"
# }

# module "domain_key_vault_secrets_query" {
# source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//key_vault_secrets_query?ref=v5.3.0"

# key_vault_name = local.key_vault_domain_name
# resource_group = local.key_vault_domain_resource_group

# secrets = [
# "dvopla-d-appinsights-connection-string"
# ]
# }
23 changes: 23 additions & 0 deletions src/domains/diego-container-apps/00_monitor.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
data "azurerm_resource_group" "monitor_rg" {
name = var.monitor_resource_group_name
}

data "azurerm_log_analytics_workspace" "log_analytics" {
name = var.log_analytics_workspace_name
resource_group_name = var.log_analytics_workspace_resource_group_name
}

data "azurerm_application_insights" "application_insights" {
name = local.monitor_appinsights_name
resource_group_name = data.azurerm_resource_group.monitor_rg.name
}

data "azurerm_monitor_action_group" "slack" {
resource_group_name = var.monitor_resource_group_name
name = local.monitor_action_group_slack_name
}

data "azurerm_monitor_action_group" "email" {
resource_group_name = var.monitor_resource_group_name
name = local.monitor_action_group_email_name
}
8 changes: 8 additions & 0 deletions src/domains/diego-container-apps/00_network.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
data "azurerm_virtual_network" "vnet_core" {
name = local.vnet_core_name
resource_group_name = local.vnet_core_resource_group_name
}

data "azurerm_resource_group" "rg_vnet_core" {
name = local.vnet_core_resource_group_name
}
Loading

0 comments on commit d4a162d

Please sign in to comment.