From a8748ce747bb8819c2fa359643a8fb5ba43b4679 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Thu, 12 Jun 2025 18:47:43 -0500 Subject: [PATCH 01/46] yes --- terraform/terraform.tf | 4 ++-- terraform/variables.tf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/terraform/terraform.tf b/terraform/terraform.tf index 67b75c673..df4a64211 100644 --- a/terraform/terraform.tf +++ b/terraform/terraform.tf @@ -27,9 +27,9 @@ terraform { } backend "s3" { - bucket = "gitopsterrastate" + bucket = "vprobucket777" key = "terraform.tfstate" - region = "us-east-2" + region = "us-east-1" } required_version = "~> 1.6.3" diff --git a/terraform/variables.tf b/terraform/variables.tf index a41d982a0..d19424a8e 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -1,11 +1,11 @@ variable "region" { description = "AWS region" type = string - default = "us-east-2" + default = "us-east-1" } variable "clusterName" { description = "Name of the EKS cluster" type = string - default = "kitops-eks" + default = "vprofile-eks" } From 465114f09f09d03bbcb32a35e9db8f67534751d7 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 19:32:19 -0500 Subject: [PATCH 02/46] new form --- .github/workflows/terraform.yml | 62 +++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 .github/workflows/terraform.yml diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml new file mode 100644 index 000000000..133765988 --- /dev/null +++ b/.github/workflows/terraform.yml @@ -0,0 +1,62 @@ +name: "Vprofile IAC" +on: + push: + branches: + - main + - stage + paths: + - terraform/** + pull_request: + branches: + - main + paths: + - terraform/** + +env: + # Creds for AWS Deployment + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY_ID: ${{ secrets.AWS_SECRET_ACCESS_KEY_ID }} + + # S# Bucket + BUCKET_TF_STATE: ${{ secrets.BUCKET_TF_STATE } + + AWS_REGION: us-east-1 + EKS_CLUSTER: vprofile-eks + +jobs: + terraform: + name: Apply terraform code changes + runs-on: ubuntu-latest + defaults: + run: + shell: bash + working-directory: ./terraform + + steps: + - name: Checkout source code + uses: actions/checkout@v4 + + - name: Setup terraform with specified version on the runner + uses: hashicorp/setup-terraform@v2 + + - name: Terraform init + id: init + run: terraform init -backen-config="bucket=BUCKET_TF_STATE" + + - name: Terraform format + id: fmt + run: terraform fmt -check + + - name: Terraform validate + id: validate + run: terraform validate + + - name: Terraform plan + id: plan + run: terraform plan -no-color -input=false -out planfile + continue-on-error: true + + - name: Terraform plan status + if: steps.plan.outcome == 'failure' + run: exit 1 + \ No newline at end of file From 79d233c06842ffd615b95d438542b3cde8a914dc Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 19:37:52 -0500 Subject: [PATCH 03/46] staging workflow --- .github/workflows/terraform.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 133765988..89971b721 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -58,5 +58,4 @@ jobs: - name: Terraform plan status if: steps.plan.outcome == 'failure' - run: exit 1 - \ No newline at end of file + run: exit 1 \ No newline at end of file From 3095dd6aa1e314ded2599211b547127b1b6f403e Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 19:39:38 -0500 Subject: [PATCH 04/46] test --- terraform/variables.tf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/terraform/variables.tf b/terraform/variables.tf index d19424a8e..c7929608a 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -9,3 +9,6 @@ variable "clusterName" { type = string default = "vprofile-eks" } + + +## \ No newline at end of file From e5eae96c5f15a9bb58e4481baea8f44575ae4990 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 19:41:14 -0500 Subject: [PATCH 05/46] Fixed WF --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 89971b721..c900c21b6 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -18,7 +18,7 @@ env: AWS_SECRET_ACCESS_KEY_ID: ${{ secrets.AWS_SECRET_ACCESS_KEY_ID }} # S# Bucket - BUCKET_TF_STATE: ${{ secrets.BUCKET_TF_STATE } + BUCKET_TF_STATE: ${{ secrets.BUCKET_TF_STATE }) AWS_REGION: us-east-1 EKS_CLUSTER: vprofile-eks From f4ce600eb50108a5bd18a475a506cc6ae817da10 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 19:44:02 -0500 Subject: [PATCH 06/46] Test 2 --- terraform/variables.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index c7929608a..35581ff7e 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,3 @@ variable "clusterName" { } -## \ No newline at end of file From 3ad0f7dbae9774417301252dba5212a393f77103 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 19:45:19 -0500 Subject: [PATCH 07/46] Fixed Line 21 --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index c900c21b6..09a700868 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -18,7 +18,7 @@ env: AWS_SECRET_ACCESS_KEY_ID: ${{ secrets.AWS_SECRET_ACCESS_KEY_ID }} # S# Bucket - BUCKET_TF_STATE: ${{ secrets.BUCKET_TF_STATE }) + BUCKET_TF_STATE: ${{ secrets.BUCKET_TF_STATE }} AWS_REGION: us-east-1 EKS_CLUSTER: vprofile-eks From 4ee78af9be511b881ce35b5ab99722ac5d840000 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 19:45:49 -0500 Subject: [PATCH 08/46] Test3 --- terraform/variables.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/variables.tf b/terraform/variables.tf index 35581ff7e..076911324 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,3 +11,4 @@ variable "clusterName" { } +# \ No newline at end of file From 329a93e868fb4cab9c1353bb2592e4e146086f33 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 19:48:44 -0500 Subject: [PATCH 09/46] Test 4 --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 09a700868..5d7878f0a 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -41,7 +41,7 @@ jobs: - name: Terraform init id: init - run: terraform init -backen-config="bucket=BUCKET_TF_STATE" + run: terraform init -backend-config="bucket=BUCKET_TF_STATE" - name: Terraform format id: fmt From 08c7a4e6b7c0523ec114ed22fcb44732b13b32d6 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 19:49:08 -0500 Subject: [PATCH 10/46] removed hash --- terraform/variables.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index 076911324..35581ff7e 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,3 @@ variable "clusterName" { } -# \ No newline at end of file From f81e9f21d82e313fc14a4e930d028b1307e0513e Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 19:54:07 -0500 Subject: [PATCH 11/46] Fixed terraform version --- terraform/terraform.tf | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/terraform/terraform.tf b/terraform/terraform.tf index df4a64211..1376c7b61 100644 --- a/terraform/terraform.tf +++ b/terraform/terraform.tf @@ -32,8 +32,5 @@ terraform { region = "us-east-1" } - required_version = "~> 1.6.3" -} -## -## -## + required_version = "~> 1.12.2" +} \ No newline at end of file From de7ab4f3b37b5a1386c157e507119c3ea59214ee Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 20:00:51 -0500 Subject: [PATCH 12/46] Changed Key value --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 5d7878f0a..9ca73e474 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -15,7 +15,7 @@ on: env: # Creds for AWS Deployment AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY_ID: ${{ secrets.AWS_SECRET_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY_ID: ${{ secrets.AWS_SECRET_ACCESS_KEY }} # S# Bucket BUCKET_TF_STATE: ${{ secrets.BUCKET_TF_STATE }} From 5f8ee45485393013e927870453a861ee65d18d38 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 20:01:19 -0500 Subject: [PATCH 13/46] Changes Fixed --- terraform/variables.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/variables.tf b/terraform/variables.tf index 35581ff7e..c7929608a 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,3 +11,4 @@ variable "clusterName" { } +## \ No newline at end of file From 614ff6f56fb1cdf3824d30e75752e790181c8db2 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 20:19:35 -0500 Subject: [PATCH 14/46] Fixed Access Key --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 9ca73e474..9ea52f725 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -15,7 +15,7 @@ on: env: # Creds for AWS Deployment AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY_ID: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} # S# Bucket BUCKET_TF_STATE: ${{ secrets.BUCKET_TF_STATE }} From 40c36cccbc0b8b99e74d1977deb1b59b40a0f844 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 20:20:10 -0500 Subject: [PATCH 15/46] Test 5 --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index c7929608a..076911324 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,4 @@ variable "clusterName" { } -## \ No newline at end of file +# \ No newline at end of file From b21ba7d79771d9ce3694e9201ded6fa0485c9c62 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 20:44:07 -0500 Subject: [PATCH 16/46] Edit Bucket Var --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 9ea52f725..fd64d7c46 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -41,7 +41,7 @@ jobs: - name: Terraform init id: init - run: terraform init -backend-config="bucket=BUCKET_TF_STATE" + run: terraform init -backend-config="bucket=$BUCKET_TF_STATE" - name: Terraform format id: fmt From ff508191f7709b666580d1f5cff62d97267f8bd8 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Fri, 13 Jun 2025 20:44:33 -0500 Subject: [PATCH 17/46] Edit Bucket var1 --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index 076911324..c7929608a 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,4 @@ variable "clusterName" { } -# \ No newline at end of file +## \ No newline at end of file From 18ce96d74d212c5d57bc083cc241f62b9877749b Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sat, 14 Jun 2025 19:47:12 -0500 Subject: [PATCH 18/46] terraform aplly steps --- .github/workflows/terraform.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index fd64d7c46..cb0cfe2d4 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -58,4 +58,25 @@ jobs: - name: Terraform plan status if: steps.plan.outcome == 'failure' - run: exit 1 \ No newline at end of file + run: exit 1 + + - name: terraform Apply + id: apple + if: github.ref == 'ref/head/main' && github.event_name == 'push' + run: terraform apply -auto-approve -input=false -parallelism=1 planfile + + - name: Conffigure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ env.AWS_REGION }} + + - name: Get Kube config file + id: getconfig + if: steps.apple.outcome == 'success' + run: aws eks update-kube-config --region ${{ env.AWS_REGION }} --name ${{ env.EKS_CLUSTER }} + + - name: Install Engress Controller + if: steps.apple.outcome == 'success' && steps.getconfig.outcome == 'success' + run: kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.3/deploy/static/provider/aws/deploy.yaml \ No newline at end of file From 3737f996b2afd809769f520aebe074203032cb11 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sat, 14 Jun 2025 19:48:06 -0500 Subject: [PATCH 19/46] stage test --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index c7929608a..ec6cca805 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,4 @@ variable "clusterName" { } -## \ No newline at end of file +#### \ No newline at end of file From 3ed5ab8c9021e1a944ec1c39d9e7981741578c06 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sat, 14 Jun 2025 19:58:16 -0500 Subject: [PATCH 20/46] Fix syntax --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index cb0cfe2d4..b3cb10d2c 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -65,7 +65,7 @@ jobs: if: github.ref == 'ref/head/main' && github.event_name == 'push' run: terraform apply -auto-approve -input=false -parallelism=1 planfile - - name: Conffigure AWS credentials + - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} From 80da6bf25d6681bc9f7b0b5d8bd48e7f4c4aa0d8 Mon Sep 17 00:00:00 2001 From: Gpower00717 Date: Sat, 14 Jun 2025 20:00:26 -0500 Subject: [PATCH 21/46] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dcd659f7e..aad8f8341 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,4 @@ Terraform version 1.6.3 * terraform plan -out planfile * terraform apply -auto-approve -input=false -parallelism=1 planfile #### -##### +#### From 25ec39fb5e1f44a2be3b82b61999fab74fcf6c10 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sat, 14 Jun 2025 20:01:01 -0500 Subject: [PATCH 22/46] test push --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index ec6cca805..c7929608a 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,4 @@ variable "clusterName" { } -#### \ No newline at end of file +## \ No newline at end of file From 502037bfad2e9bd4e5b248b6a7a3a367cfd98f46 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sat, 14 Jun 2025 20:06:18 -0500 Subject: [PATCH 23/46] fixed spelling --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index cb0cfe2d4..b3cb10d2c 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -65,7 +65,7 @@ jobs: if: github.ref == 'ref/head/main' && github.event_name == 'push' run: terraform apply -auto-approve -input=false -parallelism=1 planfile - - name: Conffigure AWS credentials + - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} From 7888dce7b029a0398fcfbf86992e776e3fa8b1fa Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sat, 14 Jun 2025 20:06:51 -0500 Subject: [PATCH 24/46] Fixed Errors --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index c7929608a..fe64e90d5 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,4 @@ variable "clusterName" { } -## \ No newline at end of file +##### \ No newline at end of file From 5338991fd302a5d4cc1fc144f0c54003bf3a7afd Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sat, 14 Jun 2025 20:19:39 -0500 Subject: [PATCH 25/46] merged --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index ec6cca805..fe64e90d5 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,4 @@ variable "clusterName" { } -#### \ No newline at end of file +##### \ No newline at end of file From 396cf3a3d8805fa299cf1d46f941bbfecb34f19b Mon Sep 17 00:00:00 2001 From: Gpower00717 Date: Sat, 14 Jun 2025 20:23:14 -0500 Subject: [PATCH 26/46] Update variables.tf --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index fe64e90d5..3eeaa151e 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,4 @@ variable "clusterName" { } -##### \ No newline at end of file +### From 3845f74e77b1d7987208cfe1a299b0e7c718e815 Mon Sep 17 00:00:00 2001 From: Gpower00717 Date: Sat, 14 Jun 2025 20:44:33 -0500 Subject: [PATCH 27/46] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dcd659f7e..aad8f8341 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,4 @@ Terraform version 1.6.3 * terraform plan -out planfile * terraform apply -auto-approve -input=false -parallelism=1 planfile #### -##### +#### From 6da2e565655fc6cc199830b5fa1840fc9abded3a Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sat, 14 Jun 2025 20:47:09 -0500 Subject: [PATCH 28/46] changed # --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index fe64e90d5..c7929608a 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,4 @@ variable "clusterName" { } -##### \ No newline at end of file +## \ No newline at end of file From 367efebe13e16e45e15b8ec2700de269ffe80f47 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sat, 14 Jun 2025 20:49:25 -0500 Subject: [PATCH 29/46] Changed TF --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index fe64e90d5..c7929608a 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,4 @@ variable "clusterName" { } -##### \ No newline at end of file +## \ No newline at end of file From 74f7052142ffbae7917975e56909edde0dea51ae Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sat, 14 Jun 2025 20:54:46 -0500 Subject: [PATCH 30/46] Your descriptive commit message --- terraform/variables.tf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/terraform/variables.tf b/terraform/variables.tf index 3eeaa151e..ae312f547 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,8 @@ variable "clusterName" { } +<<<<<<< HEAD ### +======= +##### +>>>>>>> stage From b0c57e3ee11ce730b4c99bc5ecbf9a190380d723 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sat, 14 Jun 2025 21:01:15 -0500 Subject: [PATCH 31/46] TERR Changes --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index c7929608a..be3df5072 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,4 @@ variable "clusterName" { } -## \ No newline at end of file +### \ No newline at end of file From f2e0d7b497fe51563e0cda67384cbb39fb514a2c Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sat, 14 Jun 2025 21:09:52 -0500 Subject: [PATCH 32/46] edit tf --- terraform/variables.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index be3df5072..35581ff7e 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,3 @@ variable "clusterName" { } -### \ No newline at end of file From 245a980ad93b78eab1c60c29ba4f614abea2e8e9 Mon Sep 17 00:00:00 2001 From: Gpower00717 Date: Sat, 14 Jun 2025 21:12:40 -0500 Subject: [PATCH 33/46] Update variables.tf --- terraform/variables.tf | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index e96f757e5..b788454c3 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -10,17 +10,3 @@ variable "clusterName" { default = "vprofile-eks" } - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -### -======= -##### ->>>>>>> stage -======= -## ->>>>>>> 8110c4135214eceacfbdd0c06574686fdfd450ea -======= -## ->>>>>>> stage From 8dd581aee82ffdad10bcf23f85e0961657fa590a Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sun, 15 Jun 2025 16:50:43 -0500 Subject: [PATCH 34/46] Corrected Apply line --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index b3cb10d2c..21fea64db 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -62,7 +62,7 @@ jobs: - name: terraform Apply id: apple - if: github.ref == 'ref/head/main' && github.event_name == 'push' + if: github.ref == 'refs/head/main' && github.event_name == 'push' run: terraform apply -auto-approve -input=false -parallelism=1 planfile - name: Configure AWS credentials From e97e6f8bf9c3799b6d46128f15c1f4a77b2c79ee Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sun, 15 Jun 2025 16:52:55 -0500 Subject: [PATCH 35/46] Changed TF file --- terraform/variables.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/variables.tf b/terraform/variables.tf index 35581ff7e..c7929608a 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,3 +11,4 @@ variable "clusterName" { } +## \ No newline at end of file From 3e269b36f80f7258100ccf6801f2db5e9b2c102e Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sun, 15 Jun 2025 17:03:18 -0500 Subject: [PATCH 36/46] changed WF syntax --- terraform/variables.tf | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index e96f757e5..ac6e89349 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,16 +11,4 @@ variable "clusterName" { } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -### -======= -##### ->>>>>>> stage -======= -## ->>>>>>> 8110c4135214eceacfbdd0c06574686fdfd450ea -======= -## ->>>>>>> stage + From 62cff904d1c56622f6caeec792e9f31a95cb08df Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sun, 15 Jun 2025 17:08:21 -0500 Subject: [PATCH 37/46] Updated tf form --- terraform/variables.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/variables.tf b/terraform/variables.tf index ac6e89349..4a0cb4c10 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -12,3 +12,4 @@ variable "clusterName" { +## \ No newline at end of file From 111e779bd90b9b11dd12a0599d3776c9b38a7c00 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sun, 15 Jun 2025 17:22:57 -0500 Subject: [PATCH 38/46] Changed Apply plan --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 21fea64db..110aa0ca4 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -62,7 +62,7 @@ jobs: - name: terraform Apply id: apple - if: github.ref == 'refs/head/main' && github.event_name == 'push' + if: github.ref == 'refs/heads/main' && github.event_name == 'push' run: terraform apply -auto-approve -input=false -parallelism=1 planfile - name: Configure AWS credentials From 8b5a45c0d5e7005c85160224d61b58ebf864bfda Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sun, 15 Jun 2025 17:23:33 -0500 Subject: [PATCH 39/46] Changed Apply plan --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index c7929608a..ec6cca805 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,4 @@ variable "clusterName" { } -## \ No newline at end of file +#### \ No newline at end of file From 32005a97003c05979c2a4b0445a1638f82aa9e27 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sun, 15 Jun 2025 17:27:58 -0500 Subject: [PATCH 40/46] Corrected TF form --- terraform/variables.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index ec6cca805..35581ff7e 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,4 +11,3 @@ variable "clusterName" { } -#### \ No newline at end of file From d5a69d6b8ca26f0eb356be735335eab7eacee49b Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sun, 15 Jun 2025 17:31:48 -0500 Subject: [PATCH 41/46] fixed errors --- terraform/variables.tf | 2 -- 1 file changed, 2 deletions(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index 4a0cb4c10..35581ff7e 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -11,5 +11,3 @@ variable "clusterName" { } - -## \ No newline at end of file From 4d7278853d040ef50ea58e62afedb7af3841d151 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sun, 15 Jun 2025 17:46:02 -0500 Subject: [PATCH 42/46] made tf change --- terraform/variables.tf | 2 -- 1 file changed, 2 deletions(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index 35581ff7e..d19424a8e 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -9,5 +9,3 @@ variable "clusterName" { type = string default = "vprofile-eks" } - - From dc4abc4d10d820735aa46c9d3cc914e18e8241d2 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sun, 15 Jun 2025 21:32:21 -0500 Subject: [PATCH 43/46] stage test --- terraform/variables.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/terraform/variables.tf b/terraform/variables.tf index d19424a8e..f3e6fc3ea 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -9,3 +9,5 @@ variable "clusterName" { type = string default = "vprofile-eks" } + +#### \ No newline at end of file From 4603068e99d0c739b8bea86fca3ab99e234a00f9 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Sun, 15 Jun 2025 21:52:00 -0500 Subject: [PATCH 44/46] edit TF main --- terraform/variables.tf | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index 57cf78bb4..35581ff7e 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -10,17 +10,4 @@ variable "clusterName" { default = "vprofile-eks" } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - -## -======= -#### ->>>>>>> stage -======= ->>>>>>> 0d2001b684dd8d373dd60c808ca9708c66ae64e7 -======= -#### ->>>>>>> stage From 4755886eaba54a803dd5464bf944bd8e732309d6 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Mon, 16 Jun 2025 19:25:28 -0500 Subject: [PATCH 45/46] Edit kube config --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index 110aa0ca4..1564050f5 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -75,7 +75,7 @@ jobs: - name: Get Kube config file id: getconfig if: steps.apple.outcome == 'success' - run: aws eks update-kube-config --region ${{ env.AWS_REGION }} --name ${{ env.EKS_CLUSTER }} + run: aws eks update-kubeconfig --region ${{ env.AWS_REGION }} --name ${{ env.EKS_CLUSTER }} - name: Install Engress Controller if: steps.apple.outcome == 'success' && steps.getconfig.outcome == 'success' From d70ff1b6637d7ba05bcac2f546f64bb0d4c52d84 Mon Sep 17 00:00:00 2001 From: gpower00717 Date: Mon, 16 Jun 2025 19:27:23 -0500 Subject: [PATCH 46/46] Sync TF change --- terraform/variables.tf | 2 -- 1 file changed, 2 deletions(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index 35581ff7e..d19424a8e 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -9,5 +9,3 @@ variable "clusterName" { type = string default = "vprofile-eks" } - -