Update build.yml

Author: korengalpalo

.github/workflows/build.yml

@@ -3,10 +3,10 @@ name: CI/CD
 on:
   push:
     branches:
-      - main
+      - main  # or specify your branch here
 
 jobs:
-  build-and-test:
+  build-and-push:
     runs-on: ubuntu-latest
 
     steps:
@@ -23,54 +23,62 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r requirements.txt
 
-  deploy_to_production:
+      - name: Set up AWS Credentials
+        run: |
+          echo "${{ secrets.AWS_ACCESS_KEY_ID }}" > aws_access_key_id
+          echo "${{ secrets.AWS_SECRET_ACCESS_KEY }}" > aws_secret_access_key
+          aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws configure set region ${{ secrets.AWS_REGION }}
+
+      - name: Log in to AWS ECR
+        run: |
+          aws ecr get-login-password --region ${{ secrets.AWS_REGION }} | docker login --username AWS --password-stdin ${{ secrets.IMAGE_REGISTRY }}
+
+      - name: Build Docker image
+        run: |
+          LATEST_SHA=$(git rev-parse HEAD)
+          docker build -t ${{ secrets.IMAGE_REGISTRY }}:$LATEST_SHA .
+          docker tag ${{ secrets.IMAGE_REGISTRY }}:$LATEST_SHA ${{ secrets.IMAGE_REGISTRY }}:latest
+
+      - name: Push Docker image to AWS ECR
+        run: |
+          docker push ${{ secrets.IMAGE_REGISTRY }}:$LATEST_SHA
+          docker push ${{ secrets.IMAGE_REGISTRY }}:latest
+
+  deploy:
     runs-on: ubuntu-latest
-    needs: build-and-test
+    needs: build-and-push  # Ensures the deploy job runs only after the build-and-push job
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Configure AWS credentials
+      - name: Set up AWS Credentials
         run: |
+          echo "${{ secrets.AWS_ACCESS_KEY_ID }}" > aws_access_key_id
+          echo "${{ secrets.AWS_SECRET_ACCESS_KEY }}" > aws_secret_access_key
           aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws configure set region ${{ vars.AWS_REGION }}
-
-      - name: Install AWS CLI & kubectl
-        run: |
-          curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
-          chmod +x ./kubectl
-          sudo mv ./kubectl /usr/local/bin/kubectl
-          pip install --upgrade awscli
-          aws --version
-
-      - name: Log in to AWS ECR
-        run: |
-          aws ecr get-login-password --region ${{ vars.AWS_REGION }} | docker login --username AWS --password-stdin ${{ vars.IMAGE_REGISTRY }}
+          aws configure set region ${{ secrets.AWS_REGION }}
 
       - name: Update kubeconfig for EKS
         run: |
-          aws eks update-kubeconfig --name eks-code2cloud-test --region ${{ vars.AWS_REGION }}
-
-      - name: Build Docker image
-        run: |
-          LATEST_SHA=$(git rev-parse HEAD)
-          echo "LATEST_SHA=$LATEST_SHA" >> $GITHUB_ENV
-          docker build -t ${{ vars.IMAGE_REGISTRY }}:$LATEST_SHA .
-          docker tag ${{ vars.IMAGE_REGISTRY }}:$LATEST_SHA ${{ vars.IMAGE_REGISTRY }}:latest
+          aws eks update-kubeconfig --name ${{ secrets.CLUSTER_NAME }} --region ${{ secrets.AWS_REGION }}
 
-      - name: Push Docker image to AWS ECR
+      - name: Check if the deployment exists
+        id: deployment
         run: |
-          docker push ${{ vars.IMAGE_REGISTRY }}:$LATEST_SHA
-          docker push ${{ vars.IMAGE_REGISTRY }}:latest
+          DEPLOYMENT_EXISTS=$(kubectl get deployment ${{ secrets.DEPLOYMENT_NAME }} -n default --ignore-not-found)
+          echo "Deployment exists: $DEPLOYMENT_EXISTS"
+          echo "::set-output name=exists::$DEPLOYMENT_EXISTS"
 
-      - name: Deploy to EKS
+      - name: Create or update deployment in EKS
         run: |
-          if ! kubectl get deployment ${{ vars.DEPLOYMENT_NAME }} -n default &> /dev/null; then
-            echo "Deployment does not exist. Creating..."
-            kubectl create deployment ${{ vars.DEPLOYMENT_NAME }} --image=${{ vars.IMAGE_REGISTRY }}:$LATEST_SHA -n default
+          if [[ "${{ steps.deployment.outputs.exists }}" == "null" ]]; then
+            echo "Deployment does not exist. Creating deployment."
+            kubectl create deployment ${{ secrets.DEPLOYMENT_NAME }} --image=${{ secrets.IMAGE_REGISTRY }}:$LATEST_SHA -n default
           else
-            echo "Deployment exists. Updating..."
-            kubectl set image deployment/${{ vars.DEPLOYMENT_NAME }} ${{ vars.DEPLOYMENT_NAME }}=${{ vars.IMAGE_REGISTRY }}:$LATEST_SHA -n default
+            echo "Deployment exists. Updating deployment."
+            kubectl set image deployment/${{ secrets.DEPLOYMENT_NAME }} ${{ secrets.DEPLOYMENT_NAME }}=${{ secrets.IMAGE_REGISTRY }}:$LATEST_SHA -n default
           fi