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.

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

v1.10 backports 2021-04-28 #15919

Merged
merged 8 commits into from
May 6, 2021

Conversation

christarazi
Copy link
Member

@christarazi christarazi commented Apr 28, 2021

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

$ for pr in 15903 15898 15895 15894 15760 15697 15947; do contrib/backporting/set-labels.py $pr done 1.10; done

@christarazi christarazi requested review from a team as code owners April 28, 2021 18:59
@christarazi christarazi added backport/1.10 kind/backports This PR provides functionality previously merged into master. labels Apr 28, 2021
@christarazi christarazi requested a review from rolinh April 28, 2021 18:59
@christarazi christarazi temporarily deployed to release-base-images April 28, 2021 18:59 Inactive
@christarazi christarazi temporarily deployed to release-base-images April 28, 2021 18:59 Inactive
@christarazi
Copy link
Member Author

test-backport-1.10

@rolinh rolinh removed their assignment Apr 28, 2021
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.

looks good for my commits

Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

Commits from me look fine 👍

Looks like the upgrade tests fail, this may be the first PR on the v1.10 branch to run through CI so maybe we just missed something while branching:

https://jenkins.cilium.io/job/Cilium-PR-K8s-1.19-kernel-4.9/1649/testReport/Suite-k8s-1/19/K8sUpdates_Tests_upgrade_and_downgrade_from_a_Cilium_stable_image_to_master/

/home/jenkins/workspace/Cilium-PR-K8s-1.19-kernel-4.9/src/github.com/cilium/cilium/test/ginkgo-ext/scopes.go:518
Cilium image didn't update correctly
Expected
    <string>: sha256:e931dc19369a5e0a3273b36407ba97fbc9379c2fc2c19eac78932e5658668a4d
to contain substring
    <string>: 6426432f93cb717b5f39f92fabc77ada2a2b0b86
/home/jenkins/workspace/Cilium-PR-K8s-1.19-kernel-4.9/src/github.com/cilium/cilium/test/k8sT/Updates.go:478

Looks like something in the test is hardcoding expectations around Cilium docker image digests.

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.

my commit looks good 👍

joestringer and others added 7 commits May 5, 2021 21:53
[ upstream commit 6fcdb29 ]

Reuse the logic from the backporting cherrypick commit for determining
that the commit is upstream before tagging and pushing the tags for
release preparation. This should catch errors where the tagged release
version is not a commit in the branch where the release is made.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit a5f6fbb ]

v1.10 is the first release we did with so many digits, which helped us
find all sorts of fun limitations in our scripts; fix them up.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit 5669f97 ]

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit 47587d3 ]

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit 7f1b1c4 ]

This commit adds multi-arch docker images. Now, users can run the
connectivity check in their multi-arch clusters.

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit beb467f ]

Description:
Issue: It states that 429 response code is not honored inside cilium.
What is 429 response?
This 429 response code is returned by the server when there are Too many requests in a given time frame
Root cause:: We observed that cilium is not handling the 429 response code when multiple pods are created at the same time.
Fix: We have introduced a change for the support of handling 429 response code in the openapi.yaml.

Fixes: cilium#14922

Signed-off-by: Maddy007-maha <mahadev.panchal@accuknox.com>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit efb3a72 ]

This adds support for device name wildcards to the "--devices"
option, e.g. if user specifies "--devices=eth+,en+" the agent
will match devices eth0, eth1, en0, etc.

Fixes: cilium#15693

Signed-off-by: Jussi Maki <jussi@isovalent.com>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
@christarazi christarazi force-pushed the pr/v1.10-backport-2021-04-28 branch from 6426432 to 050a01c Compare May 6, 2021 04:53
@christarazi christarazi requested a review from a team as a code owner May 6, 2021 04:53
@christarazi
Copy link
Member Author

christarazi commented May 6, 2021

Waiting on #15947 to be merged, then I'll pull it in and it should unblock v1.10 CI.

Edit: It's been added

[ upstream commit 1ac77fc ]

CI runs don't need to use image digests, as there's no real benefit.
Additionally, the CI infrastructure is not set up to properly parse the
digests from the image tag, which causes the upgrade test
(test/k8sT/Updates.go).

Signed-off-by: Chris Tarazi <chris@isovalent.com>
@christarazi
Copy link
Member Author

christarazi commented May 6, 2021

test-backport-1.10

Edit: net-next hit #12511

@christarazi
Copy link
Member Author

Marking as ready to merge as CI has passed (despite GH wonky UI display of jobs not started--they have) and we have author sign-offs.

@christarazi christarazi added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 6, 2021
@joestringer joestringer merged commit 7ac45f4 into cilium:v1.10 May 6, 2021
@christarazi christarazi deleted the pr/v1.10-backport-2021-04-28 branch May 7, 2021 05:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

CI: v1.10 K8sUpdates Tests upgrade and downgrade from a Cilium stable image to master
6 participants