Align main and stable branch workflows for availability of cilium-cli #38138
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Mar 12, 2025
1bfe0db to
3b1743f
Compare
joestringer
commented
Mar 12, 2025
Switch the image list to a bash array for easier manipulation. Then, if the cilium-cli directory is not locally available, skip the wait for that specific image. This should fix an issue on stable branches where this action blocks forever due to the lack of a local cilium-cli directory. Signed-off-by: Joe Stringer <joe@cilium.io>
Add an expression to the image build workflows to require that the 'cilium-cli' directory exists in order to trigger the build for the cilium CLI. When backported, this should allow us to keep 100% the same GitHub workflows without making adjustments for the missing cilium-cli directory. Signed-off-by: Joe Stringer <joe@cilium.io>
With a new update to the cilium-cli GitHub action, it will automatically pick an appropriate version of the CLI to install based on the parameters passed into these workflows. The goal here is that on main we install from an image built by the CI by default, then on stable branches we'll substitute the CLI version in the environment variables for a stable release. By passing all of the parameters in however, we can avoid having to update each of the workflows each time we create a stable branch. The CILIUM_CLI_VERSION variable in the environment didn't seem to be actively used so far, so resetting it to an empty string should not have any repercussions as far as I can tell. It seems useful to retain for stable branches however, so I kept it in place. Signed-off-by: Joe Stringer <joe@cilium.io>
3b1743f to
f4a2a43
Compare
|
/test |
youngnick
approved these changes
Mar 13, 2025
Artyop
approved these changes
Mar 13, 2025
giorio94
approved these changes
Mar 13, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR aims to tweak the GitHub workflows in the tree to be ambivalent about
the availability of the
cilium-clidirectory. This way we can ensure that themainversion of these workflows can align with the stable branch versions ofthese workflows, which should simplify the branching process when we are coming
up towards a release period.
Requires: cilium/cilium-cli#2973
Related: #37319
Tested via #38170
Tested (v1.17.x) via #38141