Skip to content

v1.9 backports 2021-09-14 #17390

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

v1.9 backports 2021-09-14 #17390

merged 11 commits into from
Oct 2, 2021

Conversation

kaworu
Copy link
Member

@kaworu kaworu commented Sep 14, 2021 •
edited
Loading

@kaworu kaworu requested a review from a team as a code owner September 14, 2021 13:52
@kaworu kaworu added backport/1.9 kind/backports This PR provides functionality previously merged into master. labels Sep 14, 2021
@kaworu kaworu mentioned this pull request Sep 14, 2021
Merged
@kaworu
Copy link
Member Author

kaworu commented Sep 14, 2021

Please take a close look at the patches, there was conflict with almost everyone of them.

@pchaigno @jrajahalme can you also look at the commits from #17115 please? See this discussion for context.

tklauser
tklauser approved these changes Sep 14, 2021
View reviewed changes
Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

#17153 (@tklauser)

LGTM for the PR above.

@kaworu kaworu marked this pull request as draft September 14, 2021 14:58
joamaki
joamaki approved these changes Sep 16, 2021
View reviewed changes
Copy link
Contributor

@joamaki joamaki left a comment

Choose a reason for hiding this comment

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

test/runtime: Look into log errors after test start #17351

LGTM

@kaworu kaworu force-pushed the pr/v1.9-backport-2021-09-14 branch 2 times, most recently from fbd1dcc to d9e17b1 Compare September 16, 2021 19:49
@kaworu kaworu marked this pull request as ready for review September 16, 2021 19:50
twpayne
twpayne approved these changes Sep 20, 2021
View reviewed changes
Copy link
Contributor

@twpayne twpayne left a comment

Choose a reason for hiding this comment

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

jenkinsfiles: Don't display nulls in current build display name #17258 (@twpayne)

LGTM

@christarazi
Copy link
Member

test-backport-1.9

@pchaigno
Copy link
Member

@pchaigno @jrajahalme can you also look at the commits from #17115 please? See this discussion for context.

I'll defer to @jrajahalme as I'm unsure the solution I proposed in that discussion is the right one.

@pchaigno pchaigno removed their request for review September 20, 2021 17:15
@pchaigno pchaigno removed their assignment Sep 20, 2021
@kaworu
Copy link
Member Author

kaworu commented Sep 27, 2021

@jrajahalme added #17445 to the backport, but we previously had failures on k8s >=v1.17 that still need a look.

@kaworu
Copy link
Member Author

kaworu commented Sep 27, 2021 •
edited by maintainer-s-little-helper bot
Loading

test-backport-1.9

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

Click to show.

Test Name

K8sIstioTest Istio Bookinfo Demo Tests bookinfo inter-service connectivity

Failure Output

FAIL: Timed out after 240.430s.

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

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

Click to show.

Test Name

K8sIstioTest Istio Bookinfo Demo Tests bookinfo inter-service connectivity

Failure Output

FAIL: Timed out after 240.001s.

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

jaffcheng
jaffcheng approved these changes Sep 28, 2021
View reviewed changes
Copy link
Contributor

@jaffcheng jaffcheng left a comment

Choose a reason for hiding this comment

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

policy: Fix transient policy deny during agent restart #17115 (@jaffcheng)

LGTM

jrajahalme
jrajahalme approved these changes Sep 28, 2021
View reviewed changes
Copy link
Member

@jrajahalme jrajahalme left a comment

Choose a reason for hiding this comment

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

Istio changes look good :-)

@jrajahalme
Copy link
Member

test-backport-1.9

@jrajahalme
Copy link
Member

Istio changes look good :-)

Maybe spoke too soon, this may still need to be included:

@kaworu kaworu force-pushed the pr/v1.9-backport-2021-09-14 branch from 2c1253c to 22d0726 Compare September 28, 2021 08:07
@kaworu kaworu requested a review from jrajahalme September 28, 2021 08:08
@kaworu
Copy link
Member Author

kaworu commented Sep 28, 2021 •
edited
Loading

[…] this may still need to be included:

* [istio: Update to 1.8.2 #14704](https://github.com/cilium/cilium/pull/14704)

@jrajahalme added #14704 to the backports, please re-review both #14704 #17275 patches as there were conflicts (although trivial).

@jrajahalme
Copy link
Member

This is also needed, even though the backport-done label is already on, must be due to a mistake of mine:

@kaworu kaworu force-pushed the pr/v1.9-backport-2021-09-14 branch from 22d0726 to 13371b6 Compare September 28, 2021 09:02
@jrajahalme @kaworu
istio: Update to 1.7.6
c6f657a 
[ upstream commit 2423a0c ]

Update Istio integration to Istio release 1.7.6.

Istioctl CLI syntax has changed slightly, instead of `cilium-istioctl
manifest apply -y` we now use `cilium-istioctl install -y`.

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
@kaworu
Copy link
Member Author

kaworu commented Sep 28, 2021

This is also needed, even though the backport-done label is already on, must be due to a mistake of mine:

Done

jrajahalme and others added 8 commits September 28, 2021 11:05
@jrajahalme @kaworu
istio: Update to 1.8.2
c4bca2e 
[ upstream commit ee18c90 ]

Update Istio integration to Istio release 1.8.2.

Istioctl no longer lists the service name for an inbound port.

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
@jrajahalme @kaworu
istio: Update to release 1.10.4
f1b4e1b 
[ upstream commit 4c87394 ]

Update Cilium Istio integration to Istio release 1.10.4.

Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
@jrajahalme @kaworu
test: Skip Istio test on k8s <1.17
db67617 
[ upstream commit 3992048 ]

Istio 1.10 requires at least k8s version 1.17.

Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
@joamaki @kaworu
test/runtime: Look into log errors after test start
5c376bd 
[ upstream commit 38994b0 ]

When running runtime tests locally sometimes the test fail as level=error
log entries are found that are the result of cilium-agent restarts during
provisioning.

This is similar to the fix done in cilium#14529.

Signed-off-by: Jussi Maki <jussi@isovalent.com>
Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
@brb @kaworu
datapath: Improve snat_v4_needed() comment
5f79048 
[ upstream commit 55bfba9 ]

Signed-off-by: Martynas Pumputis <m@lambda.lt>
Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
@tklauser @kaworu
vendor: bump golang.org/x/sys to latest version
95f00bb 
[ upstream commit 6418ade ]

This pulls in a few fixes around ioctl wrappers wrt. unsafe.Pointer
usage and fixes ifreqEthtool to be correctly padded.

Ref. golang/sys@e5e7981
Ref. golang/sys@b450225

Signed-off-by: Tobias Klauser <tobias@cilium.io>
Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
@tklauser @kaworu
datapath/linux/ethtool: use IoctlGetEthtoolDrvinfo
0aeba56 
[ upstream commit d82ac6f ]

Use the ioctl wrapper provided in the golang.org/x/sys/unix package with
the correctly padded ifreqData struct, rather than providing our own
wrapper and struct which is incorrectly padded.

Also add a simple unit test and make sure the package is only built on
Linux.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
@twpayne @nbusseneau @kaworu
jenkinsfiles: Don't display nulls in current build display name
13371b6 
[ upstream commit e0da2e4 ]

Signed-off-by: Tom Payne <tom@isovalent.com>
Co-authored-by: Nicolas Busseneau <nicolas@isovalent.com>
Signed-off-by: Alexandre Perrin <alex@kaworu.ch>
@kaworu
Copy link
Member Author

kaworu commented Sep 28, 2021 •
edited by maintainer-s-little-helper bot
Loading

/test-backport-1.9

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

Click to show.

Test Name

K8sDatapathConfig Encapsulation Check connectivity with sockops and VXLAN encapsulation

Failure Output

FAIL: Error creating resource /home/jenkins/workspace/Cilium-PR-K8s-1.17-kernel-5.4/src/github.com/cilium/cilium/test/k8sT/manifests/l3-policy-demo.yaml: Cannot retrieve cilium pod cilium-m6csr policy revision: cannot get revision from json: could not parse JSON from command "kubectl exec -n kube-system cilium-m6csr -- cilium policy get -o json"

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

jrajahalme
jrajahalme approved these changes Sep 28, 2021
View reviewed changes
Copy link
Member

@jrajahalme jrajahalme left a comment

Choose a reason for hiding this comment

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

Istio backports seem complete now! Hoping the test will pass..

@kaworu
Copy link
Member Author

kaworu commented Sep 30, 2021

@pchaigno @nbusseneau seems to me that gke-stable hit flake #12993 and k8s-1.17-kernel-5.4 #16088

@aanm aanm merged commit 543fa8b into cilium:v1.9 Oct 2, 2021
@kaworu kaworu deleted the pr/v1.9-backport-2021-09-14 branch October 4, 2021 07:59
@joestringer joestringer mentioned this pull request Nov 5, 2021
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

@joamaki joamaki joamaki approved these changes

@jrajahalme jrajahalme jrajahalme approved these changes

+2 more reviewers

@twpayne twpayne twpayne approved these changes

@jaffcheng jaffcheng jaffcheng 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.
10 participants
@kaworu @christarazi @pchaigno @jrajahalme @twpayne @tklauser @joamaki @jaffcheng @aanm @brb