diff --git a/.github/workflows/helm-chart-lint.yml b/.github/workflows/helm-chart-lint.yml deleted file mode 100644 index bb8dcaa4..00000000 --- a/.github/workflows/helm-chart-lint.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Lint Helm Charts - -on: pull_request - -jobs: - lint-test: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Set up chart-testing - uses: helm/chart-testing-action@v2.0.1 - - - name: Run chart-testing (lint) - run: ct lint --validate-maintainers=false diff --git a/.github/workflows/helm-chart-release.yml b/.github/workflows/helm-chart-release.yml deleted file mode 100644 index f4c5b543..00000000 --- a/.github/workflows/helm-chart-release.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Release Helm Charts - -on: - push: - branches: - - master - -jobs: - release: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Configure Git - run: | - git config user.name "$GITHUB_ACTOR" - git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - - - name: Run chart-releaser - uses: helm/chart-releaser-action@v1.1.0 - env: - CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index a8505c8e..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,77 +0,0 @@ -name: ci - -on: - push: - tags: - - 'gh-v*.*.*' - -jobs: - docker: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v2 - - - name: Prepare - id: prep - run: | - if [[ $GITHUB_REF == refs/tags/* ]]; then - VERSION=${GITHUB_REF#refs/tags/} - if [[ $VERSION =~ ^gh-v([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$ ]]; then - MAJOR="${BASH_REMATCH[1]}" - MINOR="${BASH_REMATCH[2]}" - PATCH="${BASH_REMATCH[3]}" - - TAGS="${{ secrets.DOCKER_IMAGE }}:latest" - TAGS="${TAGS},${{ secrets.DOCKER_IMAGE }}:${MAJOR}" - TAGS="${TAGS},${{ secrets.DOCKER_IMAGE }}:${MAJOR}.${MINOR}" - TAGS="${TAGS},${{ secrets.DOCKER_IMAGE }}:${MAJOR}.${MINOR}.${PATCH}" - else - TAGS="${{ secrets.DOCKER_IMAGE }}:${VERSION}" - fi - elif [[ $GITHUB_REF == refs/heads/* ]]; then - VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g') - if [ "${{ github.event.repository.default_branch }}" = "$VERSION" ]; then - VERSION=edge - fi - TAGS="${{ secrets.DOCKER_IMAGE }}:${VERSION}" - elif [[ $GITHUB_REF == refs/pull/* ]]; then - TAGS="${{ secrets.DOCKER_IMAGE }}:pr-${{ github.event.number }}" - fi - echo "tags=${TAGS}" >> $GITHUB_OUTPUT - echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to the container registry - if: github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - registry: quay.io - username: ${{ secrets.REGISTRY_USERNAME }} - password: ${{ secrets.REGISTRY_TOKEN }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - context: . - file: ./Dockerfile.multiarch - platforms: linux/amd64,linux/arm/v7,linux/arm64 - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.prep.outputs.tags }} - build-args: | - APP_FOLDER=/go/src/github.com/${{ github.repository }} - labels: | - org.opencontainers.image.title=${{ github.event.repository.name }} - org.opencontainers.image.description=${{ github.event.repository.description }} - org.opencontainers.image.url=${{ github.event.repository.html_url }} - org.opencontainers.image.source=${{ github.event.repository.clone_url }} - org.opencontainers.image.created=${{ steps.prep.outputs.created }} - org.opencontainers.image.revision=${{ github.sha }} - org.opencontainers.image.licenses=${{ github.event.repository.license.spdx_id }} diff --git a/cmd/nfs-subdir-external-provisioner/provisioner.go b/cmd/nfs-subdir-external-provisioner/provisioner.go index e124757d..eb15bfe5 100644 --- a/cmd/nfs-subdir-external-provisioner/provisioner.go +++ b/cmd/nfs-subdir-external-provisioner/provisioner.go @@ -146,6 +146,10 @@ func (p *nfsProvisioner) Provision(ctx context.Context, options controller.Provi func (p *nfsProvisioner) Delete(ctx context.Context, volume *v1.PersistentVolume) error { path := volume.Spec.PersistentVolumeSource.NFS.Path basePath := filepath.Base(path) + if len(basePath) < 1 { + glog.Warningf("path %s does not exist", basePath) + return nil + } oldPath := strings.Replace(path, p.path, mountPath, 1) if _, err := os.Stat(oldPath); os.IsNotExist(err) {