Skip to content

Commit 0148eef

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #16299 from mtanino/pr-50334
Automatic merge from submit-queue (batch tested with PRs 16226, 16377, 15766, 16299, 16153) UPSTREAM: 50334: Support iscsi volume attach and detach Fixes: kubernetes/kubernetes#50334 /cc @rootfs @humblec @childsb @eparis
2 parents e7ae92c + c228eab commit 0148eef

File tree

21 files changed

+279
-52
lines changed

21 files changed

+279
-52
lines changed

‎vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/BUILD

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

‎vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/plugins.go

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

‎vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/testing/testvolumespec.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/aws_ebs/attacher.go

Lines changed: 2 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/azure_dd/attacher.go

Lines changed: 2 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/cinder/attacher.go

Lines changed: 2 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/fc/attacher.go

Lines changed: 2 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/attacher.go

Lines changed: 2 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/attacher_test.go

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

‎vendor/k8s.io/kubernetes/pkg/volume/gce_pd/attacher.go

Lines changed: 2 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/iscsi/BUILD

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

‎vendor/k8s.io/kubernetes/pkg/volume/iscsi/attacher.go

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

0 commit comments

Comments
 (0)