Merge pull request #16174 from wongma7/flex

Automatic merge from submit-queue (batch tested with PRs 15994, 16182, 16190, 16174) UPSTREAM: 50843: FlexVolume: Add ability to control 'SupportsSELinux' during driver's init phase also includes kubernetes/kubernetes#51342
openshift · Sep 7, 2017 · e716505 · e716505
2 parents 2ee1145 + 8d7842c
commit e716505
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 27 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/flexvolume/driver-call.go b/vendor/k8s.io/kubernetes/pkg/volume/flexvolume/driver-call.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/flexvolume/mounter-defaults.go b/vendor/k8s.io/kubernetes/pkg/volume/flexvolume/mounter-defaults.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/flexvolume/plugin.go b/vendor/k8s.io/kubernetes/pkg/volume/flexvolume/plugin.go