-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Enable Portworx Storage Driver #15862
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
Conversation
Hi @adityadani. 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 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. I understand the commands that are listed here. |
@deads2k I have modified the vendor'ed directories used by Portworx plugin to remove the "duplicate proto registered" error. |
@@ -7,7 +7,7 @@ package api | |||
import proto "github.com/golang/protobuf/proto" | |||
import fmt "fmt" | |||
import math "math" | |||
import google_protobuf "go.pedge.io/pb/go/google/protobuf" | |||
import google_protobuf "github.com/golang/protobuf/ptypes/timestamp" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@smarterclayton this is a carry and I don't know what it does. Do you?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Previously there were two different protobuf versions being used. I updated this vendor'ed code used by portworx to use the same protobuf version which others are using in openshift. Now we won't get the duplicate proto error.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Previously there were two different protobuf versions being used. I updated this vendor'ed code used by portworx to use the same protobuf version which others are using in openshift. Now we won't get the duplicate proto error.
Oh, ok. Then this isn't a carry. <carry>
is a commit that updates code in a way that the upstream project rejected (or would reject if you know the project very well). What you have done is a bump
. You should combine the code change the godep.json change into a single commit with a name like bump(github.com/libopenstorage/openstorage): a53f5e5662367da02b95470980c5dbaadfe96c99
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
commit with a name like bump(github.com/libopenstorage/openstorage): a53f5e5662367da02b95470980c5dbaadfe96c99
We use that format to be able to find when we picked up particular levels to find particular patches. A couple scripts rely on it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have updated the commits.
@@ -2535,27 +2535,27 @@ | |||
}, | |||
{ | |||
"ImportPath": "github.com/libopenstorage/openstorage/api", | |||
"Rev": "6e787003b91ddba85f108b8aede075b1af0d3606" | |||
"Rev": "a53f5e5662367da02b95470980c5dbaadfe96c99" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did this bump if you have made a carry commit? Did something else change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I might have understood the meaning of "carry" differently.
I updated this vendor'ed file to that particular commit. Should the commit message then be different?
@deads2k @smarterclayton Can you enable tests on this PR ? |
/ok-to-test |
Thanks /lgtm |
/retest Please review the full test history for this PR and help us cut down flakes. |
job died. I'm going to cancel the rest to free the queue and retest |
/retest |
1 similar comment
/retest |
The extended _conformance_install_update failed with this error : |
/retest Please review the full test history for this PR and help us cut down flakes. |
it is :( . We're battling a few flakes at the moment. Looks like the bot got you sorted. |
/retest Please review the full test history for this PR and help us cut down flakes. |
@deads2k I had to rebase my changes to fix some conflicts. Can you add the lgtm back? Also the flaky test failed again in the previous run. |
…oid double proto registration" This reverts commit dcb5eef.
/retest |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: adityadani, deads2k The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
bumping queue priority since its getting stuck in rebases. |
/retest |
/test all [submit-queue is verifying that this PR is safe to merge] |
@adityadani: The following tests failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. 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. I understand the commands that are listed here. |
Automatic merge from submit-queue (batch tested with PRs 15862, 15781, 15944) |
This change