diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 67ac030..0000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,25 +0,0 @@ - -on: - push: - tags: - - 'v*' -name: deploy -jobs: - deploy: - name: deploy to cluster - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} - steps: - - uses: actions/checkout@master - - - name: get image name - run: | - VERSION=$(cat ./version.txt) - DOCKER_IMAGE_NAME=$(echo "mereith/van-nav:v${VERSION}") - echo "::set-output name=DOCKER_IMAGE_NAME::$DOCKER_IMAGE_NAME" - id: image-name - - name: deploy to cluster - uses: steebchen/kubectl@v2.0.0 - with: # defaults to latest kubectl binary version - config: ${{ secrets.KUBE_CONFIG_DATA }} - command: set image deployment/tools -n tools van-nav=${{ steps.image-name.outputs.DOCKER_IMAGE_NAME }} \ No newline at end of file diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 285b9ba..b843635 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -52,4 +52,9 @@ jobs: push: true tags: | ${{ steps.image-name.outputs.DOCKER_IMAGE_NAME }} - ${{ steps.image-name.outputs.ALI_IMAGE_NAME }} \ No newline at end of file + ${{ steps.image-name.outputs.ALI_IMAGE_NAME }} + - name: deploy to cluster + uses: steebchen/kubectl@v2.0.0 + with: # defaults to latest kubectl binary version + config: ${{ secrets.KUBE_CONFIG_DATA }} + command: set image deployment/tools -n tools van-nav=${{ steps.image-name.outputs.DOCKER_IMAGE_NAME }} \ No newline at end of file