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.

Sign up for GitHub

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

Jump to bottom

internal/utils: fix parsing of user versions which include image path suffix #694

Merged
merged 1 commit into from
Jan 28, 2022
Merged

internal/utils: fix parsing of user versions which include image path suffix #694

merged 1 commit into from
Jan 28, 2022

Conversation

twpayne
Copy link
Contributor

@twpayne twpayne commented Jan 28, 2022

Fixes #692.

Signed-off-by: Tom Payne [email protected]

@twpayne twpayne requested a review from tklauser January 28, 2022 12:00
@twpayne twpayne requested a review from a team as a code owner January 28, 2022 12:00
@twpayne twpayne temporarily deployed to ci January 28, 2022 12:00 Inactive
@twpayne twpayne mentioned this pull request Jan 28, 2022
Closed
2 tasks
@twpayne
Copy link
Contributor Author

twpayne commented Jan 28, 2022

Oops, the code already parsed such versions correctly. The bug is elsewhere. Reverting to draft.

@twpayne twpayne marked this pull request as draft January 28, 2022 12:18
@twpayne twpayne temporarily deployed to ci January 28, 2022 12:18 Inactive
@tklauser tklauser mentioned this pull request Jan 28, 2022
Closed
@twpayne twpayne temporarily deployed to ci January 28, 2022 13:43 Inactive
@twpayne twpayne marked this pull request as ready for review January 28, 2022 13:43
@twpayne twpayne requested a review from a team January 28, 2022 13:43
@twpayne
Copy link
Contributor Author

twpayne commented Jan 28, 2022

OK, should be actually fixed now 🙈 Ready for review.

@twpayne twpayne temporarily deployed to ci January 28, 2022 13:46 Inactive
tklauser
tklauser reviewed Jan 28, 2022
View reviewed changes
hubble/relay.go Outdated Show resolved Hide resolved
@twpayne twpayne requested a review from a team as a code owner January 28, 2022 14:51
@twpayne twpayne temporarily deployed to ci January 28, 2022 14:51 Inactive
tklauser
tklauser reviewed Jan 28, 2022
View reviewed changes
hubble/relay_test.go Outdated Show resolved Hide resolved
@maintainer-s-little-helper
Copy link

Commit 4d3fb8f does not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper
Copy link

Commit 4d3fb8f does not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@twpayne twpayne temporarily deployed to ci January 28, 2022 16:19 Inactive
@twpayne
Copy link
Contributor Author

twpayne commented Jan 28, 2022

Commit 4d3fb8f does not contain "Signed-off-by".

It did, but just not as the last line of the commit (I added @tklauser as co-author). Fixed now.

tklauser
tklauser approved these changes Jan 28, 2022
View reviewed changes
Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

LGTM, thanks Tom!

I've also tested cilium built from this PR with the instructions in https://github.com/cilium/cilium-service-mesh-beta/blob/main/INSTALLATION.md and it worked as expected.

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jan 28, 2022
@tklauser tklauser merged commit 79e9ae2 into cilium:master Jan 28, 2022
@twpayne twpayne deleted the pr/twpayne/fix-692 branch January 28, 2022 21:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tklauser tklauser tklauser approved these changes

Assignees
No one assigned
Labels
ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Cli 0.10.1 breaks the parsing for specific images.
2 participants
@twpayne @tklauser