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 index 3057f735..64c1ea8a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,7 +52,6 @@ jobs: if: github.event_name != 'pull_request' uses: docker/login-action@v1 with: - registry: quay.io username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_TOKEN }} - diff --git a/cmd/nfs-subdir-external-provisioner/provisioner.go b/cmd/nfs-subdir-external-provisioner/provisioner.go index 4cb94c94..00cd9577 100644 --- a/cmd/nfs-subdir-external-provisioner/provisioner.go +++ b/cmd/nfs-subdir-external-provisioner/provisioner.go @@ -141,7 +141,9 @@ 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 still needed later basePath := filepath.Base(path) + //replace NFS Server Path with mountPath in Container oldPath := strings.Replace(path, p.path, mountPath, 1) if _, err := os.Stat(oldPath); os.IsNotExist(err) { @@ -162,6 +164,7 @@ func (p *nfsProvisioner) Delete(ctx context.Context, volume *v1.PersistentVolume case "delete": return os.RemoveAll(oldPath) + //TODO: Remove empty folders case "retain": return nil