Merge pull request #40 from qitpy/v1.4

👽 Fix helm args for quota not found
qitpydev · Aug 19, 2023 · 026fa30 · 026fa30
2 parents 23702d3 + f1e2954
commit 026fa30
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -9,7 +9,7 @@ env:
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
 jobs:
-  validate:
+  validate-code:
     name: Shellcheck
     runs-on: ubuntu-latest
     steps:
@@ -19,35 +19,44 @@ jobs:
         with:
           check_together: true
 
-  deploy:
-    needs: validate
+  validate-branch:
+    needs: validate-code
     runs-on: ubuntu-latest
+    outputs:
+      is_deployable: ${{ steps.validate.outputs.IS_DEPLOYABLE }}
+      version: ${{ steps.validate.outputs.VERSION_NUMBER }}
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
 
     - name: Check if deploy branch
-      id: is_deploy_branch
+      id: validate
       run: |
         branch_name=$(git branch --show-current)
         echo "Branch name: $branch_name"
-        export is_deploy_branch=true
         if [[ "$branch_name" =~ ^v[0-9]+\.[0-9]+$ ]]; then
           echo "Branch name matches with version release."
-          export version_number=${branch_name#v} # remove the "v" prefix
-          echo "VERSION_NUMBER=$version_number" >> $GITHUB_ENV
+          echo "VERSION_NUMBER=${branch_name#v}" >> $GITHUB_OUTPUT
+          echo "IS_DEPLOYABLE=true" >> $GITHUB_OUTPUT
         elif [[ "$branch_name" == "master" ]]; then
           echo "Branch name is 'master'. Setting VERSION_NUMBER as 'latest'..."
           export VERSION_NUMBER=latest
-          echo "VERSION_NUMBER=$VERSION_NUMBER" >> $GITHUB_ENV
+          echo "VERSION_NUMBER=$VERSION_NUMBER" >> $GITHUB_OUTPUT
+          echo "IS_DEPLOYABLE=true" >> $GITHUB_OUTPUT
         else
           echo "Branch name does not match pattern. Stopping the workflow..."
-          export is_deploy_branch=false
+          echo "IS_DEPLOYABLE=false" >> $GITHUB_OUTPUT
         fi
-        echo "is_deploy_branch=$is_deploy_branch" >> $GITHUB_OUTPUT
 
+  deploy:
+    needs: validate-branch
+    runs-on: ubuntu-latest
+    if: needs.validate-branch.outputs.is_deployable == 'true'
+    env:
+      VERSION_NUMBER : ${{needs.validate-branch.outputs.version}}
+
+    steps:
     - name: Checkout repository
-      if: steps.is_deploy_branch.outputs.is_deploy_branch == 'true'
       uses: actions/checkout@v3
 
     - name: Login to Dockerhub
@@ -57,10 +66,10 @@ jobs:
         password: ${{ env.DOCKER_PASSWORD }}
 
     - name: Build Docker image
-      run: docker build -t aws-eks-helm-deploy:${{ env.VERSION_NUMBER }} .
+      run: docker build -t aws-eks-helm-deploy:${VERSION_NUMBER} .
 
     - name: Tag Docker image
-      run: docker tag aws-eks-helm-deploy:${{ env.VERSION_NUMBER }} qitpy/aws-eks-helm-deploy:${{ env.VERSION_NUMBER }}
+      run: docker tag aws-eks-helm-deploy:${VERSION_NUMBER} qitpy/aws-eks-helm-deploy:${VERSION_NUMBER}
 
     - name: Push Docker image
-      run: docker push qitpy/aws-eks-helm-deploy:${{ env.VERSION_NUMBER }}
+      run: docker push qitpy/aws-eks-helm-deploy:${VERSION_NUMBER}
diff --git a/bin/install_chart.sh b/bin/install_chart.sh
@@ -38,28 +38,28 @@ helm_args="$helm_args --namespace $EKS_NAMESPACE"
 
 if [ -n "${RESOURCE_LIMITS_CPU}" ]; then
   log "RESOURCE_LIMITS_CPU: $RESOURCE_LIMITS_CPU"
-  helm_args+=" --set resources.limits.cpu=${RESOURCE_LIMITS_CPU}"
+  helm_args="$helm_args --set resources.limits.cpu=${RESOURCE_LIMITS_CPU}"
 else
   log "RESOURCE_LIMITS_CPU: use default"
 fi
 
 if [ -n "${RESOURCE_LIMITS_MEMORY}" ]; then
   log "RESOURCE_LIMITS_MEMORY: $RESOURCE_LIMITS_MEMORY"
-  helm_args+=" --set resources.limits.memory=${RESOURCE_LIMITS_MEMORY}"
+  helm_args="$helm_args --set resources.limits.memory=${RESOURCE_LIMITS_MEMORY}"
 else
   log "RESOURCE_LIMITS_MEMORY: use default"
 fi
 
 if [ -n "${RESOURCE_REQUEST_CPU}" ]; then
   log "RESOURCE_REQUEST_CPU: $RESOURCE_REQUEST_CPU"
-  helm_args+=" --set resources.requests.cpu=${RESOURCE_REQUEST_CPU}"
+  helm_args="$helm_args --set resources.requests.cpu=${RESOURCE_REQUEST_CPU}"
 else
   log "RESOURCE_REQUEST_CPU: use default"
 fi
 
 if [ -n "${RESOURCE_REQUEST_MEMORY}" ]; then
   log "RESOURCE_REQUEST_MEMORY: $RESOURCE_REQUEST_MEMORY"
-  helm_args+=" --set resources.requests.memory=${RESOURCE_REQUEST_MEMORY}"
+  helm_args="$helm_args --set resources.requests.memory=${RESOURCE_REQUEST_MEMORY}"
 else
   log "RESOURCE_REQUEST_MEMORY: use default"
 fi