Merge pull request #74 from HideyoshiSolutions/develop

develop - fix: fixes rollout check

.github/workflows/deploy.yml

@@ -127,10 +127,14 @@ jobs:
           SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
           
           IMAGE_BASE="ghcr.io/${OWNER}/${REPO}"
-          IMAGE_TAG=${{ github.event.inputs.tag || format('sha-{0}', github.sha) }}
+          IMAGE_TAG="${{ github.event.inputs.tag || '' }}"
+          if [ -z "$IMAGE_TAG" ]; then
+            IMAGE_TAG="sha-$SHORT_SHA"
+          fi
           
           echo "IMAGE_BASE=${IMAGE_BASE}" >> $GITHUB_ENV
           echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_ENV
+          echo "" >> $GITHUB_ENV
 
       - name: Import SOPS GPG Key
         run: |
@@ -161,7 +165,7 @@ jobs:
       - name: Apply Kubernetes Manifests - Deployment
         run: |
           cat .k8s/deployment.template.yml | envsubst | kubectl apply -f -
-          cat .k8s/deployment.yaml | envsubst | kubectl rollout status deployment/frontend-deployment -n ${KUBE_NAMESPACE} --timeout=120s
+          cat .k8s/deployment.template.yml | envsubst | kubectl rollout status deployment/frontend-deployment -n ${KUBE_NAMESPACE} --timeout=120s
 
       - name: Apply Kubernetes Manifests - Service
         run: cat .k8s/service.template.yml | envsubst | kubectl apply -f -