From b5091fc7e2320b3628f7fca274a9808b6bf2f6e9 Mon Sep 17 00:00:00 2001 From: diegoitaliait Date: Fri, 21 Jul 2023 11:23:05 +0200 Subject: [PATCH] pre-commit fixs --- src/aks-platform/scripts/terraform.sh | 2 +- src/domains/diego-app/02_namespace_domain.tf | 2 +- src/domains/diego-app/80_middleware_tools.tf | 1 - src/domains/diego-app/README.md | 11 ++++++++--- src/domains/diego-app/env/dev/terraform.tfvars | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/aks-platform/scripts/terraform.sh b/src/aks-platform/scripts/terraform.sh index 3d3b93a9..b1cfd9d6 100755 --- a/src/aks-platform/scripts/terraform.sh +++ b/src/aks-platform/scripts/terraform.sh @@ -26,7 +26,7 @@ function download_tool() { return 1 else chmod +x $tool - echo "${tool} downloaded! Please note this tool WON'T be copied in your **/bin folder for safety reasons. + echo "${tool} downloaded! Please note this tool WON'T be copied in your **/bin folder for safety reasons. You need to do it yourself!" read -p "Press enter to continue" diff --git a/src/domains/diego-app/02_namespace_domain.tf b/src/domains/diego-app/02_namespace_domain.tf index f2742062..a6b2d83a 100644 --- a/src/domains/diego-app/02_namespace_domain.tf +++ b/src/domains/diego-app/02_namespace_domain.tf @@ -16,7 +16,7 @@ module "domain_pod_identity" { namespace = kubernetes_namespace.domain_namespace.metadata[0].name key_vault_id = data.azurerm_key_vault.kv_domain.id - secret_permissions = ["Get"] + secret_permissions = ["Get"] certificate_permissions = ["Get"] } diff --git a/src/domains/diego-app/80_middleware_tools.tf b/src/domains/diego-app/80_middleware_tools.tf index 38bccfb7..0b5a00a6 100644 --- a/src/domains/diego-app/80_middleware_tools.tf +++ b/src/domains/diego-app/80_middleware_tools.tf @@ -26,4 +26,3 @@ module "cert_mounter" { kv_name = data.azurerm_key_vault.kv_domain.name tenant_id = data.azurerm_subscription.current.tenant_id } - diff --git a/src/domains/diego-app/README.md b/src/domains/diego-app/README.md index 3fbdc33c..1c7828c0 100644 --- a/src/domains/diego-app/README.md +++ b/src/domains/diego-app/README.md @@ -6,7 +6,7 @@ |------|---------| | [azuread](#requirement\_azuread) | = 2.21.0 | | [azurerm](#requirement\_azurerm) | <= 3.45.0 | -| [helm](#requirement\_helm) | = 2.8.0 | +| [helm](#requirement\_helm) | = 2.7.1 | | [kubernetes](#requirement\_kubernetes) | = 2.17.0 | | [null](#requirement\_null) | = 3.2.1 | @@ -14,8 +14,10 @@ | Name | Source | Version | |------|--------|---------| +| [cert\_mounter](#module\_cert\_mounter) | git::https://github.com/pagopa/terraform-azurerm-v3.git//cert_mounter | v6.20.1 | | [domain\_key\_vault\_secrets\_query](#module\_domain\_key\_vault\_secrets\_query) | git::https://github.com/pagopa/terraform-azurerm-v3.git//key_vault_secrets_query | v6.20.1 | -| [domain\_pod\_identity](#module\_domain\_pod\_identity) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_pod_identity | v6.20.1 | +| [domain\_pod\_identity](#module\_domain\_pod\_identity) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_pod_identity | pod-identity-fix-permissions | +| [tls\_checker](#module\_tls\_checker) | git::https://github.com/pagopa/terraform-azurerm-v3.git//tls_checker | v6.20.1 | ## Resources @@ -27,8 +29,9 @@ | [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_private_dns_a_record.ingress](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/private_dns_a_record) | resource | | [azurerm_role_assignment.aks_cluster_role](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/role_assignment) | resource | -| [helm_release.reloader](https://registry.terraform.io/providers/hashicorp/helm/2.8.0/docs/resources/release) | resource | +| [helm_release.reloader](https://registry.terraform.io/providers/hashicorp/helm/2.7.1/docs/resources/release) | resource | | [kubernetes_config_map.added](https://registry.terraform.io/providers/hashicorp/kubernetes/2.17.0/docs/resources/config_map) | resource | | [kubernetes_config_map.changed](https://registry.terraform.io/providers/hashicorp/kubernetes/2.17.0/docs/resources/config_map) | resource | | [kubernetes_config_map.replaced](https://registry.terraform.io/providers/hashicorp/kubernetes/2.17.0/docs/resources/config_map) | resource | @@ -53,6 +56,7 @@ | [azurerm_log_analytics_workspace.log_analytics](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/log_analytics_workspace) | data source | | [azurerm_monitor_action_group.email](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/monitor_action_group) | data source | | [azurerm_monitor_action_group.slack](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/monitor_action_group) | data source | +| [azurerm_private_dns_zone.internal](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/private_dns_zone) | data source | | [azurerm_resource_group.monitor_rg](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/resource_group) | data source | | [azurerm_resource_group.rg_vnet_core](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/resource_group) | data source | | [azurerm_subscription.current](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subscription) | data source | @@ -87,6 +91,7 @@ | [prefix](#input\_prefix) | n/a | `string` | n/a | yes | | [tags](#input\_tags) | n/a | `map(any)` | 
{
  "CreatedBy": "Terraform"
}
| no | | [terraform\_remote\_state\_core](#input\_terraform\_remote\_state\_core) | n/a | 
object({
    resource_group_name  = string,
    storage_account_name = string,
    container_name       = string,
    key                  = string
  })
| n/a | yes | +| [tls\_cert\_check\_helm](#input\_tls\_cert\_check\_helm) | tls cert helm chart configuration | 
object({
    chart_version = string,
    image_name    = string,
    image_tag     = string
  })
| n/a | yes | ## Outputs diff --git a/src/domains/diego-app/env/dev/terraform.tfvars b/src/domains/diego-app/env/dev/terraform.tfvars index e4390657..62b77833 100644 --- a/src/domains/diego-app/env/dev/terraform.tfvars +++ b/src/domains/diego-app/env/dev/terraform.tfvars @@ -36,7 +36,7 @@ log_analytics_workspace_resource_group_name = "dvopla-d-monitor-rg" aks_name = "dvopla-d-neu-dev01-aks" aks_resource_group_name = "dvopla-d-neu-dev01-aks-rg" -ingress_load_balancer_ip = "10.11.100.250" +ingress_load_balancer_ip = "10.11.100.250" ingress_load_balancer_hostname = "dev01.diego.internal.devopslab.pagopa.it" #