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

gh/workflows: Use cilium-cli GHA to install CLI exec #25228

Merged
merged 1 commit into from May 9, 2023

Conversation

brb
Copy link
Member

@brb brb commented May 2, 2023

This reduces not only the boilerplate, but allows with a few cmds to change the CLI vsn to test WIP changes. For example, to use a custom CLI CI build for all workflows:

    $ CI_BUILD_VSN=foobar
    $ git grep -l cilium_cli_version: | xargs sed -i 's/cilium_cli_version: .*/cilium_cli_version:/g'
    $ git grep -l cilium_cli_ci_version: | xargs sed -i 's/cilium_cli_ci_version:.*/cilium_cli_ci_version: $CI_BUILD_VSN/g'

Depends on cilium/cilium-cli#1563

@brb brb added area/CI-improvement Topic or proposal to improve the Continuous Integration workflow release-note/ci This PR makes changes to the CI. labels May 2, 2023
@brb brb force-pushed the pr/brb/gh-install-cli branch 4 times, most recently from 5286297 to fbd6c8b Compare May 2, 2023 11:35
@brb brb force-pushed the pr/brb/gh-install-cli branch 3 times, most recently from ba288c8 to 5125666 Compare May 2, 2023 14:27
@brb brb changed the title WIP: gh/workflows: Install Cilium CLI via GHA gh/workflows: Use cilium-cli GHA to install CLI exec May 2, 2023
@brb brb force-pushed the pr/brb/gh-install-cli branch 2 times, most recently from bbb556b to 8f08c42 Compare May 2, 2023 16:03
@brb brb marked this pull request as ready for review May 2, 2023 16:03
@brb brb requested review from a team as code owners May 2, 2023 16:03
@brb brb requested review from aanm and nebril May 2, 2023 16:03
@aanm aanm requested a review from tklauser May 3, 2023 08:59
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.

Adding Tobias as reviewer as well.

.github/workflows/conformance-aks-v1.11.yaml Outdated Show resolved Hide resolved
@brb brb force-pushed the pr/brb/gh-install-cli branch 3 times, most recently from 873bbb0 to a483cb0 Compare May 3, 2023 18:27
@brb brb requested a review from aanm May 3, 2023 18:27
@@ -72,6 +72,7 @@ env:
k8s_version: 1.23
# renovate: datasource=github-releases depName=cilium/cilium-cli
cilium_cli_version: v0.13.2
cilium_cli_ci_version:
Copy link
Member

Choose a reason for hiding this comment

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

Do we really need to set this in every workflow? Can't we just keep with.relase-version when using the action below and rely on the with.ci-version default value being empty?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's to make sed'ing easier (described in the description). I'd like to avoid setting it too, but didn't come up with any nice solution.

@brb brb added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 4, 2023
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.

Non blocking comment

.github/workflows/conformance-aks-v1.12.yaml Outdated Show resolved Hide resolved
@joestringer joestringer removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 4, 2023
@joestringer
Copy link
Member

Removed ready-to-merge pending resolution of #25228 (comment) .

@brb brb requested a review from joestringer May 5, 2023 07:27
This reduces not only the boilerplate, but allows with a few cmds to
change the CLI vsn to test WIP changes. For example, to use a custom CLI
CI build for all workflows:

    $ CI_BUILD_VSN=foobar # Docker Image Version of CI Cilium CLI
    $ git grep -l cilium_cli_version: | xargs sed -i 's/cilium_cli_version: .*/cilium_cli_version:/g'
    $ git grep -l cilium_cli_ci_version: | xargs sed -i 's/cilium_cli_ci_version: .*/cilium_cli_ci_version: $CI_BUILD_VSN/g'

Signed-off-by: Martynas Pumputis <m@lambda.lt>
@brb
Copy link
Member Author

brb commented May 8, 2023

Removed ready-to-merge pending resolution of #25228 (comment) .

@joestringer The comment has been addressed.

@joestringer joestringer removed their request for review May 9, 2023 06:29
@joestringer joestringer merged commit cef9595 into main May 9, 2023
43 of 44 checks passed
@joestringer joestringer deleted the pr/brb/gh-install-cli branch May 9, 2023 06:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/CI-improvement Topic or proposal to improve the Continuous Integration workflow release-note/ci This PR makes changes to the CI.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants