Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge changes from v2.4.0-rc.1 #22

Merged
merged 3 commits into from
Oct 21, 2021

Conversation

bertinatto
Copy link
Member

@bertinatto bertinatto commented Oct 19, 2021

  • Bring in changes from v2.4.0-rc.1 tag
  • Restore OpenShift-related configuration
  • Add vendor directory

CC @openshift/storage

@bertinatto
Copy link
Member Author

/hold
For manual testing these changes.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 19, 2021
@openshift-ci
Copy link

openshift-ci bot commented Oct 19, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bertinatto

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 19, 2021
@bertinatto
Copy link
Member Author

/retest

@bertinatto
Copy link
Member Author

/test e2e-vsphere

@jsafrane
Copy link

For the record: diff to upstream tag: kubernetes-sigs/vsphere-csi-driver@v2.4.0-rc.1...bertinatto:rebase-v2.4.0-rc.1

I see quite lot of changes in the driver code, is that expected?

@bertinatto
Copy link
Member Author

For the record: diff to upstream tag: kubernetes-sigs/vsphere-csi-driver@v2.4.0-rc.1...bertinatto:rebase-v2.4.0-rc.1

I see quite lot of changes in the driver code, is that expected?

Your link above is comparing the changes made in rebase-v2.4.0-rc.1 since the most recent commit that's shared between these 2 refs (which is 4981393 [git merge-base v2.4.0-rc.1 rebase-v2.4.0-rc.1] from Feb, by the way).

Since our fork contains duplicate commits, a better way would be to compare the code differences between the last snapshots from both refs (with 2 or no dots):

https://github.com/kubernetes-sigs/vsphere-csi-driver/compare/v2.4.0-rc.1..bertinatto:rebase-v2.4.0-rc.1

Or:

$ git diff v2.4.0-rc.1..rebase-v2.4.0-rc.1 --stat
.ci-operator.yaml                                  |      4 +
.gitignore                                         |      6 -
Dockerfile.openshift                               |     14 +
Dockerfile.syncer.openshift                        |     20 +
Makefile                                           |     15 +-
OWNERS                                             |     25 +-
OWNERS_ALIASES                                     |      7 +
go.sum                                             |      2 -
vendor/github.com/Azure/go-ansiterm/LICENSE        |     21 +
vendor/(...)
5995 files changed, 2102938 insertions(+), 37 deletions(-)

@gnufied
Copy link
Member

gnufied commented Oct 21, 2021

This looks good to me. The commits are same as last diff - kubernetes-sigs/vsphere-csi-driver@v2.3.0-rc.3...bertinatto:rebase-v2.3.0-rc.3

@gnufied
Copy link
Member

gnufied commented Oct 21, 2021

/lgtm

@jsafrane
Copy link

You're right, the changes look OK

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 21, 2021
@bertinatto
Copy link
Member Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 21, 2021
@openshift-merge-robot openshift-merge-robot merged commit d8b93f4 into openshift:master Oct 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants