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

v1.10 backports 2021-06-16 #16562

Merged
merged 5 commits into from Jun 22, 2021
Merged

v1.10 backports 2021-06-16 #16562

merged 5 commits into from Jun 22, 2021

Conversation

nathanjsweet
Copy link
Member

@nathanjsweet nathanjsweet commented Jun 16, 2021 •
edited by kaworu 

$ for pr in 16426 16487 16535 16537; do contrib/backporting/set-labels.py $pr done 1.10; done

@nathanjsweet nathanjsweet added kind/backports This PR provides functionality previously merged into master. backport/1.10 labels Jun 16, 2021
@nathanjsweet nathanjsweet requested review from a team as code owners June 16, 2021 16:10
@nathanjsweet nathanjsweet requested a review from gandro June 16, 2021 16:11
@nathanjsweet nathanjsweet assigned kaworu and unassigned gandro and pchaigno Jun 16, 2021
pchaigno
pchaigno requested changes Jun 16, 2021
View reviewed changes
Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

One of my PRs needs changes, the other is okay.

CODEOWNERS Outdated Show resolved Hide resolved
joestringer
joestringer requested changes Jun 16, 2021
View reviewed changes
Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

Just one minor issue with the codeowners, otherwise good from @cilium/maintainers perspective.

CODEOWNERS Outdated Show resolved Hide resolved
pchaigno and others added 5 commits June 16, 2021 14:35
@pchaigno @nathanjsweet
CODEOWNERS: Give maintainer's code to github-sec team
e1e8c7b 
[ upstream commit 2fe7c50 ]

The new github-sec team will include more contributors than just the
maintainers, to help scale reviews.

Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
@pchaigno @nathanjsweet
workflows: Skip jobs instead of workflows
67b2f9a 
[ upstream commit b08f700 ]

In its initial version, commit 3ceb742 (".github: Skip unnecessary docs
test") skipped the job instead of the whole workflow, based on changed
code paths. After discussion on the pull request [1], we figured we
could save some seconds by skipping the whole workflow instead of the
job. Skipping the job requires adding a new job to check the code paths.

However, if we skip the whole workflow, the job status is never reported
on GitHub. Since the documentation job is required to merge, that means
maintainer's little helper will never mark the pull request as ready to
merge.

Thus, this commit reverts back to skipping the jobs instead of the whole
workflows. To that end, we use paths-filter GitHub Action instead of the
direct GitHub integration (since the GitHub path filters can only skip
the whole workflow).

1 - #16157 (comment)
Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
@gandro @nathanjsweet
docs: Hubble UI does not show L7 endpoints anymore
dec9047 
[ upstream commit fea1b27 ]

This removes a note in the Hubble getting started guide that recommends
turning on L7 visibility to see what L7 endpoints are being used by
flows. This feature has been removed in Hubble UI 0.7 (Cilium
1.9), making the note obsolete.

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
@kaworu @nathanjsweet
images/script: update the example hubble cli Deployment version
a191fb8 
[ upstream commit 850aaab ]

Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
@kaworu @nathanjsweet
examples: pull the hubble cli image only IfNotPresent
b289b4e 
[ upstream commit 69b2faf ]

Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
@pchaigno
Copy link
Member

test-backport-1.10

@pchaigno
Copy link
Member

pchaigno commented Jun 17, 2021 •
edited

IPsec test is failing in v5.4 due to:

level=fatal msg="Ipsec default interface lookup failed, consider \"encrypt-interface\" to manually configure interface." error="IPv4/IPv6 have different link indices" subsys=daemon

Would need to check if it's already failing for the same reason on the v1.10 branch and what the fix is on master.

kaworu
kaworu approved these changes Jun 17, 2021
View reviewed changes
Copy link
Member

@kaworu kaworu left a comment

Choose a reason for hiding this comment

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

LGTM for my patches, thanks!

@nathanjsweet nathanjsweet added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 21, 2021
@christarazi christarazi merged commit fce8669 into v1.10 Jun 22, 2021
@christarazi christarazi deleted the pr/v1.10-backport-2021-06-16 branch June 22, 2021 04:41
@aanm aanm mentioned this pull request Jul 2, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gandro gandro gandro approved these changes

@kaworu kaworu kaworu approved these changes

@joestringer joestringer joestringer approved these changes

@pchaigno pchaigno pchaigno approved these changes

Assignees
No one assigned
Labels
kind/backports This PR provides functionality previously merged into master. 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.

None yet
6 participants
@nathanjsweet @pchaigno @gandro @kaworu @joestringer @christarazi