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

workflows: fix Relay pgrep check when using additional flags #16831

Merged
merged 1 commit into from Jul 9, 2021

Conversation

nbusseneau
Copy link
Member

@nbusseneau nbusseneau commented Jul 8, 2021

When passing additional flags to cilium hubble port-forward, both the original command and kubectl child process might be conflated with additional flags.

We add wildcards for matching the additional flags.

Fixes 00ae9fb
Follow-up to #16787

@nbusseneau nbusseneau added area/CI Continuous Integration testing issue or flake area/CI-improvement Topic or proposal to improve the Continuous Integration workflow release-note/ci This PR makes changes to the CI. labels Jul 8, 2021
@nbusseneau nbusseneau requested review from a team as code owners July 8, 2021 15:38
@nbusseneau nbusseneau requested a review from tklauser July 8, 2021 15:38
@nbusseneau
Copy link
Member Author

Multicluster test passed: https://github.com/cilium/cilium/actions/runs/1012204661
Removing temp commit.

@nbusseneau nbusseneau force-pushed the pr/workflow-fix-multicluster-relay branch from e2ecaf8 to 9bde742 Compare July 8, 2021 16:10
When passing additional flags to `cilium hubble port-forward`, both the
original command and `kubectl` child process might be conflated with
additional flags.

We add wildcards for matching the additional flags to both `pkill`
cleanups and `pgrep` port-forward success checks.

Fixes 00ae9fb
Follow-up to #16787

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
@nbusseneau nbusseneau force-pushed the pr/workflow-fix-multicluster-relay branch from 9bde742 to c4e66de Compare July 8, 2021 19:51
@nbusseneau nbusseneau added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jul 8, 2021
@kkourt kkourt merged commit 41b821d into master Jul 9, 2021
@kkourt kkourt deleted the pr/workflow-fix-multicluster-relay branch July 9, 2021 09:00
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.10.3 Jul 9, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.10 in 1.10.3 Jul 14, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.10 to Needs backport from master in 1.10.3 Jul 14, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.10 in 1.10.3 Jul 14, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.10 in 1.10.3 Jul 14, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.10 to Backport done to v1.10 in 1.10.3 Jul 15, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.10 to Backport done to v1.10 in 1.10.3 Jul 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/CI Continuous Integration testing issue or flake area/CI-improvement Topic or proposal to improve the Continuous Integration workflow ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/ci This PR makes changes to the CI.
Projects
No open projects
1.10.3
Backport done to v1.10
Development

Successfully merging this pull request may close these issues.

None yet

7 participants