flatten branch name, uninstall helm before installing

makeplane · Jun 28, 2024 · 54fc978 · 54fc978
1 parent f927c3f
commit 54fc978
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/.github/workflows/feature-deployment.yml b/.github/workflows/feature-deployment.yml
@@ -12,6 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
+      flat_branch_name: ${{ steps.set_env_variables.outputs.FLAT_BRANCH_NAME }}
       gh_buildx_driver: ${{ steps.set_env_variables.outputs.BUILDX_DRIVER }}
       gh_buildx_version: ${{ steps.set_env_variables.outputs.BUILDX_VERSION }}
       gh_buildx_platforms: ${{ steps.set_env_variables.outputs.BUILDX_PLATFORMS }}
@@ -32,6 +33,9 @@ jobs:
 
           echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
 
+          FLAT_BRANCH_NAME=$(echo "${{ env.TARGET_BRANCH }}" | sed 's/[^a-zA-Z0-9]/-/g')
+          echo "FLAT_BRANCH_NAME=$FLAT_BRANCH_NAME" >> $GITHUB_OUTPUT
+
       - id: checkout_files
         name: Checkout Files
         uses: actions/checkout@v4
@@ -42,8 +46,7 @@ jobs:
     env:
       BUILD_TYPE: full
       AIO_BASE_TAG: ${{ needs.branch_build_setup.outputs.aio_base_tag }}
-      AIO_IMAGE_TAGS: makeplane/plane-aio-feature:${{ needs.branch_build_setup.outputs.gh_branch_name }}
-      TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      AIO_IMAGE_TAGS: makeplane/plane-aio-feature:${{ needs.branch_build_setup.outputs.flat_branch_name }}
       BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
       BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
       BUILDX_PLATFORMS: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }}
@@ -91,7 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       KUBE_CONFIG_FILE: ${{ secrets.FEATURE_PREVIEW_KUBE_CONFIG }}
-      DEPLOYMENT_NAME: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      DEPLOYMENT_NAME: ${{ needs.branch_build_setup.outputs.flat_branch_name }}
     steps:
       - name: Install AWS cli
         run: |
@@ -123,6 +126,13 @@ jobs:
 
           APP_NAMESPACE="${{ vars.FEATURE_PREVIEW_NAMESPACE }}"
 
+          helm --kube-insecure-skip-tls-verify  uninstall \
+            ${{ env.DEPLOYMENT_NAME }} \
+            --namespace $APP_NAMESPACE \
+            --timeout 10m0s \
+            --wait \
+            --ignore-not-found
+
           METADATA=$(helm --kube-insecure-skip-tls-verify upgrade \
               --install=true \
               --namespace $APP_NAMESPACE \
@@ -131,7 +141,8 @@ jobs:
               --set config.feature_branch=${{ env.DEPLOYMENT_NAME }} \
               --set ingress.primaryDomain=${{vars.FEATURE_PREVIEW_PRIMARY_DOMAIN || 'feature.plane.tools' }} \
               --output json \
-              --timeout 1000s \
+              --timeout 10m0s \
+              --wait \
               ${{ env.DEPLOYMENT_NAME }}  feature-preview/${{ vars.FEATURE_PREVIEW_HELM_CHART_NAME }} )
 
           APP_NAME=$(echo $METADATA | jq -r '.name')