diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index bc7fdbf1a..71a7eb37e 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -4,7 +4,7 @@ on: branches: - main - stage - paths: + paths: - terraform/** pull_request: branches: @@ -13,70 +13,69 @@ on: - terraform/** env: - # Credentials for deployment to AWS - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - # S3 bucket for the Terraform state - BUCKET_TF_STATE: ${{ secrets.BUCKET_TF_STATE}} - AWS_REGION: us-east-2 - EKS_CLUSTER: vprofile-eks + # Credentials for deployment to AWS + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # s3 bucket for the terraform state + 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 + terraform: + name: "Apply terraform for code changes" + runs-on: ubuntu-latest + defaults: + run: + shell: bash + working-directory: ./terraform + steps: + - name: Checkout source code + uses: actions/checkout@v4 - steps: - - name: Checkout source code - uses: actions/checkout@v4 + - name: Setup Terraform with specified version on the runner + uses: hashicorp/setup-terraform@v2 + with: + terraform_version: 1.6.3 - - name: Setup Terraform with specified version on the runner - uses: hashicorp/setup-terraform@v2 - #with: - # terraform_version: 1.6.3 + - name: Terraform Init + id: init + run: terraform init -backend-config="bucket=${{ env.BUCKET_TF_STATE }}" - - name: Terraform init - id: init - run: terraform init -backend-config="bucket=$BUCKET_TF_STATE" + - name: Terraform Format + id: fmt + run: terraform fmt -check - - name: Terraform format - id: fmt - run: terraform fmt -check + - name: Terraform Validate + id: validate + run: terraform validate - - 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 - id: plan - run: terraform plan -no-color -input=false -out planfile - continue-on-error: true + - name: Terraform Status + if: steps.plan.outcome == 'failure' + run: exit 1 - - name: Terraform plan status - if: steps.plan.outcome == 'failure' - run: exit 1 + - name: Terraform Apply + id: apple + if: github.ref == 'refs/heads/main' && github.event_name == 'push' + run: terraform apply -auto-approve -input=false -parallelism=1 planfile - - name: Terraform Apply - id: apple - if: github.ref == 'refs/heads/main' && github.event_name == 'push' - run: terraform apply -auto-approve -input=false -parallelism=1 planfile + - name: Configure 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: Configure 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-kubeconfig --region ${{ env.AWS_REGION }} --name ${{ env.EKS_CLUSTER }} + - name: Get Kube Config file + id: getconfig + if: steps.apple.outcome == 'success' + run: aws eks update-kubeconfig --region ${{ env.AWS_REGION }} --name ${{ env.EKS_CLUSTER }} - - name: Install Ingress 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 + - name: Install Ingress Controller + if: steps.apple.outcome == 'success' && steps.getconfig.outcome == 'success' + run: kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/aws/deploy.yaml diff --git a/terraform/eks-cluster.tf b/terraform/eks-cluster.tf index 2c4610920..755d4fe15 100644 --- a/terraform/eks-cluster.tf +++ b/terraform/eks-cluster.tf @@ -3,7 +3,7 @@ module "eks" { version = "19.19.1" cluster_name = local.cluster_name - cluster_version = "1.27" + cluster_version = "1.29" vpc_id = module.vpc.vpc_id subnet_ids = module.vpc.private_subnets diff --git a/terraform/main.tf b/terraform/main.tf index 94b6fc75a..e6aee627a 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -12,5 +12,4 @@ data "aws_availability_zones" "available" {} locals { cluster_name = var.clusterName } - ## \ No newline at end of file diff --git a/terraform/terraform.tf b/terraform/terraform.tf index d68901a13..46aa7a481 100644 --- a/terraform/terraform.tf +++ b/terraform/terraform.tf @@ -27,13 +27,13 @@ terraform { } backend "s3" { - bucket = "vprofileactions23" + bucket = "vprofileaction2211" 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 b8fe9d331..35581ff7e 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -1,7 +1,7 @@ variable "region" { description = "AWS region" type = string - default = "us-east-2" + default = "us-east-1" } variable "clusterName" { @@ -10,5 +10,4 @@ variable "clusterName" { default = "vprofile-eks" } -## -## \ No newline at end of file +