github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97086 from xing-yang/check_datasource

Browse Source 
Only CSI plugin can have a DataSource
This commit is contained in:
Kubernetes Prow Robot
2021-03-01 06:53:26 -08:00
committed by GitHub
parent 793390e13b 676a3a7012
commit f6152d1521
3 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/volume/persistentvolume/pv_controller.go
View File

@@ -1474,7 +1474,17 @@ func (ctrl *PersistentVolumeController) provisionClaimOperation(
// called from provisionClaim(), in this case, plugin MUST NOT be nil
// NOTE: checks on plugin/storageClass has been saved
pluginName := plugin.GetPluginName()
if pluginName != "kubernetes.io/csi" && claim.Spec.DataSource != nil {
// Only CSI plugin can have a DataSource. Fail the operation
// if Datasource in Claim is not nil and it is not a CSI plugin,
strerr := fmt.Sprintf("plugin %q is not a CSI plugin. Only CSI plugin can provision a claim with a datasource", pluginName)
klog.V(2).Infof(strerr)
ctrl.eventRecorder.Event(claim, v1.EventTypeWarning, events.ProvisioningFailed, strerr)
return pluginName, fmt.Errorf(strerr)
}
provisionerName := storageClass.Provisioner
klog.V(4).Infof("provisionClaimOperation [%s]: plugin name: %s, provisioner name: %s", claimToClaimKey(claim), pluginName, provisionerName)
// Add provisioner annotation to be consistent with external provisioner workflow
newClaim, err := ctrl.setClaimProvisioner(claim, provisionerName)