Skip to content

v1.6 backports 2020-08-06 #12799

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
Merged
merged 3 commits into from
Aug 6, 2020
Merged

v1.6 backports 2020-08-06 #12799

merged 3 commits into from
Aug 6, 2020

Conversation

rolinh
Copy link
Member

@rolinh rolinh commented Aug 6, 2020

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

$ for pr in 12766 12783; do contrib/backporting/set-labels.py $pr done 1.6; done

@qmonnet There was a conflict for #12766.
@aanm There were multiple conflicts for #12783, PTAL.

@qmonnet @rolinh
doc: update #ebpf Slack channel name
ed3af67 
[ upstream commit 0547ea4 ]

The Slack channel dedicated to discussions on eBPF and datapath has been
renamed from #bpf to #eBPF (on 2020-08-03). Report this change to
Cilium's documentation, and also turn "BPF" into "eBPF" on the updated
page.

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
@rolinh rolinh added kind/backports This PR provides functionality previously merged into master. backport/1.6 labels Aug 6, 2020
@rolinh rolinh requested a review from a team as a code owner August 6, 2020 11:18
@rolinh rolinh requested review from qmonnet and aanm August 6, 2020 11:19
aanm
aanm requested changes Aug 6, 2020
View reviewed changes
Copy link
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

@rolinh The changes from Documentation/concepts/kubernetes/compatibility.rst should go to Documentation/kubernetes/compatibility.rst

@rolinh rolinh force-pushed the pr/v1.6-backport-2020-08-06 branch from 069b2bf to 0aada2b Compare August 6, 2020 11:44
@rolinh rolinh requested a review from aanm August 6, 2020 11:44
@tklauser
Copy link
Member

tklauser commented Aug 6, 2020

test-docs-please

aanm added 2 commits August 6, 2020 14:12
@aanm @rolinh
docs: add current k8s network policy limitations
84a5f63 
[ upstream commit c767682 ]

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
@aanm @rolinh
docs: clarify Kubernetes compatibility with Cilium
7971223 
[ upstream commit 038877c ]

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
@rolinh rolinh force-pushed the pr/v1.6-backport-2020-08-06 branch from 0aada2b to 7971223 Compare August 6, 2020 12:13
@rolinh
Copy link
Member Author

rolinh commented Aug 6, 2020

test-docs-please

qmonnet
qmonnet approved these changes Aug 6, 2020
View reviewed changes
Copy link
Member

@qmonnet qmonnet left a comment

Choose a reason for hiding this comment

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

#12766 -- doc: update #ebpf Slack channel name (@qmonnet)

Looks good, thanks! And good idea to update the meeting date as well.

@rolinh rolinh added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Aug 6, 2020
@rolinh
Copy link
Member Author

rolinh commented Aug 6, 2020

Marking as ready to merge as there are only documentation changes and the doc tests passed.

@tklauser tklauser merged commit 599b49c into v1.6 Aug 6, 2020
@tklauser tklauser deleted the pr/v1.6-backport-2020-08-06 branch August 6, 2020 13:05
@joestringer joestringer mentioned this pull request Sep 30, 2020
Merged
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

@aanm aanm aanm approved these changes

@qmonnet qmonnet qmonnet 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.
4 participants
@rolinh @tklauser @aanm @qmonnet