diff --git a/.github/workflows/static_analysis_main.yml b/.github/workflows/static_analysis_main.yml index e75a12fa..f7ed787e 100644 --- a/.github/workflows/static_analysis_main.yml +++ b/.github/workflows/static_analysis_main.yml @@ -1,9 +1,9 @@ -name: Static Analysis Main +name: Static Analysis on: push: branches: - - feat/static-analysis-main + - main jobs: static_analysis: diff --git a/README.md b/README.md index 708bbdfe..a3248fc9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # terraform-infrastructure-template -[![Static Analysis](https://github.com/pagopa/devopslab-infra/actions/workflows/static_analysis_main.yml/badge.svg?branch=feat/static-analysis-main&event=push)](https://github.com/pagopa/devopslab-infra/actions/workflows/static_analysis_main.yml) +[![Static Analysis](https://github.com/pagopa/devopslab-infra/actions/workflows/static_analysis_main.yml/badge.svg?branch=main&event=push)](https://github.com/pagopa/devopslab-infra/actions/workflows/static_analysis_main.yml) Terraform template repository for infrastructures projects diff --git a/src/elk-monitoring/99_main.tf.ci b/src/elk-monitoring/99_main.tf.ci deleted file mode 100644 index cfd62f3c..00000000 --- a/src/elk-monitoring/99_main.tf.ci +++ /dev/null @@ -1,56 +0,0 @@ -terraform { - required_providers { - azurerm = { - source = "hashicorp/azurerm" - version = "<= 3.64.0" - } - azuread = { - source = "hashicorp/azuread" - version = "= 2.21.0" - } - null = { - source = "hashicorp/null" - version = "= 3.2.0" - } - kubernetes = { - source = "hashicorp/kubernetes" - version = "= 2.17.0" - } - helm = { - source = "hashicorp/helm" - version = "= 2.7.1" - } - http = { - source = "hashicorp/http" - version = "3.2.1" - } - - kubectl = { - source = "gavinbunney/kubectl" - version = "1.14.0" - } - } - -} - -provider "azurerm" { - features { - key_vault { - purge_soft_delete_on_destroy = false - } - } -} - -data "azurerm_subscription" "current" {} - -data "azurerm_client_config" "current" {} - -provider "kubernetes" { - config_path = "${var.k8s_kube_config_path_prefix}/config-${local.aks_name}" -} - -provider "helm" { - kubernetes { - config_path = "${var.k8s_kube_config_path_prefix}/config-${local.aks_name}" - } -} diff --git a/src/grafana-monitoring/99_main.tf.ci b/src/grafana-monitoring/99_main.tf.ci deleted file mode 100644 index ad14ddaf..00000000 --- a/src/grafana-monitoring/99_main.tf.ci +++ /dev/null @@ -1,26 +0,0 @@ -terraform { - required_version = ">=1.0.0" - required_providers { - azurerm = { - source = "hashicorp/azurerm" - version = "= 3.25.0" - } - azuread = { - source = "hashicorp/azuread" - version = "= 2.10.0" - } - } - -} - -provider "azurerm" { - features { - key_vault { - purge_soft_delete_on_destroy = false - } - } -} - -data "azurerm_subscription" "current" {} - -data "azurerm_client_config" "current" {}