Merge pull request #1 from SheplX/stage

Stage

Author: SheblMohamed

.github/workflows/Backend.CI.yaml

@@ -17,11 +17,13 @@ on:
 
 env:
   BACKEND_IMAGE: backend
-  SHORT_SHA: $(echo "${{ github.sha }}" | cut -c1-7)
+  SHORT_SHA: ${GITHUB_SHA::7}
 
 jobs:
   TODO-BACKEND-CI:
     runs-on: ubuntu-latest
+    env:
+      SHA12: ${GITHUB_SHA::12}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -55,47 +57,49 @@ jobs:
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
 
       - name: Push Image Tag
+        id: push_image_tag
         run: |
           IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$BACKEND_IMAGE
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          VERSION=$GITHUB_SHA
+          VERSION=${GITHUB_SHA:0:7}
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
           docker tag $BACKEND_IMAGE $IMAGE_ID:$VERSION
           docker push $IMAGE_ID:$VERSION
+          echo "::set-output name=VERSION::$VERSION"
 
       - name: Update Helm Chart Values at Main
         if: ${{ github.ref == 'refs/heads/main'}} 
         uses: Nextdoor/helm-set-image-tag-action@main
         with:
           values_files: charts/values.yaml
           tag_keys: .backend.tag      
-          tag_value: ${{ github.sha }}
+          tag_value: ${{ steps.push_image_tag.outputs.VERSION }}
           commit_branch: ${{ github.ref }}
-          commit_tag: Todo-Main-Charts
-          commit_message: "Tag Backend:${{ env.SHORT_SHA }} Pumped"
+          commit_tag: Todo-Main-Charts-V-${{ steps.push_image_tag.outputs.VERSION }}
+          commit_message: "Backend update: Tag '${{ steps.push_image_tag.outputs.VERSION }}' added"
 
       - name: Update Helm Chart Values at Stage
         if: ${{ github.ref == 'refs/heads/stage'}} 
         uses: Nextdoor/helm-set-image-tag-action@main
         with:
           values_files: charts/values.yaml
           tag_keys: .backend.tag          
-          tag_value: ${{ github.sha }}
+          tag_value: ${{ steps.push_image_tag.outputs.VERSION }}
           commit_branch: ${{ github.ref }}
-          commit_tag: Todo-Stage-Charts
-          commit_message: "Tag Backend:${{ env.SHORT_SHA }} Pumped"
+          commit_tag: Todo-Stage-Charts-V-${{ steps.push_image_tag.outputs.VERSION }}
+          commit_message: "Backend update: Tag '${{ steps.push_image_tag.outputs.VERSION }}' added"
 
       - name: Update Helm Chart Values at Dev
         if: ${{ github.ref == 'refs/heads/dev'}} 
         uses: Nextdoor/helm-set-image-tag-action@main
         with:
           values_files: charts/values.yaml
           tag_keys: .backend.tag          
-          tag_value: ${{ github.sha }}
+          tag_value: ${{ steps.push_image_tag.outputs.VERSION }}
           commit_branch: ${{ github.ref }}
-          commit_tag: Todo-Dev-Charts
-          commit_message: "Tag Backend:${{ env.SHORT_SHA }} Pumped"
+          commit_tag: Todo-Dev-Charts-V-${{ steps.push_image_tag.outputs.VERSION }}
+          commit_message: "Backend update: Tag '${{ steps.push_image_tag.outputs.VERSION }}' added"
 
       # - name: 'Updating Helm Charts values on branch main'
       #   if: ${{ github.ref == 'refs/heads/main' }}

charts/Chart.yaml

@@ -3,4 +3,4 @@ appVersion: 1.16.0
 description: Todo app Helm chart
 name: Todo app
 type: application
-version: 0.1.79
+version: 0.1.87

charts/README.md

@@ -1,6 +1,6 @@
 # Todo app
 
-![Version: 0.1.79](https://img.shields.io/badge/Version-0.1.79-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
+![Version: 0.1.87](https://img.shields.io/badge/Version-0.1.87-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
 
 Todo app Helm chart
 
@@ -10,7 +10,7 @@ Todo app Helm chart
 |-----|------|---------|-------------|
 | DBname.name | string | `"db"` |  |
 | backend.repository | string | `"docker.pkg.github.com/Todo-Full-Stack-Deployment/sheplx/backend"` |  |
-| backend.tag | string | `"d5b6b6dc38ac8ac2c6aacf4552b75a6cbf65b205"` |  |
+| backend.tag | string | `"cd43314"` |  |
 | frontend.repository | string | `"docker.pkg.github.com/Todo-Full-Stack-Deployment/sheplx/frontend"` |  |
 | frontend.tag | string | `"c8dd64edf28cdfa5c7c8b95b581e2549857a5ee8"` |  |
 | ingress.tls[0].hosts[0] | string | `"todo.devops.com"` |  |

charts/values.yaml

@@ -4,7 +4,7 @@ ingress:
         - todo.devops.com
 backend:
   repository: docker.pkg.github.com/Todo-Full-Stack-Deployment/sheplx/backend
-  tag: d5b6b6dc38ac8ac2c6aacf4552b75a6cbf65b205
+  tag: "cd43314"
 frontend:
   repository: docker.pkg.github.com/Todo-Full-Stack-Deployment/sheplx/frontend
   tag: c8dd64edf28cdfa5c7c8b95b581e2549857a5ee8