From 86185a9b2ea91708ff599315d67087d66daa89c1 Mon Sep 17 00:00:00 2001 From: diegoitaliait Date: Wed, 19 Jul 2023 15:01:04 +0200 Subject: [PATCH] pre-commit fixs --- src/aks-platform/README.md | 14 ++++++++++---- src/aks-platform/scripts/terraform.sh | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/aks-platform/README.md b/src/aks-platform/README.md index 41d0d6f4..12cbb544 100644 --- a/src/aks-platform/README.md +++ b/src/aks-platform/README.md @@ -30,16 +30,16 @@ Re-enable all the resource, commented before to complete the procedure |------|---------| | [terraform](#requirement\_terraform) | >=1.3.0 | | [azuread](#requirement\_azuread) | > 2.10.0 | -| [azurerm](#requirement\_azurerm) | >= 3.36.0 | +| [azurerm](#requirement\_azurerm) | >= 3.64.0 | ## Modules | Name | Source | Version | |------|--------|---------| -| [aks](#module\_aks) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_cluster | v4.1.0 | -| [keda\_pod\_identity](#module\_keda\_pod\_identity) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_pod_identity | v4.1.0 | +| [aks](#module\_aks) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_cluster | v6.20.1 | +| [keda\_pod\_identity](#module\_keda\_pod\_identity) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_pod_identity | v6.20.1 | | [nginx\_ingress](#module\_nginx\_ingress) | terraform-module/release/helm | 2.7.0 | -| [snet\_aks](#module\_snet\_aks) | git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet | v4.1.0 | +| [snet\_aks](#module\_snet\_aks) | git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet | v6.20.1 | ## Resources @@ -48,7 +48,10 @@ Re-enable all the resource, commented before to complete the procedure | [azurerm_resource_group.rg_aks](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/resource_group) | resource | | [azurerm_role_assignment.aks_to_acr](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/role_assignment) | resource | | [azurerm_role_assignment.keda_monitoring_reader](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.managed_identity_operator_vs_aks_managed_identity](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/role_assignment) | resource | | [helm_release.keda](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource | +| [helm_release.monitoring_reloader](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource | +| [helm_release.prometheus](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource | | [kubernetes_cluster_role.cluster_deployer](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/cluster_role) | resource | | [kubernetes_cluster_role.edit_extra](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/cluster_role) | resource | | [kubernetes_cluster_role.system_cluster_deployer](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/cluster_role) | resource | @@ -59,6 +62,7 @@ Re-enable all the resource, commented before to complete the procedure | [kubernetes_cluster_role_binding.view_extra_binding](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/cluster_role_binding) | resource | | [kubernetes_namespace.ingress](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource | | [kubernetes_namespace.keda](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource | +| [kubernetes_namespace.monitoring](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource | | [null_resource.create_vnet_core_aks_link](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource | | [azuread_group.adgroup_admin](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/data-sources/group) | data source | | [azuread_group.adgroup_developers](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/data-sources/group) | data source | @@ -119,7 +123,9 @@ Re-enable all the resource, commented before to complete the procedure | [lock\_enable](#input\_lock\_enable) | Apply locks to block accedentaly deletions. | `bool` | `false` | no | | [nginx\_helm\_version](#input\_nginx\_helm\_version) | NGINX helm verison | `string` | n/a | yes | | [prefix](#input\_prefix) | n/a | `string` | `"cstar"` | no | +| [prometheus\_helm](#input\_prometheus\_helm) | prometheus helm chart configuration | 
object({
    chart_version = string,
    alertmanager = object({
      image_name = string,
      image_tag  = string,
    }),
    configmap_reload_prometheus = object({
      image_name = string,
      image_tag  = string,
    }),
    configmap_reload_alertmanager = object({
      image_name = string,
      image_tag  = string,
    }),
    configmap_reload_prometheus = object({
      image_name = string,
      image_tag  = string,
    }),
    node_exporter = object({
      image_name = string,
      image_tag  = string,
    }),
    server = object({
      image_name = string,
      image_tag  = string,
    }),
    pushgateway = object({
      image_name = string,
      image_tag  = string,
    }),
  })
| n/a | yes | | [public\_ip\_aksoutbound\_name](#input\_public\_ip\_aksoutbound\_name) | Public IP AKS outbound | `string` | n/a | yes | +| [reloader\_helm](#input\_reloader\_helm) | reloader helm chart configuration | 
object({
    chart_version = string,
    image_name    = string,
    image_tag     = string
  })
| n/a | yes | | [rg\_vnet\_aks\_name](#input\_rg\_vnet\_aks\_name) | Resource group dedicated to VNet AKS | `string` | n/a | yes | | [tags](#input\_tags) | n/a | `map(any)` | 
{
  "CreatedBy": "Terraform"
}
| no | | [vnet\_aks\_name](#input\_vnet\_aks\_name) | VNet dedicated to AKS | `string` | n/a | yes | 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"