Merge pull request #8 from cupofpython/troubleshoot-eks

Troubleshoot eks

Author: cupofpython

.github/workflows/release.yml .github/workflows/deploy-to-eks.yml.github/workflows/release.yml renamed to .github/workflows/deploy-to-eks.yml

@@ -1,24 +1,22 @@
-name: Release workflow
+name: Deployment workflow
 
 on:
-  release:
-    types: [published]
+  workflow_call:
+    inputs:
+      IMAGE_TAG:
+        required: true
+        type: string
 
 env:
   IMAGE_NAME: samanthamorris684/catbot
   EKS_CLUSTER_NAME: catbot-cluster
+  NAMESPACE: cat-chatbot
 
 jobs:
-  build-push-deploy-image:
-    name: Build and push image then deploy to EKS
+  deploy-to-eks:
+    name: Deploy to EKS
     runs-on: ubuntu-latest
     steps:
-      - name: Build and push to Docker Hub
-        uses: ./.github/workflows/build-and-push.yml
-        with:
-          IMAGE_TAG: $GITHUB_SHA
-          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-      
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:
@@ -31,5 +29,5 @@ jobs:
 
       - name: Deploy to EKS
         run: |
-          kubectl set image deployment/server samanthamorris684/catbot=samanthamorris684/catbot:$GITHUB_SHA
-          kubectl rollout status deployment/server
+          kubectl set image deployment/server server=${{ env.IMAGE_NAME }}:${{ inputs.IMAGE_TAG }} -n ${{ env.NAMESPACE }}
+          kubectl rollout status deployment/server -n cat-chatbot

.github/workflows/feature-branch.yml

@@ -2,7 +2,7 @@ name: Feature branch workflow
 
 on:
   push:
-    branches-ignore: [main]
+    branches-ignore: [troubleshoot-eks]
 
 jobs:
   build-and-push-feature:

.github/workflows/main-branch.yml

@@ -0,0 +1,22 @@
+name: Main branch workflow
+
+on:
+  push:
+    branches: main
+
+env:
+  IMAGE_NAME: samanthamorris684/catbot
+
+jobs:
+  build-and-push-image:
+    uses: ./.github/workflows/build-and-push.yml
+    with:
+      IMAGE_TAG: $GITHUB_SHA
+    secrets:
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+
+  deploy-to-eks:
+    uses: ./.github/workflows/deploy-to-eks.yml
+    with:
+      IMAGE_TAG: $GITHUB_SHA
+