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

makefile: introduce variable CILIUM_CLI for cilium cli binary #25031

Merged

Conversation

mhofstetter
Copy link
Member

Currently, cilium cli binary usage is hardcoded in various make targets to cilium - which often is the latest stable Cilium CLI version.

This commit introduces a make variable CILIUM_CLI which is used in all these places and defaults to cilium.

This way, it's easily possible to switch to another Cilium CLI version - e.g. to use and test newer cilium cli features (e.g. helm mode).

In addition make target kind-uninstall-cilium has been added - which help to uninstall a previously installed installation with the same Cilium CLI and feature set.

@mhofstetter mhofstetter added release-note/misc This PR makes changes that have no direct user impact. area/build Anything to do with the build, more general then area/CI labels Apr 21, 2023
@mhofstetter mhofstetter requested a review from a team as a code owner April 21, 2023 09:20
@mhofstetter mhofstetter requested a review from jibi April 21, 2023 09:20
@mhofstetter
Copy link
Member Author

/test

Currently, cilium cli binary usage is hardcoded in various make targets
to `cilium` - which often is the latest stable Cilium CLI version.

This commit introduces a make variable `CILIUM_CLI` which is used in all
these places and defaults to `cilium`.

This way, it's easily possible to switch to another Cilium CLI version -
e.g. to use and test newer cilium cli features (e.g. helm mode).

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
This commit adds the make target `kind-uninstall-cilium` which can be
used to uninstall cilium from the local kind cluster.

This is especially handy in combination with the newly introduces
CILIUM_CLI.

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
@mhofstetter mhofstetter force-pushed the pr/mhofstetter/make-cilium-cli-enhancements branch from 52cc989 to 7283a87 Compare May 3, 2023 08:23
@mhofstetter
Copy link
Member Author

rebased to main to re-run changed/added tests which are required

@mhofstetter
Copy link
Member Author

/test

@mhofstetter
Copy link
Member Author

mhofstetter commented May 3, 2023

/test-runtime

tetsrun flaked with #25178

@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 3, 2023
@tklauser tklauser merged commit c628b39 into cilium:main May 4, 2023
56 checks passed
@mhofstetter mhofstetter deleted the pr/mhofstetter/make-cilium-cli-enhancements branch May 4, 2023 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/build Anything to do with the build, more general then area/CI ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants