v1.8 backports 2021-09-14 #17388

kaworu · 2021-09-14T13:09:53Z

vendor: update mongo-driver to 1.5.1 to fix CVE-2021-20329 #17234 -- vendor: update mongo-driver to 1.5.1 to fix CVE-2021-20329 (@aanm) ✔️
Istio: Update to 1.6.14 #14271 (@jrajahalme) ✔️
istio: Update to 1.7.6 #14621 (@jrajahalme) ✔️
istio: Update to 1.8.2 #14704 (@jrajahalme) ✔️
istio: Update to release 1.10.4 #17275 -- istio: Update to release 1.10.4 (@jrajahalme) ✔️
test: Skip Istio test on k8s <1.17 #17445 (@jrajahalme) ✔️
jenkinsfiles: Don't display nulls in current build display name #17258 -- jenkinsfiles: Don't display nulls in current build display name (@twpayne) ✔️

Partially backported:

test: Update docker image references #12579 -- only cherry-picked a197641(@jrajahalme) ✔️

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

$ for pr in 17234 14271 14621 14704 17275 17445 17258; do contrib/backporting/set-labels.py $pr done 1.8; done

kaworu · 2021-09-14T13:11:47Z

@aanm @jrajahalme had to resolve some conflicts on your patches, please take a look.

twpayne

My changes ✅

kaworu · 2021-09-16T11:30:11Z

smoke test failure is legit:

# github.com/onsi/gomega/matchers
go/src/github.com/onsi/gomega/matchers/have_http_body_matcher.go:84:30: undefined: io.ReadAll
go/src/github.com/onsi/gomega/matchers/have_http_status_matcher.go:81:16: undefined: io.ReadAll
# github.com/onsi/gomega/gmeasure
go/src/github.com/onsi/gomega/gmeasure/cache.go:69:18: undefined: os.ReadDir
go/src/github.com/onsi/gomega/gmeasure/cache.go:90:18: undefined: os.ReadDir

Both io.ReadAll and os.ReadDir were added in Go v1.16 but we use Go v1.14 in Cilium v1.8.

kaworu · 2021-09-16T11:33:45Z

Rebased the PR on top of our v1.8 branch to include this commit from @joestringer who's already looked and fixed the gomega/Golang version compatibility issue mentionned above.

kaworu · 2021-09-16T12:12:45Z

test-backport-1.8

maintainer-s-little-helper · 2021-09-16T14:33:09Z

Job 'Cilium-PR-K8s-1.18-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: unable to download https://github.com/cilium/istio/releases/download/1.10.4/cilium-istioctl-1.10.4-linux.tar.gz

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

maintainer-s-little-helper · 2021-09-16T15:01:29Z

Job 'Cilium-PR-K8s-1.17-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: unable to download https://github.com/cilium/istio/releases/download/1.10.4/cilium-istioctl-1.10.4-linux.tar.gz

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

maintainer-s-little-helper · 2021-09-16T15:13:44Z

Job 'Cilium-PR-K8s-1.16-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: unable to download https://github.com/cilium/istio/releases/download/1.10.4/cilium-istioctl-1.10.4-linux.tar.gz

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

maintainer-s-little-helper · 2021-09-16T15:18:25Z

Job 'Cilium-PR-K8s-1.14-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: unable to download https://github.com/cilium/istio/releases/download/1.10.4/cilium-istioctl-1.10.4-linux.tar.gz

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

maintainer-s-little-helper · 2021-09-16T15:31:34Z

Job 'Cilium-PR-K8s-1.15-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: unable to download https://github.com/cilium/istio/releases/download/1.10.4/cilium-istioctl-1.10.4-linux.tar.gz

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

kaworu · 2021-09-16T19:39:27Z

Added #14271 to the backports trying to fix the itsio download failure:

FAIL: unable to download https://github.com/cilium/istio/releases/download/1.10.4/cilium-istioctl-1.10.4-linux.tar.gz

@jrajahalme please take a look.

kaworu · 2021-09-16T19:52:45Z

test-backport-1.8

maintainer-s-little-helper · 2021-09-16T21:51:40Z

Job 'Cilium-PR-K8s-1.14-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: unable to deploy Istio

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

maintainer-s-little-helper · 2021-09-16T22:23:33Z

Job 'Cilium-PR-K8s-1.18-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.001s.

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

maintainer-s-little-helper · 2021-09-16T22:25:31Z

Job 'Cilium-PR-K8s-1.17-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.280s.

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

maintainer-s-little-helper · 2021-09-16T22:30:19Z

Job 'Cilium-PR-K8s-1.16-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.000s.

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

maintainer-s-little-helper · 2021-09-16T22:39:23Z

Job 'Cilium-PR-K8s-1.15-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: unable to deploy Istio

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

kaworu · 2021-09-23T11:21:41Z

@jrajahalme could you take a look at the PR and the CI K8sIstioTest issues please?

[ upstream commit 1695d9c ] Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: Alexandre Perrin <alex@kaworu.ch>

[ upstream commit ae9f5ea ] Istio CI test was quarantined on K8s 1.19 and 1.20 due to `istioctl` using deprecated k8s features and then returning a non-zero exit code due to deprecation warnings from k8s. This release of `istioctl` fixes that so the test can be unquarantined. Signed-off-by: Jarno Rajahalme <jarno@covalent.io> Signed-off-by: Alexandre Perrin <alex@kaworu.ch>

kaworu · 2021-09-27T11:11:52Z

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

kaworu · 2021-09-27T11:15:15Z

test-backport-1.8

Job 'Cilium-PR-K8s-1.17-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.000s.

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

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

Click to show.

Test Name

K8sConformance Portmap Chaining Check connectivity-check compliance with portmap chaining

Failure Output

FAIL: connectivity-check pods are not ready after timeout

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

Job 'Cilium-PR-K8s-1.18-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.301s.

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

kaworu · 2021-09-28T07:42:56Z

Seems like

we don't skip k8s-1.13-kernel-4.9 although this commit should ensure we do,
we have still have an istio test failure on both k8s-1.17-kernel-4.19 and k8s-1.18-kernel-4.19.

jrajahalme · 2021-09-28T07:44:29Z

2. we have still have an istio test failure on both k8s-1.17-kernel-4.19 and k8s-1.18-kernel-4.19.

I'm looking into this. Most likely some older PRs/commits need also be backported as test/k8sT/istio.go is different between this PR and master.

jrajahalme · 2021-09-28T07:52:17Z

At least these are needed in addition to the #14271 you already picked up, and applied right after #14621:

istio: Update to 1.7.6 #14621
istio: Update to 1.8.2 #14704 (1.9 backport may need this as well)

Sorry for missing the backport labels on these!

[ 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>

[ 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>

[ 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>

[ 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>

kaworu · 2021-09-28T15:34:00Z

/test-backport-1.8

Job 'Cilium-PR-K8s-1.17-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.946s.

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

jrajahalme · 2021-10-04T12:15:14Z

@kaworu Istio test now fails on curl:

 	 curl: option --retry-connrefused: is unknown
	 curl: try 'curl --help' or 'curl --manual' for more information
	 command terminated with exit code 2

It appears that v1.8 branch uses older version of the istio bookinfo images, with a version of curl that does not support this option. It would be best to also backport this commit that updated the images:

1d85ce7

Backporting the whole PR (#12579) could be too risky.

[ upstream commit a197641 ] Using these two newer versions allows us to save at least 121MB. The image size of examples-bookinfo-reviews-v1 increased in latest versions, so let's not update it. Latest versions of examples-bookinfo-productpage-v1 do not contain wget, which we need for tests, so we can't update it. Signed-off-by: Paul Chaignon <paul@cilium.io> Signed-off-by: Alexandre Perrin <alex@kaworu.ch>

[ 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 · 2021-10-04T13:55:20Z

/test-backport-1.8

kaworu · 2021-10-07T08:24:42Z

/test-1.15-4.9

kaworu · 2021-10-07T08:24:55Z

/test-upstream-k8s

jrajahalme

Istio backports look OK now :-)

kaworu · 2021-10-07T13:31:08Z

All reviews are in and CI finally passed, marking as ready-to-merge.

kaworu requested a review from a team as a code owner September 14, 2021 13:09

kaworu added backport/1.8 kind/backports This PR provides functionality previously merged into master. labels Sep 14, 2021

kaworu requested review from jrajahalme, aanm and twpayne September 14, 2021 13:12

maintainer-s-little-helper bot assigned aanm, jrajahalme and twpayne Sep 14, 2021

twpayne approved these changes Sep 14, 2021

View reviewed changes

maintainer-s-little-helper bot unassigned twpayne Sep 14, 2021

aanm approved these changes Sep 15, 2021

View reviewed changes

maintainer-s-little-helper bot unassigned aanm Sep 15, 2021

kaworu force-pushed the pr/v1.8-backport-2021-09-14 branch from 5ee99e1 to 99da234 Compare September 16, 2021 11:31

kaworu force-pushed the pr/v1.8-backport-2021-09-14 branch from 99da234 to 9a698e3 Compare September 16, 2021 19:37

aanm and others added 2 commits September 27, 2021 12:54

vendor: update mongo-driver to 1.5.1 to fix CVE-2021-20329

7cd7fa2

[ upstream commit 1695d9c ] Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: Alexandre Perrin <alex@kaworu.ch>

kaworu force-pushed the pr/v1.8-backport-2021-09-14 branch from 9a698e3 to 7130ed6 Compare September 27, 2021 11:08

jrajahalme added 2 commits September 28, 2021 10:17

istio: Update to 1.8.2

d541776

[ 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>

kaworu force-pushed the pr/v1.8-backport-2021-09-14 branch from 7130ed6 to b3a3bef Compare September 28, 2021 08:18

jrajahalme added 2 commits September 28, 2021 10:20

istio: Update to release 1.10.4

bc7b2ee

[ 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>

test: Skip Istio test on k8s <1.17

46c5c98

[ 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>

kaworu force-pushed the pr/v1.8-backport-2021-09-14 branch from b3a3bef to 1803b7f Compare October 4, 2021 12:29

pchaigno and others added 2 commits October 4, 2021 14:31

jenkinsfiles: Don't display nulls in current build display name

1803b7f

[ 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>

jrajahalme approved these changes Oct 7, 2021

View reviewed changes

maintainer-s-little-helper bot unassigned jrajahalme Oct 7, 2021

kaworu added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 7, 2021

errordeveloper merged commit ee0f125 into cilium:v1.8 Oct 7, 2021

kaworu deleted the pr/v1.8-backport-2021-09-14 branch October 8, 2021 06:16

joestringer mentioned this pull request Nov 5, 2021

Prepare for release v1.8.13 #17804

Merged

v1.8 backports 2021-09-14 #17388

v1.8 backports 2021-09-14 #17388

Uh oh!

Conversation

kaworu commented Sep 14, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Partially backported:

Uh oh!

kaworu commented Sep 14, 2021

Uh oh!

twpayne left a comment

Choose a reason for hiding this comment

Uh oh!

kaworu commented Sep 16, 2021

Uh oh!

kaworu commented Sep 16, 2021

Uh oh!

kaworu commented Sep 16, 2021

Uh oh!

maintainer-s-little-helper bot commented Sep 16, 2021

Test Name

Failure Output

Uh oh!

maintainer-s-little-helper bot commented Sep 16, 2021

Test Name

Failure Output

Uh oh!

maintainer-s-little-helper bot commented Sep 16, 2021

Test Name

Failure Output

Uh oh!

maintainer-s-little-helper bot commented Sep 16, 2021

Test Name

Failure Output

Uh oh!

maintainer-s-little-helper bot commented Sep 16, 2021

Test Name

Failure Output

Uh oh!

kaworu commented Sep 16, 2021

Uh oh!

kaworu commented Sep 16, 2021

Uh oh!

maintainer-s-little-helper bot commented Sep 16, 2021

Test Name

Failure Output

Uh oh!

maintainer-s-little-helper bot commented Sep 16, 2021

Test Name

Failure Output

Uh oh!

maintainer-s-little-helper bot commented Sep 16, 2021

Test Name

Failure Output

Uh oh!

maintainer-s-little-helper bot commented Sep 16, 2021

Test Name

Failure Output

Uh oh!

maintainer-s-little-helper bot commented Sep 16, 2021

Test Name

Failure Output

Uh oh!

kaworu commented Sep 23, 2021

Uh oh!

kaworu commented Sep 27, 2021

Uh oh!

kaworu commented Sep 27, 2021 • edited by maintainer-s-little-helper bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Name

Failure Output

Test Name

Failure Output

Test Name

Failure Output

Uh oh!

kaworu commented Sep 28, 2021

Uh oh!

jrajahalme commented Sep 28, 2021

Uh oh!

kaworu commented Sep 14, 2021 •

edited

Loading

kaworu commented Sep 27, 2021 •

edited by maintainer-s-little-helper bot

Loading

jrajahalme commented Sep 28, 2021 •

edited

Loading

kaworu commented Sep 28, 2021 •

edited by maintainer-s-little-helper bot

Loading