From a3ea8c62b01e4a7bdecd930c8b3abee9a75f5b2f Mon Sep 17 00:00:00 2001 From: farouk <49481558+faroukbouraoui@users.noreply.github.com> Date: Sun, 16 Nov 2025 13:39:13 +0100 Subject: [PATCH 1/8] Update variables.tf --- terraform/eks-cluster/variables.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/eks-cluster/variables.tf b/terraform/eks-cluster/variables.tf index a04a927..7eabdf5 100644 --- a/terraform/eks-cluster/variables.tf +++ b/terraform/eks-cluster/variables.tf @@ -1,11 +1,11 @@ variable "resource_prefix" { type = string description = "Prefix for AWS Resources" - default = "dsb" + default = "aws" } variable "region" { type = string description = "AWS Region" default = "us-east-1" -} \ No newline at end of file +} From bc3db0fa81d8a4b1c700a85c98bde8a2e29a200d Mon Sep 17 00:00:00 2001 From: farouk <49481558+faroukbouraoui@users.noreply.github.com> Date: Sun, 16 Nov 2025 13:44:43 +0100 Subject: [PATCH 2/8] Update terraform-apply-eks.yml --- .github/workflows/terraform-apply-eks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terraform-apply-eks.yml b/.github/workflows/terraform-apply-eks.yml index b9a86f5..d0d81da 100644 --- a/.github/workflows/terraform-apply-eks.yml +++ b/.github/workflows/terraform-apply-eks.yml @@ -4,7 +4,7 @@ on: workflow_call: env: - TF_CLOUD_ORGANIZATION: "DSB" + TF_CLOUD_ORGANIZATION: "aws" TF_API_TOKEN: "${{ secrets.TF_API_TOKEN }}" TF_WORKSPACE: "aws-devsecops-eks-cluster" CONFIG_DIRECTORY: "./terraform/eks-cluster" @@ -39,4 +39,4 @@ jobs: id: apply with: run: ${{ steps.apply-run.outputs.run_id }} - comment: "Apply Run from GitHub Actions CI ${{ github.sha }}" \ No newline at end of file + comment: "Apply Run from GitHub Actions CI ${{ github.sha }}" From b4a15cce739278c5c0fee2413a58328d6b00be9e Mon Sep 17 00:00:00 2001 From: farouk <49481558+faroukbouraoui@users.noreply.github.com> Date: Sun, 16 Nov 2025 13:53:16 +0100 Subject: [PATCH 3/8] Update terraform-apply-pipelines.yml --- .github/workflows/terraform-apply-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/terraform-apply-pipelines.yml b/.github/workflows/terraform-apply-pipelines.yml index d8c310a..9183672 100644 --- a/.github/workflows/terraform-apply-pipelines.yml +++ b/.github/workflows/terraform-apply-pipelines.yml @@ -4,9 +4,9 @@ on: workflow_call: env: - TF_CLOUD_ORGANIZATION: "DSB" + TF_CLOUD_ORGANIZATION: "aws" TF_API_TOKEN: "${{ secrets.TF_API_TOKEN }}" - TF_WORKSPACE: "aws-devsecops-pipelines" + TF_WORKSPACE: "dsb-aws-devsecops-pipelines" CONFIG_DIRECTORY: "./terraform/pipelines" jobs: @@ -39,4 +39,4 @@ jobs: id: apply with: run: ${{ steps.apply-run.outputs.run_id }} - comment: "Apply Run from GitHub Actions CI ${{ github.sha }}" \ No newline at end of file + comment: "Apply Run from GitHub Actions CI ${{ github.sha }}" From 15bead94187a41a9bfb76db7ff8c50f74805c2d0 Mon Sep 17 00:00:00 2001 From: farouk <49481558+faroukbouraoui@users.noreply.github.com> Date: Sun, 16 Nov 2025 13:53:47 +0100 Subject: [PATCH 4/8] Update terraform-apply-eks.yml --- .github/workflows/terraform-apply-eks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terraform-apply-eks.yml b/.github/workflows/terraform-apply-eks.yml index d0d81da..08abd2d 100644 --- a/.github/workflows/terraform-apply-eks.yml +++ b/.github/workflows/terraform-apply-eks.yml @@ -4,9 +4,9 @@ on: workflow_call: env: - TF_CLOUD_ORGANIZATION: "aws" + TF_CLOUD_ORGANIZATION: "farouk" TF_API_TOKEN: "${{ secrets.TF_API_TOKEN }}" - TF_WORKSPACE: "aws-devsecops-eks-cluster" + TF_WORKSPACE: "dsb-aws-devsecops-eks-cluster" CONFIG_DIRECTORY: "./terraform/eks-cluster" jobs: From c8620a9d00391b079dab5fe8306ce61ac309b115 Mon Sep 17 00:00:00 2001 From: farouk <49481558+faroukbouraoui@users.noreply.github.com> Date: Sun, 16 Nov 2025 13:53:59 +0100 Subject: [PATCH 5/8] Update terraform-apply-pipelines.yml --- .github/workflows/terraform-apply-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform-apply-pipelines.yml b/.github/workflows/terraform-apply-pipelines.yml index 9183672..608bf9f 100644 --- a/.github/workflows/terraform-apply-pipelines.yml +++ b/.github/workflows/terraform-apply-pipelines.yml @@ -4,7 +4,7 @@ on: workflow_call: env: - TF_CLOUD_ORGANIZATION: "aws" + TF_CLOUD_ORGANIZATION: "farouk" TF_API_TOKEN: "${{ secrets.TF_API_TOKEN }}" TF_WORKSPACE: "dsb-aws-devsecops-pipelines" CONFIG_DIRECTORY: "./terraform/pipelines" From 1b5d4711a675751fa8151b0597878d23212a721e Mon Sep 17 00:00:00 2001 From: farouk <49481558+faroukbouraoui@users.noreply.github.com> Date: Sun, 16 Nov 2025 14:00:52 +0100 Subject: [PATCH 6/8] Update variables.tf --- terraform/eks-cluster/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/eks-cluster/variables.tf b/terraform/eks-cluster/variables.tf index 7eabdf5..70c8da0 100644 --- a/terraform/eks-cluster/variables.tf +++ b/terraform/eks-cluster/variables.tf @@ -7,5 +7,5 @@ variable "resource_prefix" { variable "region" { type = string description = "AWS Region" - default = "us-east-1" + default = "eu-west-1" } From ff9db724ddc7eb170e8b96877e61a5688308f839 Mon Sep 17 00:00:00 2001 From: farouk <49481558+faroukbouraoui@users.noreply.github.com> Date: Sun, 16 Nov 2025 14:14:15 +0100 Subject: [PATCH 7/8] Update main.tf --- terraform/eks-cluster/main.tf | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/terraform/eks-cluster/main.tf b/terraform/eks-cluster/main.tf index f38cda1..cb6d6e3 100644 --- a/terraform/eks-cluster/main.tf +++ b/terraform/eks-cluster/main.tf @@ -1,12 +1,3 @@ -# Default Networking Configuration -resource "aws_default_subnet" "default_subnet_a" { - availability_zone = "${var.region}a" -} - -resource "aws_default_subnet" "default_subnet_b" { - availability_zone = "${var.region}b" -} - # EKS Cluster module "default_cluster" { source = "./modules/eks" @@ -20,4 +11,4 @@ module "default_cluster" { node_group_desired_capacity = 2 instance_types = ["t3.medium"] node_group_disk_size = 20 -} \ No newline at end of file +} From 5e94aa905404efb2079323785cb608e4c89fa353 Mon Sep 17 00:00:00 2001 From: farouk <49481558+faroukbouraoui@users.noreply.github.com> Date: Sun, 16 Nov 2025 14:24:13 +0100 Subject: [PATCH 8/8] Update main.tf --- terraform/eks-cluster/main.tf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/terraform/eks-cluster/main.tf b/terraform/eks-cluster/main.tf index cb6d6e3..de2494b 100644 --- a/terraform/eks-cluster/main.tf +++ b/terraform/eks-cluster/main.tf @@ -1,3 +1,11 @@ +# Default Networking Configuration +resource "aws_default_subnet" "default_subnet_a" { + availability_zone = "${var.region}a" +} + +resource "aws_default_subnet" "default_subnet_b" { + availability_zone = "${var.region}b" +} # EKS Cluster module "default_cluster" { source = "./modules/eks"