Closed kayrus closed 2 months ago
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: zetaab
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/lgtm
/cherry-pick release-1.29
@kayrus: once the present PR merges, I will cherry-pick it on top of release-1.29 in a new PR and assign it to you.
/cherry-pick release-1.28
@kayrus: once the present PR merges, I will cherry-pick it on top of release-1.28 in a new PR and assign it to you.
@kayrus: #2656 failed to apply on top of branch "release-1.29":
Applying: allow node service to run without openstack client
Using index info to reconstruct a base tree...
M cmd/cinder-csi-plugin/main.go
M docs/cinder-csi-plugin/using-cinder-csi-plugin.md
M pkg/csi/cinder/openstack/openstack.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/csi/cinder/openstack/openstack.go
Auto-merging docs/cinder-csi-plugin/using-cinder-csi-plugin.md
CONFLICT (content): Merge conflict in docs/cinder-csi-plugin/using-cinder-csi-plugin.md
Auto-merging cmd/cinder-csi-plugin/main.go
CONFLICT (content): Merge conflict in cmd/cinder-csi-plugin/main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 allow node service to run without openstack client
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
@kayrus: #2656 failed to apply on top of branch "release-1.28":
Applying: allow node service to run without openstack client
Using index info to reconstruct a base tree...
M cmd/cinder-csi-plugin/main.go
M docs/cinder-csi-plugin/using-cinder-csi-plugin.md
M pkg/csi/cinder/openstack/openstack.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/csi/cinder/openstack/openstack.go
Auto-merging docs/cinder-csi-plugin/using-cinder-csi-plugin.md
CONFLICT (content): Merge conflict in docs/cinder-csi-plugin/using-cinder-csi-plugin.md
Auto-merging cmd/cinder-csi-plugin/main.go
CONFLICT (content): Merge conflict in cmd/cinder-csi-plugin/main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 allow node service to run without openstack client
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
/cherry-pick release-1.29
@kayrus: new pull request created: #2668
What this PR does / why we need it:
This PR allows to run cinder-csi-plugin node service without requiring the openstack credentials.
Which issue this PR fixes(if applicable): fixes #2599 backport of the #2655
Special notes for reviewers:
This PR will be used to make backports to 1.29, 1.28
Release note:
This PR is intended to improve the cinder CSI driver security.