diff --git a/.github/workflows/terraform-apply-eks.yml b/.github/workflows/terraform-apply-eks.yml index b9a86f5..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: "DSB" + 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: @@ -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 }}" diff --git a/.github/workflows/terraform-apply-pipelines.yml b/.github/workflows/terraform-apply-pipelines.yml index d8c310a..608bf9f 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: "farouk" 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 }}" diff --git a/terraform/eks-cluster/main.tf b/terraform/eks-cluster/main.tf index f38cda1..de2494b 100644 --- a/terraform/eks-cluster/main.tf +++ b/terraform/eks-cluster/main.tf @@ -6,7 +6,6 @@ resource "aws_default_subnet" "default_subnet_a" { resource "aws_default_subnet" "default_subnet_b" { availability_zone = "${var.region}b" } - # EKS Cluster module "default_cluster" { source = "./modules/eks" @@ -20,4 +19,4 @@ module "default_cluster" { node_group_desired_capacity = 2 instance_types = ["t3.medium"] node_group_disk_size = 20 -} \ No newline at end of file +} diff --git a/terraform/eks-cluster/variables.tf b/terraform/eks-cluster/variables.tf index a04a927..70c8da0 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 + default = "eu-west-1" +}