Add dynamic provisioning support for CSI migration scenarios #253
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,6 +42,7 @@ import ( | |
| "k8s.io/client-go/kubernetes" | ||
| "k8s.io/client-go/rest" | ||
| csiclientset "k8s.io/csi-api/pkg/client/clientset/versioned" | ||
| csitranslationlib "k8s.io/csi-translation-lib" | ||
| "k8s.io/klog" | ||
|
|
||
| "google.golang.org/grpc" | ||
|
|
@@ -143,19 +144,20 @@ var ( | |
|
|
||
| // CSIProvisioner struct | ||
| type csiProvisioner struct { | ||
| client kubernetes.Interface | ||
| csiClient csi.ControllerClient | ||
| csiAPIClient csiclientset.Interface | ||
| grpcClient *grpc.ClientConn | ||
| snapshotClient snapclientset.Interface | ||
| timeout time.Duration | ||
| identity string | ||
| volumeNamePrefix string | ||
| volumeNameUUIDLength int | ||
| config *rest.Config | ||
| driverName string | ||
| pluginCapabilities connection.PluginCapabilitySet | ||
| controllerCapabilities connection.ControllerCapabilitySet | ||
| supportsMigrationFromInTreePluginName string | ||
| } | ||
|
|
||
| var _ controller.Provisioner = &csiProvisioner{} | ||
|
|
@@ -211,22 +213,24 @@ func NewCSIProvisioner(client kubernetes.Interface, | |
| snapshotClient snapclientset.Interface, | ||
| driverName string, | ||
| pluginCapabilities connection.PluginCapabilitySet, | ||
| controllerCapabilities connection.ControllerCapabilitySet, | ||
| supportsMigrationFromInTreePluginName string) controller.Provisioner { | ||
|
|
||
| csiClient := csi.NewControllerClient(grpcClient) | ||
| provisioner := &csiProvisioner{ | ||
| client: client, | ||
| grpcClient: grpcClient, | ||
| csiClient: csiClient, | ||
| csiAPIClient: csiAPIClient, | ||
| snapshotClient: snapshotClient, | ||
| timeout: connectionTimeout, | ||
| identity: identity, | ||
| volumeNamePrefix: volumeNamePrefix, | ||
| volumeNameUUIDLength: volumeNameUUIDLength, | ||
| driverName: driverName, | ||
| pluginCapabilities: pluginCapabilities, | ||
| controllerCapabilities: controllerCapabilities, | ||
| supportsMigrationFromInTreePluginName: supportsMigrationFromInTreePluginName, | ||
| } | ||
| return provisioner | ||
| } | ||
|
|
@@ -325,6 +329,31 @@ func getVolumeCapability( | |
| } | ||
|
|
||
| func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.PersistentVolume, error) { | ||
| createVolumeRequestParameters := options.Parameters | ||
| migratedVolume := false | ||
| if p.supportsMigrationFromInTreePluginName != "" { | ||
| storageClassName := options.PVC.Spec.StorageClassName | ||
| // TODO(https://github.com/kubernetes-csi/external-provisioner/issues/256): use informers | ||
| // NOTE: we cannot depend on PVC.Annotations[volume.beta.kubernetes.io/storage-provisioner] to get | ||
| // the in-tree provisioner name in case of CSI migration scenarios. The annotation will be | ||
| // set to the CSI provisioner name by PV controller for migration scenarios | ||
| // so that external provisioner can correctly pick up the PVC pointing to an in-tree plugin | ||
| storageClass, err := p.client.StorageV1().StorageClasses().Get(*storageClassName, metav1.GetOptions{}) | ||
|
There was a problem hiding this comment. If the only reason for There was a problem hiding this comment. Good point. |
||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to get storage class named %s: %v", *storageClassName, err) | ||
| } | ||
| if storageClass.Provisioner == p.supportsMigrationFromInTreePluginName { | ||
| klog.V(2).Infof("translating storage class parameters for in-tree plugin %s to CSI", storageClass.Provisioner) | ||
| createVolumeRequestParameters, err = csitranslationlib.TranslateInTreeStorageClassParametersToCSI(p.supportsMigrationFromInTreePluginName, options.Parameters) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to translate storage class parameters: %v", err) | ||
| } | ||
| migratedVolume = true | ||
| } else { | ||
| klog.V(4).Infof("skip translation of storage class parameters for plugin: %s", storageClass.Provisioner) | ||
| } | ||
| } | ||
|
|
||
| var needSnapshotSupport bool | ||
| if options.PVC.Spec.DataSource != nil { | ||
| // PVC.Spec.DataSource.Name is the name of the VolumeSnapshot API object | ||
|
|
@@ -355,7 +384,7 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis | |
|
|
||
| fsTypesFound := 0 | ||
| fsType := "" | ||
| for k, v := range createVolumeRequestParameters { | ||
| if strings.ToLower(k) == "fstype" || k == prefixedFsTypeKey { | ||
| fsType = v | ||
| fsTypesFound++ | ||
|
|
@@ -383,7 +412,7 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis | |
| // Create a CSI CreateVolumeRequest and Response | ||
| req := csi.CreateVolumeRequest{ | ||
| Name: pvName, | ||
| Parameters: createVolumeRequestParameters, | ||
| VolumeCapabilities: volumeCaps, | ||
| CapacityRange: &csi.CapacityRange{ | ||
| RequiredBytes: int64(volSizeBytes), | ||
|
|
@@ -418,7 +447,7 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis | |
|
|
||
| // Resolve provision secret credentials. | ||
| // No PVC is provided when resolving provision/delete secret names, since the PVC may or may not exist at delete time. | ||
| provisionerSecretRef, err := getSecretReference(provisionerSecretParams, createVolumeRequestParameters, pvName, nil) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
@@ -429,20 +458,20 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis | |
| req.Secrets = provisionerCredentials | ||
|
|
||
| // Resolve controller publish, node stage, node publish secret references | ||
| controllerPublishSecretRef, err := getSecretReference(controllerPublishSecretParams, createVolumeRequestParameters, pvName, options.PVC) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| nodeStageSecretRef, err := getSecretReference(nodeStageSecretParams, createVolumeRequestParameters, pvName, options.PVC) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| nodePublishSecretRef, err := getSecretReference(nodePublishSecretParams, createVolumeRequestParameters, pvName, options.PVC) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| req.Parameters, err = removePrefixedParameters(createVolumeRequestParameters) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to strip CSI Parameters of prefixed keys: %v", err) | ||
| } | ||
|
|
@@ -516,6 +545,15 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis | |
| pv.Spec.PersistentVolumeSource.CSI.FSType = fsType | ||
| } | ||
|
|
||
| if migratedVolume { | ||
| pv, err = csitranslationlib.TranslateCSIPVToInTree(pv) | ||
| if err != nil { | ||
| klog.Warningf("failed to translate CSI PV to in-tree due to: %v. Deleting provisioned PV", err) | ||
| p.Delete(pv) | ||
| return nil, err | ||
|
There was a problem hiding this comment. This leaves the provisioned volume orphaned in the storage backend. We can either delete it (possibly resulting in other errors, oh well...) or return an error that suggests there is an orphan that must be cleaned manually. Both are quite bad, I'd prefer deleting the volume though. There was a problem hiding this comment. Btw, some log (or even an event?) that this is a critical bug and should be reported / fixed would be helpful. |
||
| } | ||
| } | ||
|
|
||
| klog.Infof("successfully created PV %+v", pv.Spec.PersistentVolumeSource) | ||
|
|
||
| return pv, nil | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add a
TODO(ISSUENUMBER): use informers