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.15 Backports 2024-05-13 #32500

Merged
merged 6 commits into from
May 14, 2024
Merged

v1.15 Backports 2024-05-13 #32500

merged 6 commits into from
May 14, 2024

Conversation

learnitall and others added 6 commits May 13, 2024 11:17
[ upstream commit 77cafec ]

This commit adds a new job to the beginning of workflows that have a
workflow_dispatch trigger whose inputs provide important context to the
run. The job echos the inputs so they can be viewed in the logs by users.

A majority of the workflows in the cilium repository have a
workflow_dispatch trigger, which is used by users and Ariane to run
workflows as needed. These workflows take a variety of inputs that may
not always be made available in the logs, as they may not be used in a
place that warrants their value being outputted. This obfuscation can make
debugging these workflows difficult at times, as these inputs provide
important context to the origin of the workflow's trigger.

For instance, the `PR-number` input is used to determine the concurrency
group for a workflow run. It is ignored everywhere else. The value of
the concurrency group is not available via GitHub's UI or API, therefore
this input obfuscated. However, the `PR-number` input provides valuable
metadata, being used to describe the branch or PR that a workflow was
triggered for.

Fixes: #31207

Signed-off-by: Ryan Drew <ryan.drew@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 96c2eb8 ]

[ backporter's notes: trivial conflict in pkg/option/config.go ]

It doesn't make sense to configure it to a negative value. Hence, let's
just enforce it at the flags level by converting it to a uint type. This
change is not expected to have backward-incompatible effects given that
it was already supposed to be a non-negative value. Additionally,
negative values would be automatically rejected during flags validation,
hence preventing a silent fallback to high positive values due to
unexpected conversions.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 0836539 ]

Extend the clustermesh-apiserver/kvstoremesh configurations by adding
the previously missed kvstore-max-consecutive-quorum-errors option to
match the one already provided by the Cilium agents, as well as configure
the same default value.

Fixes: 2911b44 ("kvstore: add a cell for the kvstore client")
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 3d1efae ]

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 4bc5c06 ]

Similar to #30496, use GH_RUNNER_EXTRA_POWER for the CI image workflow.

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
[ upstream commit 3f5e735 ]

This commit adds validation for `commit_status_start` job.
This job is used in workflows that is triggered by Ariane to set the run status to pending.
Ariane is going to depend on this job being existed and its name is "Commit Status Start".
Also, the trigger syntax of `link-build-commits.yaml` is changed because `yq` is throwing an error.

Signed-off-by: Birol Bilgin <birol@cilium.io>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
@jibi jibi 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 May 13, 2024
@jibi
Copy link
Member Author

jibi commented May 13, 2024

/test-backport-1.15

Copy link
Member

@giorio94 giorio94 left a comment

Choose a reason for hiding this comment

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

My commits look good, thanks!

Copy link
Contributor

@michi-covalent michi-covalent left a comment

Choose a reason for hiding this comment

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

thank you!

@jibi jibi marked this pull request as ready for review May 13, 2024 15:34
@jibi jibi requested review from a team as code owners May 13, 2024 15:34
Copy link
Contributor

@learnitall learnitall 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

@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.

Approve for backport of my PR. Thanks!

@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 May 13, 2024
@jibi jibi merged commit 8d3a1d6 into v1.15 May 14, 2024
250 checks passed
@jibi jibi deleted the pr/v1.15-backport-2024-05-13-11-17 branch May 14, 2024 06:47
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
No open projects
Status: Released
Development

Successfully merging this pull request may close these issues.

None yet

6 participants