From 4799ede11622ee711c531f541744128bcc5bec5f Mon Sep 17 00:00:00 2001 From: Karl Baker Date: Fri, 20 Aug 2021 14:14:58 +0100 Subject: [PATCH 1/2] Add missing Terraform variables to integration `common.tfvars` This commit adds the variables `cluster_infrastructure_state_bucket` and `cluster_log_retention_in_days` to the integration `common.tfvars` Terraform variables file. By adding these variables we make our EKS cluster deployable to integration (in addition to making our config consistent between test and integration). --- terraform/deployments/variables/integration/common.tfvars | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/terraform/deployments/variables/integration/common.tfvars b/terraform/deployments/variables/integration/common.tfvars index d6c747374..8a9e05b2e 100644 --- a/terraform/deployments/variables/integration/common.tfvars +++ b/terraform/deployments/variables/integration/common.tfvars @@ -1,4 +1,7 @@ -govuk_aws_state_bucket = "govuk-terraform-steppingstone-integration" +govuk_aws_state_bucket = "govuk-terraform-steppingstone-integration" +cluster_infrastructure_state_bucket = "govuk-terraform-integration" + +cluster_log_retention_in_days = 7 govuk_environment = "integration" ecs_default_capacity_provider = "FARGATE_SPOT" From 577ccce87f9e41a8ed84683d9430c718d24f5cff Mon Sep 17 00:00:00 2001 From: Karl Baker Date: Fri, 20 Aug 2021 14:17:01 +0100 Subject: [PATCH 2/2] Add Concourse parameters for EKS This commit adds a Concourse parameters file for the EKS-specific variables used in the `eks` Concourse pipeline. --- concourse/parameters/integration/eks.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 concourse/parameters/integration/eks.yaml diff --git a/concourse/parameters/integration/eks.yaml b/concourse/parameters/integration/eks.yaml new file mode 100644 index 000000000..f70392717 --- /dev/null +++ b/concourse/parameters/integration/eks.yaml @@ -0,0 +1,3 @@ +aws_region: eu-west-1 +concourse_deployer_role_arn: arn:aws:iam::210287912431:role/govuk-concourse-deployer +govuk_infrastructure_branch: main