Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.29 into master #266
Conversation
![shiftstack-merge-bot[bot]](https://avatars.githubusercontent.com/u/48560946?s=60&v=4){kind=small}
…nto master
Conflicts:
OWNERS
pkg/openstack/OWNERS
…enshift-4.10-ose-openstack-cloud-controller-manager Updating ose-openstack-cloud-controller-manager images to be consistent with ART
…enshift-4.10-csi-driver-manila Updating csi-driver-manila images to be consistent with ART
…enshift-4.10-ose-openstack-cinder-csi-driver Updating ose-openstack-cinder-csi-driver images to be consistent with ART
Bug 2034537: OWNERS: Update ShiftStack members
…ntainer image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/c78b2b27f47b41d5d59449c863f3dea6eaa988b7/images/ose-openstack-cloud-controller-manager.yml
…penshift-4.16-ose-openstack-cinder-csi-driver OCPBUGS-24944: Updating ose-openstack-cinder-csi-driver-container image to be consistent with ART
…penshift-4.16-ose-openstack-cloud-controller-manager OCPBUGS-24897: Updating ose-openstack-cloud-controller-manager-container image to be consistent with ART
…penshift-4.16-ose-openstack-cinder-csi-driver OCPBUGS-24944: Updating ose-openstack-cinder-csi-driver-container image to be consistent with ART
…penshift-4.16-csi-driver-manila OCPBUGS-25014: Updating csi-driver-manila-container image to be consistent with ART
…penshift-4.16-csi-driver-manila OCPBUGS-25014: Updating csi-driver-manila-container image to be consistent with ART
…penshift-4.16-ose-openstack-cinder-csi-driver OCPBUGS-24944: Updating ose-openstack-cinder-csi-driver-container image to be consistent with ART
NO-JIRA: Add .snyk file
openshift-ci
bot
added
the
needs-ok-to-test
|
Hi @shiftstack-merge-bot[bot]. Thanks for your PR. I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: shiftstack-merge-bot[bot] The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
We may want to manually rebase on top of release-1.29 instead. |
openshift-ci
bot
added
the
do-not-merge/hold
|
We've rebased on upstream stable branch. No longer needed. |
|
@mandre: Closed this PR. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
No description provided.