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.7 backport 2020-10-20 #13656

Merged
merged 1 commit into from
Oct 22, 2020
Merged

v1.7 backport 2020-10-20 #13656

merged 1 commit into from
Oct 22, 2020

Conversation

nathanjsweet
Copy link
Member

@nathanjsweet nathanjsweet commented Oct 21, 2020 •
edited
Loading

v1.7 backports 2020-10-20

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

$ for pr in 13295 ; do contrib/backporting/set-labels.py $pr done 1.7; done

@pchaigno @nathanjsweet
test: Display BPF map content on fail
47bd0b8 
[ upstream commit ec2c18a ]

Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
@nathanjsweet nathanjsweet requested a review from a team as a code owner October 21, 2020 00:54
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.7 kind/backports This PR provides functionality previously merged into master. labels Oct 21, 2020
@nathanjsweet
Copy link
Member Author

I initiated the tests, because I want to see if we can catch the conntrack test bug

@nathanjsweet nathanjsweet changed the title Pr/v1.7 backport 2020-10-20 v1.7 backport 2020-10-20 Oct 21, 2020
@joestringer
Copy link
Member

test-backport-1.7

pchaigno
pchaigno requested changes Oct 21, 2020
View reviewed changes
Documentation/gettingstarted/kubeproxy-free.rst Outdated Show resolved Hide resolved
Documentation/gettingstarted/kubeproxy-free.rst Outdated Show resolved Hide resolved
brb
brb reviewed Oct 21, 2020
View reviewed changes
Copy link
Member

@brb brb left a comment

Choose a reason for hiding this comment

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

Let's drop #13640, as it is causing too many changes being pulled in. The doc change will be available for the v1.8 and v1.9 pages anyway.

pchaigno
pchaigno approved these changes Oct 21, 2020
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.

LGTM! Thanks @nathanjsweet!

@pchaigno
Copy link
Member

test-backport-1.7

1 similar comment
@nathanjsweet
Copy link
Member Author

test-backport-1.7

@ciliumbot
Copy link

Build finished.

@joestringer
Copy link
Member

Cluster setup for upstream tests seems to have failed:

https://jenkins.cilium.io/job/Cilium-PR-Kubernetes-Upstream/2612/execution/node/46/log/

will re-kick.

@joestringer
Copy link
Member

test-upstream-k8s

@joestringer joestringer merged commit 984f7bf into v1.7 Oct 22, 2020
@joestringer joestringer deleted the pr/v1.7-backport-2020-10-20 branch October 22, 2020 23:23
@christarazi christarazi mentioned this pull request Oct 28, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brb brb brb left review comments

@pchaigno pchaigno pchaigno approved these changes

Assignees
No one assigned
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@nathanjsweet @joestringer @pchaigno @ciliumbot @brb