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.9 backports 2021-02-24 #15104

Merged
merged 6 commits into from
Mar 4, 2021
Merged

v1.9 backports 2021-02-24 #15104

merged 6 commits into from
Mar 4, 2021

Conversation

twpayne
Copy link
Contributor

@twpayne twpayne commented Feb 25, 2021 •
edited by aditighag
Loading

Once this PR is merged, you can update the PR labels via:

$ for pr in 14993 14951 14943; do contrib/backporting/set-labels.py $pr done 1.9; done

@twpayne twpayne added the kind/backports This PR provides functionality previously merged into master. label Feb 25, 2021
@twpayne twpayne requested a review from a team as a code owner February 25, 2021 09:46
@twpayne twpayne mentioned this pull request Feb 25, 2021
Closed
@aanm aanm marked this pull request as draft February 25, 2021 14:19
@aditighag aditighag marked this pull request as ready for review February 25, 2021 17:31
@aditighag
Copy link
Member

test-backport-1.9

@aditighag
Copy link
Member

@twpayne Let me know if you want me to update the commit description -

 * #14993 -- Move Azure IPAM out of beta (@tgraf)
 * #14951 -- kpr: Make it possible to run bpf_sock on Kind (@brb)
 * #14943 -- helm: Fix and add missing podLabels (@Subreptivus)

Once this PR is merged, you can update the PR labels via:
```upstream-prs
$ for pr in 14993 14951 14943; do contrib/backporting/set-labels.py $pr done 1.9; done

@aditighag
Copy link
Member

aditighag commented Feb 25, 2021 •
edited
Loading

@twpayne I've updated the commit description. Can you also backport the missed commit from 3rd change? Here is the relevant comment - #15101 (comment)

@twpayne
Copy link
Contributor Author

twpayne commented Feb 25, 2021

Can you also backport the missed commit from 3rd change?

Done. I cherry picked it onto this branch.

@aditighag aditighag changed the title v1.9 backports 2021-02-24 (draft) v1.9 backports 2021-02-24 Feb 25, 2021
@twpayne
Copy link
Contributor Author

twpayne commented Mar 1, 2021

Closing this as we didn't get it merged in time.

@twpayne twpayne closed this Mar 1, 2021
@twpayne twpayne reopened this Mar 1, 2021
@aditighag
Copy link
Member

test-backport-1.9

@twpayne
Copy link
Contributor Author

twpayne commented Mar 2, 2021

test-missed-k8s

@twpayne
Copy link
Contributor Author

twpayne commented Mar 2, 2021

test-gke

@twpayne
Copy link
Contributor Author

twpayne commented Mar 2, 2021

test-1.13-4.9

@nebril
Copy link
Member

nebril commented Mar 2, 2021

test-1.19-4.9

@twpayne
Copy link
Contributor Author

twpayne commented Mar 2, 2021

CI failures are being investigated in #15169.

tgraf and others added 6 commits March 3, 2021 12:28
@tgraf @twpayne
doc: Move Azure IPAM out of beta
06520d8 
[ upstream commit 5192495 ]

Mark the Azure IPAM mode as the preferred way to install on AKS and
Azure. This also allows to simplify the inlining of all Azure related
docs.

Signed-off-by: Thomas Graf <thomas@cilium.io>
Signed-off-by: Aditi Ghag <aditi@cilium.io>
@brb @twpayne
cgroups: Determine cgroup v2 hierarchy root for Kind
678809a 
[ upstream commit e9ce830 ]

When running on Kind, multiple cilium-agent instances running on the
same host will try to attach to the same cgroup v2 root bpf_sock
programs. As the LB BPF maps cannot be shared among them, in-cluster LB
won't work.

To fix this, we try to derive a cgroup v2 sub-hierarchy from a cilium-agent
process cgroup v2. This guarantees, that each bpf_sock will be attached
to a different cgroup.

The net_cls and net_prio discrepancy when running with cgroup v2 was
spotted by Daniel Borkmann.

Signed-off-by: Martynas Pumputis <m@lambda.lt>
Signed-off-by: Aditi Ghag <aditi@cilium.io>
@brb @twpayne
docs: Add note about running kpr on Kind
49dda55 
[ upstream commit 1c40e0a ]

Signed-off-by: Martynas Pumputis <m@lambda.lt>
Signed-off-by: Aditi Ghag <aditi@cilium.io>
@Subreptivus @twpayne
helm: Fix and add missing podLabels
8604b36 
[ upstream commit 040bed0 ]

Signed-off-by: Yurii Komar <IKOM@equinor.com>
Signed-off-by: Aditi Ghag <aditi@cilium.io>
@Subreptivus @twpayne
Update generated README for Helm values
0ddb1d4 
[ upstream commit c082f4d ]

Signed-off-by: Yurii Komar <IKOM@equinor.com>
Signed-off-by: Aditi Ghag <aditi@cilium.io>
@Subreptivus @twpayne
Removed empty comment line from podLabels/Annotations
73b5c90 
Signed-off-by: Yurii Komar <IKOM@equinor.com>
@twpayne
Copy link
Contributor Author

twpayne commented Mar 3, 2021

test-backport-1.9

@twpayne twpayne added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 3, 2021
@aanm aanm removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 4, 2021
@twpayne
Copy link
Contributor Author

twpayne commented Mar 4, 2021

The failing test (test-1.17-4.9) is the same as this.

@twpayne twpayne added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 4, 2021
@joestringer joestringer merged commit 7434806 into cilium:v1.9 Mar 4, 2021
@christarazi christarazi mentioned this pull request Mar 10, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
8 participants
@twpayne @aditighag @nebril @joestringer @aanm @tgraf @brb @Subreptivus