update workflows

Author: Sam Morris

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

@@ -1,18 +1,20 @@
-name: Release workflow
+name: Deployment workflow
 
 on:
-  push:
-    branches: troubleshoot-eks
-  #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: Configure AWS credentials
@@ -27,5 +29,5 @@ jobs:
 
       - name: Deploy to EKS
         run: |
-          kubectl set image deployment/server server=samanthamorris684/catbot:test -n cat-chatbot
+          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/main-branch.yml

@@ -2,9 +2,7 @@ name: Main branch workflow
 
 on:
   push:
-    branches: troubleshoot-eks
-  #release:
-  #  types: [published]
+    branches: main
 
 env:
   IMAGE_NAME: samanthamorris684/catbot
@@ -13,7 +11,12 @@ jobs:
   build-and-push-image:
     uses: ./.github/workflows/build-and-push.yml
     with:
-      IMAGE_TAG: test #$GITHUB_SHA
+      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