Skip to content

Commit e716505

Browse files
openshift-merge-robotopenshift-merge-robot
authored
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
2 parents 2ee1145 + 8d7842c commit e716505

File tree

3 files changed

+40
-27
lines changed

3 files changed

+40
-27
lines changed

‎vendor/k8s.io/kubernetes/pkg/volume/flexvolume/driver-call.go

Lines changed: 27 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/volume/flexvolume/mounter-defaults.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/volume/flexvolume/plugin.go

Lines changed: 12 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)