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

Add format type PVC #6

Merged
merged 2 commits into from
Jul 31, 2023
Merged

Conversation

zedi-pramodh
Copy link

With kubevirt eve the storage format for volumes will be of type PVC. So add PVC format to storage.proto

Rest of the files are coming from "make proto"

@uncleDecart
Copy link
Collaborator

Hey @zedi-pramodh could you please split commit into two? One is changing files in proto, the other including all generated files after running make proto?

@zedi-pramodh
Copy link
Author

storage.proto is the only file that changed. Rest all are generated from "make proto"
Sure I can split to different commits if it helps reviewing.

@zedi-pramodh
Copy link
Author

Split the commit as per review comments

Copy link
Collaborator

@uncleDecart uncleDecart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
Thank you for splitting commits @zedi-pramodh ! I wonder if we should specify that PVC is used for Kubernetes or is it common knowledge

@zedi-pramodh
Copy link
Author

Thank you for splitting commits @zedi-pramodh ! I wonder if we should specify that PVC is used for Kubernetes or is it common knowledge

Its a common knowledge, but also the commit message is explicitly saying that.

Copy link
Contributor

@eriknordmark eriknordmark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but conflicts in the generated files.

@zedi-pramodh
Copy link
Author

I have no idea on how these conflicts came and how can I resolve those. I just ran "make proto"

@zedi-pramodh
Copy link
Author

Looks like for every comment line an extra space got added after //

@eriknordmark
Copy link
Contributor

I have no idea on how these conflicts came and how can I resolve those. I just ran "make proto"

Some other PR updated an unrelated proto file.
This is why a separate commit with the generated files makes sense.

This is how I normally resolve these:

  1. git rebase -i upstream/master; mark your second commit with a "drop" (or go a git reset to drop it)
  2. git fetch upstream master
  3. git rebase -i upstream/master; should have no conflicts since you only have one added line in the proto file
  4. make proto; git commit -s, etc

Pramodh Pallapothu added 2 commits July 31, 2023 09:07
With kubevirt eve the storage format for volumes will be of
type PVC. So add PVC format to storage.proto

Signed-off-by: Pramodh Pallapothu <[email protected]>
Signed-off-by: Pramodh Pallapothu <[email protected]>
@zedi-pramodh
Copy link
Author

Updated the commit after rebase to upstream/main.

@eriknordmark eriknordmark merged commit 5115325 into lf-edge:main Jul 31, 2023
2 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants