Skip to content

fix rbd test #2

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

Closed
rootfs wants to merge 6 commits into from
Closed

fix rbd test #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af28bf0
UPSTREAM: 35022: Remove PV annotations for Gluster provisioner
rootfs Oct 19, 2016
8bbb411
UPSTREAM: 35141: remove pv annotation from rbd volume
jsafrane Oct 20, 2016
3f3d2cf
UPSTREAM: 34705: Make use of PVC namespace when provisioning gluster …
jsafrane Oct 20, 2016
b1f8563
Enable PV controller to provisiong Gluster volumes
jsafrane Oct 20, 2016
4188907
Enable Gluster and RBD provisioners
jsafrane Oct 20, 2016
f267a37
fix rbd test
rootfs Oct 20, 2016
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
8 changes: 7 additions & 1 deletion pkg/cmd/server/bootstrappolicy/infra_sa_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,11 +583,17 @@ func init() {
Resources: sets.NewString("events"),
},
// PersistentVolumeBinder.findProvisionablePlugin()
// Glusterfs provisioner
{
APIGroups: []string{storage.GroupName},
Verbs: sets.NewString("list", "watch"),
Verbs: sets.NewString("list", "watch", "get"),
Resources: sets.NewString("storageclasses"),
},
// Gluster provisioner
{
Verbs: sets.NewString("get", "create", "delete"),
Resources: sets.NewString("services", "endpoints"),
},
},
},
)
Expand Down
4 changes: 4 additions & 0 deletions pkg/cmd/server/kubernetes/master.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@ import (
"k8s.io/kubernetes/pkg/volume/cinder"
"k8s.io/kubernetes/pkg/volume/flexvolume"
"k8s.io/kubernetes/pkg/volume/gce_pd"
"k8s.io/kubernetes/pkg/volume/glusterfs"
"k8s.io/kubernetes/pkg/volume/host_path"
"k8s.io/kubernetes/pkg/volume/nfs"
"k8s.io/kubernetes/pkg/volume/rbd"
"k8s.io/kubernetes/pkg/volume/vsphere_volume"

"k8s.io/kubernetes/plugin/pkg/scheduler"
Expand Down Expand Up @@ -262,6 +264,8 @@ func probeRecyclableVolumePlugins(config componentconfig.VolumeConfiguration, na
allPlugins = append(allPlugins, cinder.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, flexvolume.ProbeVolumePlugins(config.FlexVolumePluginDir)...)
allPlugins = append(allPlugins, vsphere_volume.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, glusterfs.ProbeVolumePlugins()...)
allPlugins = append(allPlugins, rbd.ProbeVolumePlugins()...)

return allPlugins
}
Expand Down
12 changes: 12 additions & 0 deletions test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3036,6 +3036,8 @@ items:
verbs:
- list
- watch
- get

- apiVersion: v1
kind: ClusterRole
metadata:
Expand Down Expand Up @@ -3090,6 +3092,16 @@ items:
- persistentvolumeclaims/status
verbs:
- update
- apiGroups:
- ""
attributeRestrictions: null
resources:
- services
- endpoints
verbs:
- create
- delete
- get
- apiVersion: v1
kind: ClusterRole
metadata:
Expand Down
51 changes: 42 additions & 9 deletions ...8s.io/kubernetes/examples/experimental/persistent-volume-provisioning/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .../k8s.io/kubernetes/examples/experimental/persistent-volume-provisioning/glusterfs-dp.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/framework_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions ...ler/volume/persistentvolume/controller.go → .../volume/persistentvolume/pv_controller.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...olume/persistentvolume/controller_base.go → ...me/persistentvolume/pv_controller_base.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...olume/persistentvolume/controller_test.go → ...me/persistentvolume/pv_controller_test.go
View file
Open in desktop
File renamed without changes.
9 changes: 5 additions & 4 deletions vendor/k8s.io/kubernetes/pkg/volume/aws_ebs/aws_ebs.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions vendor/k8s.io/kubernetes/pkg/volume/aws_ebs/aws_ebs_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions vendor/k8s.io/kubernetes/pkg/volume/aws_ebs/aws_util.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions vendor/k8s.io/kubernetes/pkg/volume/cinder/cinder.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions vendor/k8s.io/kubernetes/pkg/volume/cinder/cinder_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions vendor/k8s.io/kubernetes/pkg/volume/cinder/cinder_util.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading