mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-02-07 03:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #94 from ceph/devel

Browse Source 
Sync upstream devel to downstream devel
This commit is contained in:
OpenShift Merge Robot 2022-05-05 04:14:18 -04:00 committed by GitHub
commit 56cf5b8f58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deploy/nfs/kubernetes/csi-nfsplugin.yaml
View File

@ -18,7 +18,7 @@ spec:
- --probe-timeout=3s - --probe-timeout=3s
- --health-port=29653 - --health-port=29653
- --v=2 - --v=2
image: registry.k8s.io/sig-storage/livenessprobe:v2.5.0 image: registry.k8s.io/sig-storage/livenessprobe:v2.6.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: liveness-probe name: liveness-probe
resources: resources:
@ -44,7 +44,7 @@ spec:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: spec.nodeName fieldPath: spec.nodeName
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.4.0 image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
exec: exec:

2
internal/kms/vault.go
View File

@ -352,7 +352,7 @@ func initVaultKMS(args ProviderInitArgs) (EncryptionKMS, error) {
kms.vaultConfig[vault.AuthMountPath], err = detectAuthMountPath(vaultAuthPath) kms.vaultConfig[vault.AuthMountPath], err = detectAuthMountPath(vaultAuthPath)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to set %s in Vault config: %w", vault.AuthMountPath, err) return nil, fmt.Errorf("failed to set \"vaultAuthPath\" in Vault config: %w", err)
} }
vaultRole := vaultDefaultRole vaultRole := vaultDefaultRole

5
internal/nfs/controller/controllerserver.go
View File

@ -18,6 +18,7 @@ package controller
import ( import (
"context" "context"
"strings"
"github.com/ceph/ceph-csi/internal/cephfs" "github.com/ceph/ceph-csi/internal/cephfs"
"github.com/ceph/ceph-csi/internal/cephfs/store" "github.com/ceph/ceph-csi/internal/cephfs/store"
@ -140,8 +141,8 @@ func (cs *Server) DeleteVolume(
defer nfsVolume.Destroy() defer nfsVolume.Destroy()
err = nfsVolume.DeleteExport() err = nfsVolume.DeleteExport()
// TODO: if the export does not exist, but the backend does, delete the backend // if the export does not exist, continue with deleting the backend volume
if err != nil { if err != nil && !strings.Contains(err.Error(), "Export does not exist") {
return nil, status.Errorf(codes.InvalidArgument, "failed to delete export: %v", err) return nil, status.Errorf(codes.InvalidArgument, "failed to delete export: %v", err)
} }