From 421111d9150b506a324f32c82b6ccb9abf7fb6c9 Mon Sep 17 00:00:00 2001 From: pmikus Date: Mon, 22 Jul 2024 13:51:10 +0200 Subject: feat(infra): Ubuntu 24.04 LTS Signed-off-by: Peter Mikus Change-Id: I81e48360fcc970a16f1203955003d59f476b3233 --- fdio.infra.terraform/terraform-aws-1n-aws-c5n/providers.tf | 2 +- fdio.infra.terraform/terraform-aws-1n-c6in/providers.tf | 2 +- fdio.infra.terraform/terraform-aws-2n-aws-c5n/providers.tf | 2 +- fdio.infra.terraform/terraform-aws-2n-c6gn/providers.tf | 2 +- fdio.infra.terraform/terraform-aws-2n-c6in/providers.tf | 2 +- fdio.infra.terraform/terraform-aws-2n-c7gn/providers.tf | 2 +- fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf | 2 +- fdio.infra.terraform/terraform-aws-3n-c6gn/providers.tf | 2 +- fdio.infra.terraform/terraform-aws-3n-c6in/providers.tf | 2 +- fdio.infra.terraform/terraform-aws-3n-c7gn/providers.tf | 2 +- .../terraform-aws-fdio-csit-dash-app-base/variables.tf | 2 +- .../terraform-vault-aws-secret-backend/fdio/main.tf | 6 ++++++ .../terraform-vault-aws-secret-backend/fdio/variables.tf | 14 +++++++++++++- .../terraform-vault-aws-secret-backend/fdio/versions.tf | 4 ++-- .../terraform-vault-aws-secret-backend/versions.tf | 2 +- 15 files changed, 33 insertions(+), 15 deletions(-) (limited to 'fdio.infra.terraform') diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/providers.tf b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/providers.tf index 2482ca2839..485f0ebe30 100644 --- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/providers.tf +++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/providers.tf @@ -7,5 +7,5 @@ provider "aws" { provider "vault" { address = "http://10.30.51.24:8200" skip_tls_verify = true - token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" + token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-1n-c6in/providers.tf b/fdio.infra.terraform/terraform-aws-1n-c6in/providers.tf index 2482ca2839..485f0ebe30 100644 --- a/fdio.infra.terraform/terraform-aws-1n-c6in/providers.tf +++ b/fdio.infra.terraform/terraform-aws-1n-c6in/providers.tf @@ -7,5 +7,5 @@ provider "aws" { provider "vault" { address = "http://10.30.51.24:8200" skip_tls_verify = true - token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" + token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/providers.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/providers.tf index 2482ca2839..485f0ebe30 100644 --- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/providers.tf +++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/providers.tf @@ -7,5 +7,5 @@ provider "aws" { provider "vault" { address = "http://10.30.51.24:8200" skip_tls_verify = true - token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" + token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-2n-c6gn/providers.tf b/fdio.infra.terraform/terraform-aws-2n-c6gn/providers.tf index d0e7490d38..1a98cb50df 100644 --- a/fdio.infra.terraform/terraform-aws-2n-c6gn/providers.tf +++ b/fdio.infra.terraform/terraform-aws-2n-c6gn/providers.tf @@ -7,5 +7,5 @@ provider "aws" { provider "vault" { address = "http://vault.service.consul:8200" skip_tls_verify = true - token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" + token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-2n-c6in/providers.tf b/fdio.infra.terraform/terraform-aws-2n-c6in/providers.tf index d0e7490d38..1a98cb50df 100644 --- a/fdio.infra.terraform/terraform-aws-2n-c6in/providers.tf +++ b/fdio.infra.terraform/terraform-aws-2n-c6in/providers.tf @@ -7,5 +7,5 @@ provider "aws" { provider "vault" { address = "http://vault.service.consul:8200" skip_tls_verify = true - token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" + token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-2n-c7gn/providers.tf b/fdio.infra.terraform/terraform-aws-2n-c7gn/providers.tf index d0e7490d38..1a98cb50df 100644 --- a/fdio.infra.terraform/terraform-aws-2n-c7gn/providers.tf +++ b/fdio.infra.terraform/terraform-aws-2n-c7gn/providers.tf @@ -7,5 +7,5 @@ provider "aws" { provider "vault" { address = "http://vault.service.consul:8200" skip_tls_verify = true - token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" + token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf index 2482ca2839..485f0ebe30 100644 --- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf +++ b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf @@ -7,5 +7,5 @@ provider "aws" { provider "vault" { address = "http://10.30.51.24:8200" skip_tls_verify = true - token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" + token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c6gn/providers.tf b/fdio.infra.terraform/terraform-aws-3n-c6gn/providers.tf index 2482ca2839..485f0ebe30 100644 --- a/fdio.infra.terraform/terraform-aws-3n-c6gn/providers.tf +++ b/fdio.infra.terraform/terraform-aws-3n-c6gn/providers.tf @@ -7,5 +7,5 @@ provider "aws" { provider "vault" { address = "http://10.30.51.24:8200" skip_tls_verify = true - token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" + token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c6in/providers.tf b/fdio.infra.terraform/terraform-aws-3n-c6in/providers.tf index 2482ca2839..485f0ebe30 100644 --- a/fdio.infra.terraform/terraform-aws-3n-c6in/providers.tf +++ b/fdio.infra.terraform/terraform-aws-3n-c6in/providers.tf @@ -7,5 +7,5 @@ provider "aws" { provider "vault" { address = "http://10.30.51.24:8200" skip_tls_verify = true - token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" + token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/providers.tf b/fdio.infra.terraform/terraform-aws-3n-c7gn/providers.tf index 2482ca2839..485f0ebe30 100644 --- a/fdio.infra.terraform/terraform-aws-3n-c7gn/providers.tf +++ b/fdio.infra.terraform/terraform-aws-3n-c7gn/providers.tf @@ -7,5 +7,5 @@ provider "aws" { provider "vault" { address = "http://10.30.51.24:8200" skip_tls_verify = true - token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" + token = "hvs.bzHw4ZHsz9B0019P8I73yS6l" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf index 653a92b970..b706d77f00 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf @@ -19,7 +19,7 @@ variable "vault_provider_skip_tls_verify" { variable "vault_provider_token" { description = "Vault root token." type = string - default = "s.4z5PsufFwV3sHbCzK9Y2Cojd" + default = "hvs.bzHw4ZHsz9B0019P8I73yS6l" } variable "vault_name" { diff --git a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/main.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/main.tf index 4473dafda8..08c3ca8b73 100644 --- a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/main.tf +++ b/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/main.tf @@ -2,16 +2,22 @@ module "fdio-logs" { # fdio logs iam source = "../" name = "dynamic-aws-creds-vault-fdio-logs" + aws_access_key = var.aws_access_key + aws_secret_key = var.aws_secret_key } module "fdio-docs" { # fdio docs iam source = "../" name = "dynamic-aws-creds-vault-fdio-docs" + aws_access_key = var.aws_access_key + aws_secret_key = var.aws_secret_key } module "fdio-csit-jenkins" { # fdio csit jenkins iam source = "../" name = "dynamic-aws-creds-vault-fdio-csit-jenkins" + aws_access_key = var.aws_access_key + aws_secret_key = var.aws_secret_key } diff --git a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/variables.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/variables.tf index d3d728a49d..b1f64eccf2 100644 --- a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/variables.tf +++ b/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/variables.tf @@ -1,7 +1,7 @@ variable "vault_provider_address" { description = "Vault cluster address." type = string - default = "http://10.30.51.23:8200" + default = "http://10.30.51.26:8200" } variable "vault_provider_skip_tls_verify" { @@ -15,3 +15,15 @@ variable "vault_provider_token" { type = string sensitive = true } + +variable "aws_access_key" { + description = "AWS access key" + type = string + sensitive = true +} + +variable "aws_secret_key" { + description = "AWS secret key" + type = string + sensitive = true +} \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/versions.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/versions.tf index 4c93000093..c573731d65 100644 --- a/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/versions.tf +++ b/fdio.infra.terraform/terraform-vault-aws-secret-backend/fdio/versions.tf @@ -1,12 +1,12 @@ terraform { backend "consul" { - address = "10.30.51.23:8500" + address = "10.30.51.26:8500" scheme = "http" path = "terraform/aws-secret-backend" } required_providers { vault = { - version = ">= 3.12.0" + version = "4.3.0" } } required_version = ">= 1.5.4" diff --git a/fdio.infra.terraform/terraform-vault-aws-secret-backend/versions.tf b/fdio.infra.terraform/terraform-vault-aws-secret-backend/versions.tf index 996288568d..f084df8654 100644 --- a/fdio.infra.terraform/terraform-vault-aws-secret-backend/versions.tf +++ b/fdio.infra.terraform/terraform-vault-aws-secret-backend/versions.tf @@ -1,7 +1,7 @@ terraform { required_providers { vault = { - version = ">=2.22.1" + version = "4.3.0" } } required_version = ">= 1.1.4" -- cgit 1.2.3-korg