Skip to content

v1.10 backports 2021-10-07 #17557

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 2 commits into from
Oct 11, 2021
Merged

v1.10 backports 2021-10-07 #17557

merged 2 commits into from
Oct 11, 2021

Conversation

christarazi
Copy link
Member

Skipped due to non-trivial backports

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

$ for pr in 17044 17526; do contrib/backporting/set-labels.py $pr done 1.10; done

aanm and others added 2 commits October 7, 2021 09:34
@aanm @christarazi
datapath/linux: enable neighbor discovery in unit tests
71f332a 
[ upstream commit 6e02275 ]

This option should be enabled in unit tests since it is also enabled as
a flag in the agent.

Fixes: cee08cd ("daemon: Make L2 neighbor discovery configurable.")
Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
@brb @christarazi
helm: Expose l2 neigh discovery related agent flags
238e1e3 
[ upstream commit da74607 ]

This commit exposes the following flags:
- "--enable-l2-neigh-discovery" via "l2NeighDiscovery.enabled".
- "--arping-refresh-period" via "l2NeighDiscovery.refreshPeriod".

Signed-off-by: Martynas Pumputis <m@lambda.lt>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
@christarazi christarazi requested a review from a team as a code owner October 7, 2021 16:38
@christarazi christarazi added backport/1.10 kind/backports This PR provides functionality previously merged into master. labels Oct 7, 2021
@christarazi christarazi requested review from aanm and brb October 7, 2021 16:39
@christarazi
Copy link
Member Author

christarazi commented Oct 7, 2021 •
edited
Loading

/test-backport-1.10

Edit: All Jenkins CI runs ran into a strange error, will re-run

stderr: fatal: unable to access 'https://github.com/cilium/cilium/': Failed to connect to github.com port 443: Connection timed out

@christarazi
Copy link
Member Author

christarazi commented Oct 7, 2021 •
edited
Loading

/test-backport-1.10

Job 'Cilium-PR-K8s-GKE' failed and has not been observed before, so may be related to your PR:

Click to show.

Test Name

K8sUpdates Tests upgrade and downgrade from a Cilium stable image to master

Failure Output

FAIL: Cannot curl app1-service

If it is a flake, comment /mlh new-flake Cilium-PR-K8s-GKE so I can create a new GitHub issue to track it.

Job 'Cilium-PR-K8s-1.21-kernel-4.9' failed and has not been observed before, so may be related to your PR:

Click to show.

Test Name

K8sPolicyTest Multi-node policy test with L7 policy using connectivity-check to check datapath

Failure Output

FAIL: cannot install connectivity-check

If it is a flake, comment /mlh new-flake Cilium-PR-K8s-1.21-kernel-4.9 so I can create a new GitHub issue to track it.

Job 'Cilium-PR-K8s-1.16-net-next' failed and has not been observed before, so may be related to your PR:

Click to show.

Test Name

K8sBookInfoDemoTest Bookinfo Demo Tests bookinfo demo

Failure Output

FAIL: DNS entry is not ready after timeout

If it is a flake, comment /mlh new-flake Cilium-PR-K8s-1.16-net-next so I can create a new GitHub issue to track it.

Edit:

brb
brb approved these changes Oct 7, 2021
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.

Thanks!

@christarazi
Copy link
Member Author

/test-upstream-k8s

@christarazi christarazi mentioned this pull request Oct 8, 2021
Open
@christarazi
Copy link
Member Author

christarazi commented Oct 8, 2021 •
edited by maintainer-s-little-helper bot
Loading

/mlh new-flake Cilium-PR-K8s-GKE

👍 created #17558

@christarazi
Copy link
Member Author

/ci-aks-1.10

@borkmann
Copy link
Member

borkmann commented Oct 8, 2021

@christarazi backport for #17513 is at #17559

@joestringer joestringer merged commit 9d1752f into cilium:v1.10 Oct 11, 2021
@christarazi christarazi deleted the pr/v1.10-backport-2021-10-07 branch October 12, 2021 05:22
@joestringer joestringer mentioned this pull request Oct 13, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brb brb brb approved these changes

@aanm aanm aanm approved these changes

+1 more reviewer

@errordeveloper errordeveloper errordeveloper approved these changes

Reviewers whose approvals may not affect merge requirements
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.
6 participants
@christarazi @borkmann @brb @errordeveloper @aanm @joestringer