Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CON-3166 - Removed rollback for NFS resources when creating NFS volume #437

Open
wants to merge 1 commit into
base: v2.5.2-release
Choose a base branch
from
Open

CON-3166 - Removed rollback for NFS resources when creating NFS volume #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 3 additions & 24 deletions pkg/driver/controller_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019 Hewlett Packard Enterprise Development LP
// Copyright 2019, 2025 Hewlett Packard Enterprise Development LP
// Copyright 2017 The Kubernetes Authors.

package driver
Expand Down Expand Up @@ -316,33 +316,12 @@ func (driver *Driver) createVolume(
return nil, status.Error(codes.InvalidArgument, "NFS volume provisioning is not supported with block access type")
}

volume, rollback, err := driver.flavor.CreateNFSVolume(name, size, createParameters, volumeContentSource)
volume, err := driver.flavor.CreateNFSVolume(name, size, createParameters, volumeContentSource)
if err == nil {
// Return multi-node volume
return volume, nil
}

rollbackStatus := "success"
if rollback {
// get nfs namespace for cleanup
nfsNamespace := defaultNFSNamespace
if namespace, ok := createParameters[nfsNamespaceKey]; ok {
if createParameters[nfsNamespaceKey] == nfsSourceNamespaceKey {
nfsNamespace = createParameters[nfsSourceNamespaceKey]
} else {
nfsNamespace = namespace
}
}

nfsResourceName := fmt.Sprintf("%s-%s", "hpe-nfs", strings.TrimPrefix(name, "pvc-"))
// attempt to teardown all nfs resources
err2 := driver.flavor.RollbackNFSResources(nfsResourceName, nfsNamespace)
if err2 != nil {
log.Errorf("failed to rollback NFS resources for %s, err %s", name, err2.Error())
rollbackStatus = err2.Error()
}
}
errStr := fmt.Sprintf("Failed to create NFS provisioned volume %s, err %s, rollback status: %s", name, err.Error(), rollbackStatus)
errStr := fmt.Sprintf("Failed to create NFS provisioned volume %s, err %s ", name, err.Error())
log.Errorf(errStr)
return nil, status.Error(codes.Internal, errStr)
}
Expand Down
38 changes: 14 additions & 24 deletions pkg/flavor/kubernetes/nfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019 Hewlett Packard Enterprise Development LP
// Copyright 2019, 2025 Hewlett Packard Enterprise Development LP

package kubernetes

Expand Down Expand Up @@ -80,7 +80,7 @@ type NFSSpec struct {
}

// CreateNFSVolume creates nfs volume abstracting underlying nfs pvc, deployment and service
func (flavor *Flavor) CreateNFSVolume(pvName string, reqVolSize int64, parameters map[string]string, volumeContentSource *csi.VolumeContentSource) (nfsVolume *csi.Volume, rollback bool, err error) {
func (flavor *Flavor) CreateNFSVolume(pvName string, reqVolSize int64, parameters map[string]string, volumeContentSource *csi.VolumeContentSource) (nfsVolume *csi.Volume, err error) {
log.Tracef(">>>>> CreateNFSVolume with %s", pvName)
defer log.Tracef("<<<<< CreateNFSVolume")

Expand All @@ -98,33 +98,33 @@ func (flavor *Flavor) CreateNFSVolume(pvName string, reqVolSize int64, parameter
if err != nil {
_, err = flavor.createNFSNamespace(nfsResourceNamespace)
if err != nil {
return nil, false, err
return nil, err
}
}

// obtain NFS resource parameters
nfsSpec, err := flavor.getNFSSpec(parameters)
if err != nil {
return nil, false, err
return nil, err
}

// get pvc from request
claim, err := flavor.getClaimFromClaimName(pvName)
if err != nil {
return nil, false, err
return nil, err
}

// clone pvc and modify to RWO mode
claimClone, err := flavor.cloneClaim(claim, nfsResourceNamespace, parameters)
if err != nil {
return nil, false, err
return nil, err
}

// create pvc
newClaim, err := flavor.createNFSPVC(claimClone, nfsResourceNamespace)
if err != nil {
flavor.eventRecorder.Event(claim, core_v1.EventTypeWarning, "ProvisionStorage", err.Error())
return nil, true, err
return nil, err
}

// update newly created nfs claim in nfs spec
Expand All @@ -134,41 +134,41 @@ func (flavor *Flavor) CreateNFSVolume(pvName string, reqVolSize int64, parameter
err = flavor.createServiceAccount(nfsResourceNamespace)
if err != nil {
flavor.eventRecorder.Event(claim, core_v1.EventTypeWarning, "ProvisionStorage", err.Error())
return nil, true, err
return nil, err
}

nfsHostDomain, err := flavor.getNFSHostDomain()
if err != nil {
return nil, true, err
return nil, err
}
// create nfs configmap
err = flavor.createNFSConfigMap(nfsResourceNamespace, nfsHostDomain)
if err != nil {
flavor.eventRecorder.Event(claim, core_v1.EventTypeWarning, "ProvisionStorage", err.Error())
return nil, true, err
return nil, err
}

// create deployment with name hpe-nfs-<originalclaim-uid>
deploymentName := fmt.Sprintf("%s%s", nfsPrefix, claim.ObjectMeta.UID)
err = flavor.createNFSDeployment(deploymentName, nfsSpec, nfsResourceNamespace)
if err != nil {
flavor.eventRecorder.Event(claim, core_v1.EventTypeWarning, "ProvisionStorage", err.Error())
return nil, true, err
return nil, err
}

// create service with name hpe-nfs-svc-<originalclaim-uid>
serviceName := fmt.Sprintf("%s%s", nfsPrefix, claim.ObjectMeta.UID)
err = flavor.createNFSService(serviceName, nfsResourceNamespace)
if err != nil {
flavor.eventRecorder.Event(claim, core_v1.EventTypeWarning, "ProvisionStorage", err.Error())
return nil, true, err
return nil, err
}

// get underlying NFS volume properties and copy onto original volume
volumeContext := make(map[string]string)
pv, err := flavor.getPvFromName(fmt.Sprintf("%s%s", pvcPrefix, newClaim.ObjectMeta.UID))
if err != nil {
return nil, true, err
return nil, err
}

if pv.Spec.PersistentVolumeSource.CSI != nil {
Expand Down Expand Up @@ -201,7 +201,7 @@ func (flavor *Flavor) CreateNFSVolume(pvName string, reqVolSize int64, parameter
CapacityBytes: reqVolSize,
VolumeContext: volumeContext,
ContentSource: volumeContentSource,
}, false, nil
}, nil
}

func (flavor *Flavor) createServiceAccount(nfsNamespace string) error {
Expand Down Expand Up @@ -272,16 +272,6 @@ EXPORT
return nil
}

func (flavor *Flavor) RollbackNFSResources(nfsResourceName string, nfsNamespace string) error {
log.Tracef(">>>>> RollbackNFSResources with name %s namespace %s", nfsResourceName, nfsNamespace)
defer log.Tracef("<<<<< RollbackNFSResources")
err := flavor.deleteNFSResources(nfsResourceName, nfsNamespace)
if err != nil {
return err
}
return nil
}

// DeleteNFSVolume deletes nfs volume which represents nfs pvc, deployment and service
func (flavor *Flavor) DeleteNFSVolume(volumeID string) error {
log.Tracef(">>>>> DeleteNFSVolume with %s", volumeID)
Expand Down
5 changes: 2 additions & 3 deletions pkg/flavor/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019 Hewlett Packard Enterprise Development LP
// Copyright 2019, 2025 Hewlett Packard Enterprise Development LP

package flavor

Expand Down Expand Up @@ -29,9 +29,8 @@ type Flavor interface {
GetCredentialsFromVolume(name string) (map[string]string, error)
GetCredentialsFromSecret(name string, namespace string) (map[string]string, error)
IsPodExists(uid string) (bool, error)
CreateNFSVolume(pvName string, reqVolSize int64, parameters map[string]string, volumeContentSource *csi.VolumeContentSource) (nfsVolume *csi.Volume, rollback bool, err error)
CreateNFSVolume(pvName string, reqVolSize int64, parameters map[string]string, volumeContentSource *csi.VolumeContentSource) (nfsVolume *csi.Volume, err error)
DeleteNFSVolume(pvName string) error
RollbackNFSResources(nfsResourceName, nfsNamespace string) error
HandleNFSNodePublish(request *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error)
IsNFSVolume(volumeID string) bool
GetVolumePropertyOfPV(propertyName string, pvName string) (string, error)
Expand Down
11 changes: 3 additions & 8 deletions pkg/flavor/vanilla/flavor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019 Hewlett Packard Enterprise Development LP
// Copyright 2019, 2025 Hewlett Packard Enterprise Development LP

package vanilla

Expand Down Expand Up @@ -88,13 +88,8 @@ func (flavor *Flavor) IsPodExists(uid string) (bool, error) {
}

//nolint:revive
func (flavor *Flavor) CreateNFSVolume(pvName string, reqVolSize int64, parameters map[string]string, volumeContentSource *csi.VolumeContentSource) (nfsVolume *csi.Volume, rollback bool, err error) {
return nil, false, fmt.Errorf("NFS provisioned volume is not supported for non-k8s environments")
}

//nolint:revive
func (flavor *Flavor) RollbackNFSResources(nfsResourceName, nfsNamespace string) error {
return nil
func (flavor *Flavor) CreateNFSVolume(pvName string, reqVolSize int64, parameters map[string]string, volumeContentSource *csi.VolumeContentSource) (nfsVolume *csi.Volume, err error) {
return nil, fmt.Errorf("NFS provisioned volume is not supported for non-k8s environments")
}

//nolint:revive
Expand Down