/usr/local/bin

replicatedhq · Aug 25, 2023 · 4520dbb · 4520dbb
1 parent 64cf502
commit 4520dbb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/.github/actions/kots-e2e/action.yml b/.github/actions/kots-e2e/action.yml
@@ -153,7 +153,7 @@ runs:
     - name: Remove Cluster
       id: remove-cluster
       uses: replicatedhq/replicated-actions/remove-cluster@v1
-      if: ${{ inputs.k8s-cluster-skip-teardown != 'true' && steps.create-cluster.outputs.cluster-id != '' }}
+      if: ${{ (cancelled() || inputs.k8s-cluster-skip-teardown != 'true') && steps.create-cluster.outputs.cluster-id != '' }}
       continue-on-error: true
       with:
         api-token: ${{ inputs.replicated-api-token }}

diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -997,6 +997,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -1106,6 +1107,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -1294,6 +1296,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -1446,6 +1449,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -1541,6 +1545,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -1636,6 +1641,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -1752,6 +1758,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -1883,6 +1890,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -2136,6 +2144,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -2203,6 +2212,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -2267,6 +2277,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -2331,6 +2342,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -2467,6 +2479,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -2648,6 +2661,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -2934,6 +2948,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -3028,6 +3043,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -3222,6 +3238,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}
@@ -3385,6 +3402,7 @@ jobs:
       - name: Remove Cluster
         id: remove-cluster
         uses: replicatedhq/replicated-actions/remove-cluster@v1
+        if: ${{ success() || cancelled() }}
         continue-on-error: true
         with:
           api-token: ${{ secrets.C11Y_MATRIX_TOKEN }}

diff --git a/deploy/melange.yaml b/deploy/melange.yaml
@@ -62,11 +62,11 @@ pipeline:
       mv bin/kots "${DESTDIR}/kots"
 
       # TODO: this requires manual intervention whenever helm bumps its major version
-      ln -s /usr/bin/helm ${{targets.destdir}}/usr/local/bin/helm
-      ln -s /usr/bin/helm ${{targets.destdir}}/usr/local/bin/helm3
+      ln -s /usr/local/bin/helm ${{targets.destdir}}/usr/local/bin/helm
+      ln -s /usr/local/bin/helm ${{targets.destdir}}/usr/local/bin/helm3
 
       # TODO: this requires manual intervention whenever kustomize bumps its major version
-      ln -s /usr/bin/kustomize ${{targets.destdir}}/usr/local/bin/kustomize
-      ln -s /usr/bin/kustomize ${{targets.destdir}}/usr/local/bin/kustomize5
+      ln -s /usr/local/bin/kustomize ${{targets.destdir}}/usr/local/bin/kustomize
+      ln -s /usr/local/bin/kustomize ${{targets.destdir}}/usr/local/bin/kustomize5
 
-      ln -s /usr/bin/kubectl ${{targets.destdir}}/usr/local/bin/kubectl
+      ln -s /usr/local/bin/kubectl ${{targets.destdir}}/usr/local/bin/kubectl