8000 v1.15 Backports 2024-08-12 by jschwinger233 · Pull Request #34299 · cilium/cilium · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

v1.15 Backports 2024-08-12 #34299

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

Merged
merged 3 commits into from
Aug 16, 2024
Merged

Conversation

jschwinger233
Copy link
Member
@jschwinger233 jschwinger233 commented Aug 12, 2024

viktor-kurchenko and others added 2 commits August 12, 2024 15:21
[ upstream commit 7a348ad ]

Conformance multi pool IPAM workflow improved with connectivity
test concurrent run to make it faster.

Signed-off-by: viktor-kurchenko <viktor.kurchenko@isovalent.com>
Signed-off-by: gray <greyschwinger@gmail.com>
[ upstream commit 88e69c4 ]

Readthedocs used to inject configuration into conf.py at build time, but
they're deprecating this functionality in the coming months. In
preparation, we need to make a couple of tweaks to ensure that RTD can
inject configuration options. The following link contains more details:

    https://about.readthedocs.com/blog/2024/07/addons-by-default/

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: gray <greyschwinger@gmail.com>
@jschwinger233 jschwinger233 added kind/backports This PR provides functionality previously merged into master. backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. labels Aug 12, 2024
Copy link
Contributor
@viktor-kurchenko viktor-kurchenko left a comment

Choose a reason for hiding this comment

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

Thanks!

Copy link
Member
@sayboras sayboras left a comment

Choose a reason for hiding this comment

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

Thanks ✔️

@jschwinger233
Copy link
Member Author
jschwinger233 commented Aug 13, 2024

I'll drop #34137 from this backport because it depends on #33698

Please fix the following documentation warnings:
/github/workspace/Documentation/network/servicemesh/ingress-reference.rst:: WARNING: image file not readable: images/ingress-policy.png
/github/workspace/Documentation/network/servicemesh/ingress-reference.rst:: WARNING: image file not readable: images/ingress-policy.png
/github/workspace/Documentation/network/servicemesh/ingress-reference.rst:: WARNING: image file not readable: images/ingress-policy.png
/github/workspace/Documentation/network/servicemesh/ingress-reference.rst:57: WARNING: undefined label: 'gs_ingress_and_network_policy'
/github/workspace/Documentation/network/servicemesh/ingress-reference.rst:57: WARNING: undefined label: 'gs_ingress_and_network_policy'
/github/workspace/Documentation/network/servicemesh/ingress-reference.rst:57: WARNING: undefined label: 'gs_ingress_and_network_policy'

errors from https://github.com/cilium/cilium/actions/runs/10347961263/job/28639242829?pr=34299

I'll open another backport to include the dependent PR. cc @youngnick

[ upstream commit e553bd2 ]

We are having the below failure due to no disk space, it seems like we
can remove pre-installed software and language runtimes, which are not
use in Cilium, to reclaim more disk space.

Alternative option is to bump the runner, but it might not be the best
resource and cost utilization.

Relates: https://github.com/cilium/cilium/actions/runs/10300396788
Relates: actions/runner-images#2840 (comment)
Signed-off-by: Tam Mach <tam.mach@cilium.io>
Signed-off-by: gray <greyschwinger@gmail.com>
@jschwinger233 jschwinger233 force-pushed the pr/v1.15-backport-2024-08-12-03-21 branch from 628571e to ea6ea45 Compare August 13, 2024 11:13
@jschwinger233
Copy link
Member Author

/test-backport-1.15

@jschwinger233 jschwinger233 removed the request for review from youngnick August 13, 2024 15:44
@jrajahalme jrajahalme marked this pull request as ready for review August 14, 2024 13:29
@jrajahalme jrajahalme requested review from a team as code owners August 14, 2024 13:29
@jrajahalme jrajahalme requested review from aanm and tklauser August 14, 2024 13:29
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Aug 16, 2024
@youngnick youngnick merged commit e22da11 into v1.15 Aug 16, 2024
246 checks passed
@youngnick youngnick deleted the pr/v1.15-backport-2024-08-12-03-21 branch August 16, 2024 00:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. 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.

7 participants
0