Skip to content

Faroukbouraoui patch 3 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
faroukbouraoui wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Faroukbouraoui patch 3 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a3ea8c6
Update variables.tf
faroukbouraoui Nov 16, 2025
bc3db0f
Update terraform-apply-eks.yml
faroukbouraoui Nov 16, 2025
b4a15cc
Update terraform-apply-pipelines.yml
faroukbouraoui Nov 16, 2025
15bead9
Update terraform-apply-eks.yml
faroukbouraoui Nov 16, 2025
c8620a9
Update terraform-apply-pipelines.yml
faroukbouraoui Nov 16, 2025
1b5d471
Update variables.tf
faroukbouraoui Nov 16, 2025
ff9db72
Update main.tf
faroukbouraoui Nov 16, 2025
cfc7de8
Merge pull request #1 from faroukbouraoui/faroukbouraoui-patch-2
faroukbouraoui Nov 16, 2025
5e94aa9
Update main.tf
faroukbouraoui Nov 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/terraform-apply-eks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -39,4 +39,4 @@ jobs:
id: apply
with:
run: ${{ steps.apply-run.outputs.run_id }}
comment: "Apply Run from GitHub Actions CI ${{ github.sha }}"
comment: "Apply Run from GitHub Actions CI ${{ github.sha }}"
6 changes: 3 additions & 3 deletions .github/workflows/terraform-apply-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -39,4 +39,4 @@ jobs:
id: apply
with:
run: ${{ steps.apply-run.outputs.run_id }}
comment: "Apply Run from GitHub Actions CI ${{ github.sha }}"
comment: "Apply Run from GitHub Actions CI ${{ github.sha }}"
3 changes: 1 addition & 2 deletions terraform/eks-cluster/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -20,4 +19,4 @@ module "default_cluster" {
node_group_desired_capacity = 2
instance_types = ["t3.medium"]
node_group_disk_size = 20
}
}
6 changes: 3 additions & 3 deletions terraform/eks-cluster/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
default = "eu-west-1"
}