Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
bccc8fe9
Commit
bccc8fe9
authored
May 23, 2018
by
lichuqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Provision interface change
parent
dffbd75f
Hide whitespace changes
Inline
Side-by-side
Showing
33 changed files
with
59 additions
and
37 deletions
+59
-37
core.go
cmd/kube-controller-manager/app/core.go
+1
-0
framework_test.go
pkg/controller/volume/persistentvolume/framework_test.go
+2
-1
pv_controller.go
pkg/controller/volume/persistentvolume/pv_controller.go
+19
-4
pv_controller_base.go
pkg/controller/volume/persistentvolume/pv_controller_base.go
+4
-1
aws_ebs.go
pkg/volume/aws_ebs/aws_ebs.go
+1
-1
aws_ebs_test.go
pkg/volume/aws_ebs/aws_ebs_test.go
+1
-1
azure_provision.go
pkg/volume/azure_dd/azure_provision.go
+1
-1
azure_provision.go
pkg/volume/azure_file/azure_provision.go
+1
-1
cinder.go
pkg/volume/cinder/cinder.go
+1
-1
cinder_test.go
pkg/volume/cinder/cinder_test.go
+1
-1
flocker_volume.go
pkg/volume/flocker/flocker_volume.go
+1
-1
flocker_volume_test.go
pkg/volume/flocker/flocker_volume_test.go
+3
-3
gce_pd.go
pkg/volume/gce_pd/gce_pd.go
+1
-1
gce_pd_test.go
pkg/volume/gce_pd/gce_pd_test.go
+1
-1
glusterfs.go
pkg/volume/glusterfs/glusterfs.go
+1
-1
host_path.go
pkg/volume/host_path/host_path.go
+1
-1
host_path_test.go
pkg/volume/host_path/host_path_test.go
+1
-1
photon_pd.go
pkg/volume/photon_pd/photon_pd.go
+1
-1
photon_pd_test.go
pkg/volume/photon_pd/photon_pd_test.go
+1
-1
portworx.go
pkg/volume/portworx/portworx.go
+1
-1
portworx_test.go
pkg/volume/portworx/portworx_test.go
+1
-1
quobyte.go
pkg/volume/quobyte/quobyte.go
+1
-1
rbd.go
pkg/volume/rbd/rbd.go
+1
-1
sio_volume.go
pkg/volume/scaleio/sio_volume.go
+1
-1
sio_volume_test.go
pkg/volume/scaleio/sio_volume_test.go
+3
-3
storageos.go
pkg/volume/storageos/storageos.go
+1
-1
storageos_test.go
pkg/volume/storageos/storageos_test.go
+1
-1
testing.go
pkg/volume/testing/testing.go
+1
-1
volume.go
pkg/volume/volume.go
+1
-1
vsphere_volume.go
pkg/volume/vsphere_volume/vsphere_volume.go
+1
-1
vsphere_volume_test.go
pkg/volume/vsphere_volume/vsphere_volume_test.go
+1
-1
volume_binding_test.go
test/integration/scheduler/volume_binding_test.go
+1
-0
persistent_volumes_test.go
test/integration/volume/persistent_volumes_test.go
+1
-0
No files found.
cmd/kube-controller-manager/app/core.go
View file @
bccc8fe9
...
...
@@ -175,6 +175,7 @@ func startPersistentVolumeBinderController(ctx ControllerContext) (bool, error)
ClaimInformer
:
ctx
.
InformerFactory
.
Core
()
.
V1
()
.
PersistentVolumeClaims
(),
ClassInformer
:
ctx
.
InformerFactory
.
Storage
()
.
V1
()
.
StorageClasses
(),
PodInformer
:
ctx
.
InformerFactory
.
Core
()
.
V1
()
.
Pods
(),
NodeInformer
:
ctx
.
InformerFactory
.
Core
()
.
V1
()
.
Nodes
(),
EnableDynamicProvisioning
:
ctx
.
ComponentConfig
.
PersistentVolumeBinderController
.
VolumeConfiguration
.
EnableDynamicProvisioning
,
}
volumeController
,
volumeControllerErr
:=
persistentvolumecontroller
.
NewController
(
params
)
...
...
pkg/controller/volume/persistentvolume/framework_test.go
View file @
bccc8fe9
...
...
@@ -612,6 +612,7 @@ func newTestController(kubeClient clientset.Interface, informerFactory informers
ClaimInformer
:
informerFactory
.
Core
()
.
V1
()
.
PersistentVolumeClaims
(),
ClassInformer
:
informerFactory
.
Storage
()
.
V1
()
.
StorageClasses
(),
PodInformer
:
informerFactory
.
Core
()
.
V1
()
.
Pods
(),
NodeInformer
:
informerFactory
.
Core
()
.
V1
()
.
Nodes
(),
EventRecorder
:
record
.
NewFakeRecorder
(
1000
),
EnableDynamicProvisioning
:
enableDynamicProvisioning
,
}
...
...
@@ -1192,7 +1193,7 @@ func (plugin *mockVolumePlugin) NewProvisioner(options vol.VolumeOptions) (vol.P
}
}
func
(
plugin
*
mockVolumePlugin
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
plugin
*
mockVolumePlugin
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
len
(
plugin
.
provisionCalls
)
<=
plugin
.
provisionCallCounter
{
return
nil
,
fmt
.
Errorf
(
"Mock plugin error: unexpected provisioner call %d"
,
plugin
.
provisionCallCounter
)
}
...
...
pkg/controller/volume/persistentvolume/pv_controller.go
View file @
bccc8fe9
...
...
@@ -174,6 +174,8 @@ type PersistentVolumeController struct {
classListerSynced
cache
.
InformerSynced
podLister
corelisters
.
PodLister
podListerSynced
cache
.
InformerSynced
NodeLister
corelisters
.
NodeLister
NodeListerSynced
cache
.
InformerSynced
kubeClient
clientset
.
Interface
eventRecorder
record
.
EventRecorder
...
...
@@ -1434,13 +1436,26 @@ func (ctrl *PersistentVolumeController) provisionClaimOperation(claim *v1.Persis
return
}
var
selectedNode
*
v1
.
Node
=
nil
var
allowedTopologies
[]
v1
.
TopologySelectorTerm
=
nil
if
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
DynamicProvisioningScheduling
)
{
if
nodeName
,
ok
:=
claim
.
Annotations
[
annSelectedNode
];
ok
{
selectedNode
,
err
=
ctrl
.
NodeLister
.
Get
(
nodeName
)
if
err
!=
nil
{
strerr
:=
fmt
.
Sprintf
(
"Failed to get target node: %v"
,
err
)
glog
.
V
(
3
)
.
Infof
(
"unexpected error getting target node %q for claim %q: %v"
,
nodeName
,
claimToClaimKey
(
claim
),
err
)
ctrl
.
eventRecorder
.
Event
(
claim
,
v1
.
EventTypeWarning
,
events
.
ProvisioningFailed
,
strerr
)
return
}
}
allowedTopologies
=
storageClass
.
AllowedTopologies
}
opComplete
:=
util
.
OperationCompleteHook
(
plugin
.
GetPluginName
(),
"volume_provision"
)
// TODO: modify the Provision() interface to pass in the allowed topology information
// of the provisioned volume.
volume
,
err
=
provisioner
.
Provision
()
volume
,
err
=
provisioner
.
Provision
(
selectedNode
,
allowedTopologies
)
opComplete
(
&
err
)
if
err
!=
nil
{
// Other places of failure ha
s
nothing to do with DynamicProvisioningScheduling,
// Other places of failure ha
ve
nothing to do with DynamicProvisioningScheduling,
// so just let controller retry in the next sync. We'll only call func
// rescheduleProvisioning here when the underlying provisioning actually failed.
ctrl
.
rescheduleProvisioning
(
claim
)
...
...
pkg/controller/volume/persistentvolume/pv_controller_base.go
View file @
bccc8fe9
...
...
@@ -63,6 +63,7 @@ type ControllerParameters struct {
ClaimInformer
coreinformers
.
PersistentVolumeClaimInformer
ClassInformer
storageinformers
.
StorageClassInformer
PodInformer
coreinformers
.
PodInformer
NodeInformer
coreinformers
.
NodeInformer
EventRecorder
record
.
EventRecorder
EnableDynamicProvisioning
bool
}
...
...
@@ -122,6 +123,8 @@ func NewController(p ControllerParameters) (*PersistentVolumeController, error)
controller
.
classListerSynced
=
p
.
ClassInformer
.
Informer
()
.
HasSynced
controller
.
podLister
=
p
.
PodInformer
.
Lister
()
controller
.
podListerSynced
=
p
.
PodInformer
.
Informer
()
.
HasSynced
controller
.
NodeLister
=
p
.
NodeInformer
.
Lister
()
controller
.
NodeListerSynced
=
p
.
NodeInformer
.
Informer
()
.
HasSynced
return
controller
,
nil
}
...
...
@@ -268,7 +271,7 @@ func (ctrl *PersistentVolumeController) Run(stopCh <-chan struct{}) {
glog
.
Infof
(
"Starting persistent volume controller"
)
defer
glog
.
Infof
(
"Shutting down persistent volume controller"
)
if
!
controller
.
WaitForCacheSync
(
"persistent volume"
,
stopCh
,
ctrl
.
volumeListerSynced
,
ctrl
.
claimListerSynced
,
ctrl
.
classListerSynced
,
ctrl
.
podListerSynced
)
{
if
!
controller
.
WaitForCacheSync
(
"persistent volume"
,
stopCh
,
ctrl
.
volumeListerSynced
,
ctrl
.
claimListerSynced
,
ctrl
.
classListerSynced
,
ctrl
.
podListerSynced
,
ctrl
.
NodeListerSynced
)
{
return
}
...
...
pkg/volume/aws_ebs/aws_ebs.go
View file @
bccc8fe9
...
...
@@ -491,7 +491,7 @@ type awsElasticBlockStoreProvisioner struct {
var
_
volume
.
Provisioner
=
&
awsElasticBlockStoreProvisioner
{}
func
(
c
*
awsElasticBlockStoreProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
c
*
awsElasticBlockStoreProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
!
util
.
AccessModesContainedInAll
(
c
.
plugin
.
GetAccessModes
(),
c
.
options
.
PVC
.
Spec
.
AccessModes
)
{
return
nil
,
fmt
.
Errorf
(
"invalid AccessModes %v: only AccessModes %v are supported"
,
c
.
options
.
PVC
.
Spec
.
AccessModes
,
c
.
plugin
.
GetAccessModes
())
}
...
...
pkg/volume/aws_ebs/aws_ebs_test.go
View file @
bccc8fe9
...
...
@@ -173,7 +173,7 @@ func TestPlugin(t *testing.T) {
if
err
!=
nil
{
t
.
Errorf
(
"Error creating new provisioner:%v"
,
err
)
}
persistentSpec
,
err
:=
provisioner
.
Provision
()
persistentSpec
,
err
:=
provisioner
.
Provision
(
nil
,
nil
)
if
err
!=
nil
{
t
.
Errorf
(
"Provision() failed: %v"
,
err
)
}
...
...
pkg/volume/azure_dd/azure_provision.go
View file @
bccc8fe9
...
...
@@ -67,7 +67,7 @@ func (d *azureDiskDeleter) Delete() error {
return
diskController
.
DeleteBlobDisk
(
volumeSource
.
DataDiskURI
)
}
func
(
p
*
azureDiskProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
p
*
azureDiskProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
!
util
.
AccessModesContainedInAll
(
p
.
plugin
.
GetAccessModes
(),
p
.
options
.
PVC
.
Spec
.
AccessModes
)
{
return
nil
,
fmt
.
Errorf
(
"invalid AccessModes %v: only AccessModes %v are supported"
,
p
.
options
.
PVC
.
Spec
.
AccessModes
,
p
.
plugin
.
GetAccessModes
())
}
...
...
pkg/volume/azure_file/azure_provision.go
View file @
bccc8fe9
...
...
@@ -131,7 +131,7 @@ type azureFileProvisioner struct {
var
_
volume
.
Provisioner
=
&
azureFileProvisioner
{}
func
(
a
*
azureFileProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
a
*
azureFileProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
!
util
.
AccessModesContainedInAll
(
a
.
plugin
.
GetAccessModes
(),
a
.
options
.
PVC
.
Spec
.
AccessModes
)
{
return
nil
,
fmt
.
Errorf
(
"invalid AccessModes %v: only AccessModes %v are supported"
,
a
.
options
.
PVC
.
Spec
.
AccessModes
,
a
.
plugin
.
GetAccessModes
())
}
...
...
pkg/volume/cinder/cinder.go
View file @
bccc8fe9
...
...
@@ -500,7 +500,7 @@ type cinderVolumeProvisioner struct {
var
_
volume
.
Provisioner
=
&
cinderVolumeProvisioner
{}
func
(
c
*
cinderVolumeProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
c
*
cinderVolumeProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
!
util
.
AccessModesContainedInAll
(
c
.
plugin
.
GetAccessModes
(),
c
.
options
.
PVC
.
Spec
.
AccessModes
)
{
return
nil
,
fmt
.
Errorf
(
"invalid AccessModes %v: only AccessModes %v are supported"
,
c
.
options
.
PVC
.
Spec
.
AccessModes
,
c
.
plugin
.
GetAccessModes
())
}
...
...
pkg/volume/cinder/cinder_test.go
View file @
bccc8fe9
...
...
@@ -196,7 +196,7 @@ func TestPlugin(t *testing.T) {
PersistentVolumeReclaimPolicy
:
v1
.
PersistentVolumeReclaimDelete
,
}
provisioner
,
err
:=
plug
.
(
*
cinderPlugin
)
.
newProvisionerInternal
(
options
,
&
fakePDManager
{
0
})
persistentSpec
,
err
:=
provisioner
.
Provision
()
persistentSpec
,
err
:=
provisioner
.
Provision
(
nil
,
nil
)
if
err
!=
nil
{
t
.
Errorf
(
"Provision() failed: %v"
,
err
)
}
...
...
pkg/volume/flocker/flocker_volume.go
View file @
bccc8fe9
...
...
@@ -54,7 +54,7 @@ type flockerVolumeProvisioner struct {
var
_
volume
.
Provisioner
=
&
flockerVolumeProvisioner
{}
func
(
c
*
flockerVolumeProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
c
*
flockerVolumeProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
!
util
.
AccessModesContainedInAll
(
c
.
plugin
.
GetAccessModes
(),
c
.
options
.
PVC
.
Spec
.
AccessModes
)
{
return
nil
,
fmt
.
Errorf
(
"invalid AccessModes %v: only AccessModes %v are supported"
,
c
.
options
.
PVC
.
Spec
.
AccessModes
,
c
.
plugin
.
GetAccessModes
())
}
...
...
pkg/volume/flocker/flocker_volume_test.go
View file @
bccc8fe9
...
...
@@ -57,7 +57,7 @@ func TestProvision(t *testing.T) {
dir
,
provisioner
:=
newTestableProvisioner
(
assert
,
options
)
defer
os
.
RemoveAll
(
dir
)
persistentSpec
,
err
:=
provisioner
.
Provision
()
persistentSpec
,
err
:=
provisioner
.
Provision
(
nil
,
nil
)
assert
.
NoError
(
err
,
"Provision() failed: "
,
err
)
cap
:=
persistentSpec
.
Spec
.
Capacity
[
v1
.
ResourceStorage
]
...
...
@@ -85,7 +85,7 @@ func TestProvision(t *testing.T) {
dir
,
provisioner
=
newTestableProvisioner
(
assert
,
options
)
defer
os
.
RemoveAll
(
dir
)
persistentSpec
,
err
=
provisioner
.
Provision
()
persistentSpec
,
err
=
provisioner
.
Provision
(
nil
,
nil
)
assert
.
Error
(
err
,
"Provision() did not fail with Parameters specified"
)
// selectors are not supported
...
...
@@ -97,6 +97,6 @@ func TestProvision(t *testing.T) {
dir
,
provisioner
=
newTestableProvisioner
(
assert
,
options
)
defer
os
.
RemoveAll
(
dir
)
persistentSpec
,
err
=
provisioner
.
Provision
()
persistentSpec
,
err
=
provisioner
.
Provision
(
nil
,
nil
)
assert
.
Error
(
err
,
"Provision() did not fail with Selector specified"
)
}
pkg/volume/gce_pd/gce_pd.go
View file @
bccc8fe9
...
...
@@ -417,7 +417,7 @@ type gcePersistentDiskProvisioner struct {
var
_
volume
.
Provisioner
=
&
gcePersistentDiskProvisioner
{}
func
(
c
*
gcePersistentDiskProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
c
*
gcePersistentDiskProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
!
util
.
AccessModesContainedInAll
(
c
.
plugin
.
GetAccessModes
(),
c
.
options
.
PVC
.
Spec
.
AccessModes
)
{
return
nil
,
fmt
.
Errorf
(
"invalid AccessModes %v: only AccessModes %v are supported"
,
c
.
options
.
PVC
.
Spec
.
AccessModes
,
c
.
plugin
.
GetAccessModes
())
}
...
...
pkg/volume/gce_pd/gce_pd_test.go
View file @
bccc8fe9
...
...
@@ -167,7 +167,7 @@ func TestPlugin(t *testing.T) {
if
err
!=
nil
{
t
.
Errorf
(
"Error creating new provisioner:%v"
,
err
)
}
persistentSpec
,
err
:=
provisioner
.
Provision
()
persistentSpec
,
err
:=
provisioner
.
Provision
(
nil
,
nil
)
if
err
!=
nil
{
t
.
Errorf
(
"Provision() failed: %v"
,
err
)
}
...
...
pkg/volume/glusterfs/glusterfs.go
View file @
bccc8fe9
...
...
@@ -664,7 +664,7 @@ func (d *glusterfsVolumeDeleter) Delete() error {
return
nil
}
func
(
p
*
glusterfsVolumeProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
p
*
glusterfsVolumeProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
!
volutil
.
AccessModesContainedInAll
(
p
.
plugin
.
GetAccessModes
(),
p
.
options
.
PVC
.
Spec
.
AccessModes
)
{
return
nil
,
fmt
.
Errorf
(
"invalid AccessModes %v: only AccessModes %v are supported"
,
p
.
options
.
PVC
.
Spec
.
AccessModes
,
p
.
plugin
.
GetAccessModes
())
}
...
...
pkg/volume/host_path/host_path.go
View file @
bccc8fe9
...
...
@@ -265,7 +265,7 @@ type hostPathProvisioner struct {
// Create for hostPath simply creates a local /tmp/hostpath_pv/%s directory as a new PersistentVolume.
// This Provisioner is meant for development and testing only and WILL NOT WORK in a multi-node cluster.
func
(
r
*
hostPathProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
r
*
hostPathProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
util
.
CheckPersistentVolumeClaimModeBlock
(
r
.
options
.
PVC
)
{
return
nil
,
fmt
.
Errorf
(
"%s does not support block volume provisioning"
,
r
.
plugin
.
GetPluginName
())
}
...
...
pkg/volume/host_path/host_path_test.go
View file @
bccc8fe9
...
...
@@ -178,7 +178,7 @@ func TestProvisioner(t *testing.T) {
if
err
!=
nil
{
t
.
Errorf
(
"Failed to make a new Provisioner: %v"
,
err
)
}
pv
,
err
:=
creater
.
Provision
()
pv
,
err
:=
creater
.
Provision
(
nil
,
nil
)
if
err
!=
nil
{
t
.
Errorf
(
"Unexpected error creating volume: %v"
,
err
)
}
...
...
pkg/volume/photon_pd/photon_pd.go
View file @
bccc8fe9
...
...
@@ -340,7 +340,7 @@ func (plugin *photonPersistentDiskPlugin) newProvisionerInternal(options volume.
},
nil
}
func
(
p
*
photonPersistentDiskProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
p
*
photonPersistentDiskProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
!
util
.
AccessModesContainedInAll
(
p
.
plugin
.
GetAccessModes
(),
p
.
options
.
PVC
.
Spec
.
AccessModes
)
{
return
nil
,
fmt
.
Errorf
(
"invalid AccessModes %v: only AccessModes %v are supported"
,
p
.
options
.
PVC
.
Spec
.
AccessModes
,
p
.
plugin
.
GetAccessModes
())
}
...
...
pkg/volume/photon_pd/photon_pd_test.go
View file @
bccc8fe9
...
...
@@ -166,7 +166,7 @@ func TestPlugin(t *testing.T) {
if
err
!=
nil
{
t
.
Fatalf
(
"Error creating new provisioner:%v"
,
err
)
}
persistentSpec
,
err
:=
provisioner
.
Provision
()
persistentSpec
,
err
:=
provisioner
.
Provision
(
nil
,
nil
)
if
err
!=
nil
{
t
.
Errorf
(
"Provision() failed: %v"
,
err
)
}
...
...
pkg/volume/portworx/portworx.go
View file @
bccc8fe9
...
...
@@ -378,7 +378,7 @@ type portworxVolumeProvisioner struct {
var
_
volume
.
Provisioner
=
&
portworxVolumeProvisioner
{}
func
(
c
*
portworxVolumeProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
c
*
portworxVolumeProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
!
util
.
AccessModesContainedInAll
(
c
.
plugin
.
GetAccessModes
(),
c
.
options
.
PVC
.
Spec
.
AccessModes
)
{
return
nil
,
fmt
.
Errorf
(
"invalid AccessModes %v: only AccessModes %v are supported"
,
c
.
options
.
PVC
.
Spec
.
AccessModes
,
c
.
plugin
.
GetAccessModes
())
}
...
...
pkg/volume/portworx/portworx_test.go
View file @
bccc8fe9
...
...
@@ -204,7 +204,7 @@ func TestPlugin(t *testing.T) {
if
err
!=
nil
{
t
.
Errorf
(
"Error creating a new provisioner:%v"
,
err
)
}
persistentSpec
,
err
:=
provisioner
.
Provision
()
persistentSpec
,
err
:=
provisioner
.
Provision
(
nil
,
nil
)
if
err
!=
nil
{
t
.
Errorf
(
"Provision() failed: %v"
,
err
)
}
...
...
pkg/volume/quobyte/quobyte.go
View file @
bccc8fe9
...
...
@@ -354,7 +354,7 @@ type quobyteVolumeProvisioner struct {
options
volume
.
VolumeOptions
}
func
(
provisioner
*
quobyteVolumeProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
provisioner
*
quobyteVolumeProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
!
util
.
AccessModesContainedInAll
(
provisioner
.
plugin
.
GetAccessModes
(),
provisioner
.
options
.
PVC
.
Spec
.
AccessModes
)
{
return
nil
,
fmt
.
Errorf
(
"invalid AccessModes %v: only AccessModes %v are supported"
,
provisioner
.
options
.
PVC
.
Spec
.
AccessModes
,
provisioner
.
plugin
.
GetAccessModes
())
}
...
...
pkg/volume/rbd/rbd.go
View file @
bccc8fe9
...
...
@@ -579,7 +579,7 @@ type rbdVolumeProvisioner struct {
var
_
volume
.
Provisioner
=
&
rbdVolumeProvisioner
{}
func
(
r
*
rbdVolumeProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
r
*
rbdVolumeProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
!
volutil
.
AccessModesContainedInAll
(
r
.
plugin
.
GetAccessModes
(),
r
.
options
.
PVC
.
Spec
.
AccessModes
)
{
return
nil
,
fmt
.
Errorf
(
"invalid AccessModes %v: only AccessModes %v are supported"
,
r
.
options
.
PVC
.
Spec
.
AccessModes
,
r
.
plugin
.
GetAccessModes
())
}
...
...
pkg/volume/scaleio/sio_volume.go
View file @
bccc8fe9
...
...
@@ -252,7 +252,7 @@ func (v *sioVolume) Delete() error {
// ************************
var
_
volume
.
Provisioner
=
&
sioVolume
{}
func
(
v
*
sioVolume
)
Provision
()
(
*
api
.
PersistentVolume
,
error
)
{
func
(
v
*
sioVolume
)
Provision
(
selectedNode
*
api
.
Node
,
allowedTopologies
[]
api
.
TopologySelectorTerm
)
(
*
api
.
PersistentVolume
,
error
)
{
glog
.
V
(
4
)
.
Info
(
log
(
"attempting to dynamically provision pvc %v"
,
v
.
options
.
PVC
.
Name
))
if
!
util
.
AccessModesContainedInAll
(
v
.
plugin
.
GetAccessModes
(),
v
.
options
.
PVC
.
Spec
.
AccessModes
)
{
...
...
pkg/volume/scaleio/sio_volume_test.go
View file @
bccc8fe9
...
...
@@ -296,7 +296,7 @@ func TestVolumeProvisioner(t *testing.T) {
}
sioVol
.
sioMgr
.
client
=
sio
spec
,
err
:=
provisioner
.
Provision
()
spec
,
err
:=
provisioner
.
Provision
(
nil
,
nil
)
if
err
!=
nil
{
t
.
Fatalf
(
"call to Provision() failed: %v"
,
err
)
}
...
...
@@ -467,7 +467,7 @@ func TestVolumeProvisionerWithZeroCapacity(t *testing.T) {
}
sioVol
.
sioMgr
.
client
=
sio
_
,
err
=
provisioner
.
Provision
()
_
,
err
=
provisioner
.
Provision
(
nil
,
nil
)
if
err
==
nil
{
t
.
Fatalf
(
"call to Provision() should fail with invalid capacity"
)
}
...
...
@@ -516,7 +516,7 @@ func TestVolumeProvisionerWithSecretNamespace(t *testing.T) {
}
sioVol
.
sioMgr
.
client
=
sio
spec
,
err
:=
sioVol
.
Provision
()
spec
,
err
:=
sioVol
.
Provision
(
nil
,
nil
)
if
err
!=
nil
{
t
.
Fatalf
(
"call to Provision() failed: %v"
,
err
)
}
...
...
pkg/volume/storageos/storageos.go
View file @
bccc8fe9
...
...
@@ -560,7 +560,7 @@ type storageosProvisioner struct {
var
_
volume
.
Provisioner
=
&
storageosProvisioner
{}
func
(
c
*
storageosProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
c
*
storageosProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
!
util
.
AccessModesContainedInAll
(
c
.
plugin
.
GetAccessModes
(),
c
.
options
.
PVC
.
Spec
.
AccessModes
)
{
return
nil
,
fmt
.
Errorf
(
"invalid AccessModes %v: only AccessModes %v are supported"
,
c
.
options
.
PVC
.
Spec
.
AccessModes
,
c
.
plugin
.
GetAccessModes
())
}
...
...
pkg/volume/storageos/storageos_test.go
View file @
bccc8fe9
...
...
@@ -269,7 +269,7 @@ func TestPlugin(t *testing.T) {
t
.
Errorf
(
"newProvisionerInternal() failed: %v"
,
err
)
}
persistentSpec
,
err
:=
provisioner
.
Provision
()
persistentSpec
,
err
:=
provisioner
.
Provision
(
nil
,
nil
)
if
err
!=
nil
{
t
.
Fatalf
(
"Provision() failed: %v"
,
err
)
}
...
...
pkg/volume/testing/testing.go
View file @
bccc8fe9
...
...
@@ -733,7 +733,7 @@ type FakeProvisioner struct {
Host
VolumeHost
}
func
(
fc
*
FakeProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
fc
*
FakeProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
fullpath
:=
fmt
.
Sprintf
(
"/tmp/hostpath_pv/%s"
,
uuid
.
NewUUID
())
pv
:=
&
v1
.
PersistentVolume
{
...
...
pkg/volume/volume.go
View file @
bccc8fe9
...
...
@@ -180,7 +180,7 @@ type Provisioner interface {
// Provision creates the resource by allocating the underlying volume in a
// storage system. This method should block until completion and returns
// PersistentVolume representing the created storage resource.
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
}
// Deleter removes the resource from the underlying storage provider. Calls
...
...
pkg/volume/vsphere_volume/vsphere_volume.go
View file @
bccc8fe9
...
...
@@ -348,7 +348,7 @@ func (plugin *vsphereVolumePlugin) newProvisionerInternal(options volume.VolumeO
},
nil
}
func
(
v
*
vsphereVolumeProvisioner
)
Provision
()
(
*
v1
.
PersistentVolume
,
error
)
{
func
(
v
*
vsphereVolumeProvisioner
)
Provision
(
selectedNode
*
v1
.
Node
,
allowedTopologies
[]
v1
.
TopologySelectorTerm
)
(
*
v1
.
PersistentVolume
,
error
)
{
if
!
util
.
AccessModesContainedInAll
(
v
.
plugin
.
GetAccessModes
(),
v
.
options
.
PVC
.
Spec
.
AccessModes
)
{
return
nil
,
fmt
.
Errorf
(
"invalid AccessModes %v: only AccessModes %v are supported"
,
v
.
options
.
PVC
.
Spec
.
AccessModes
,
v
.
plugin
.
GetAccessModes
())
}
...
...
pkg/volume/vsphere_volume/vsphere_volume_test.go
View file @
bccc8fe9
...
...
@@ -156,7 +156,7 @@ func TestPlugin(t *testing.T) {
if
err
!=
nil
{
t
.
Errorf
(
"newProvisionerInternal() failed: %v"
,
err
)
}
persistentSpec
,
err
:=
provisioner
.
Provision
()
persistentSpec
,
err
:=
provisioner
.
Provision
(
nil
,
nil
)
if
err
!=
nil
{
t
.
Errorf
(
"Provision() failed: %v"
,
err
)
}
...
...
test/integration/scheduler/volume_binding_test.go
View file @
bccc8fe9
...
...
@@ -384,6 +384,7 @@ func setupCluster(t *testing.T, nsName string, numberOfNodes int) *testConfig {
ClaimInformer
:
informers
.
Core
()
.
V1
()
.
PersistentVolumeClaims
(),
ClassInformer
:
informers
.
Storage
()
.
V1
()
.
StorageClasses
(),
PodInformer
:
informers
.
Core
()
.
V1
()
.
Pods
(),
NodeInformer
:
informers
.
Core
()
.
V1
()
.
Nodes
(),
EnableDynamicProvisioning
:
true
,
}
ctrl
,
err
:=
persistentvolume
.
NewController
(
params
)
...
...
test/integration/volume/persistent_volumes_test.go
View file @
bccc8fe9
...
...
@@ -1136,6 +1136,7 @@ func createClients(ns *v1.Namespace, t *testing.T, s *httptest.Server, syncPerio
ClaimInformer
:
informers
.
Core
()
.
V1
()
.
PersistentVolumeClaims
(),
ClassInformer
:
informers
.
Storage
()
.
V1
()
.
StorageClasses
(),
PodInformer
:
informers
.
Core
()
.
V1
()
.
Pods
(),
NodeInformer
:
informers
.
Core
()
.
V1
()
.
Nodes
(),
EnableDynamicProvisioning
:
true
,
})
if
err
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment