-
Notifications
You must be signed in to change notification settings - Fork 93
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
ci: add yq shim for v3/v4 support #1819
ci: add yq shim for v3/v4 support #1819
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @mkulke - the code looks good to me and it's nice timing as I've just started to try out ditching the caching and was about to look at this. I will try it in practice building the podvm too now.
7a5ab36
to
d7e1ddd
Compare
So the workflow is failing with:
So maybe there is an issue with the Anyway I can confirm that pulling this into my switch to main branch it allows me to install the yq v3 that the kata-agent in main needs, so thanks so much! |
The shim wasn't present in the Dockerfile, I pushed a fix. The CI passes the docker build step now, let's see whether the podvm build also works. I'm running a non-docker build on a fork at the moment that will build kata-agent (and hence intall yq v3) and then later CAA binaries that used to rely on v4, so we'll see whether the fallback works. |
d7e1ddd
to
6c16aa2
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @mkulke I got it! :) :You was talking about the caa side, not kata side!
<joke>Apart from introducing another "shim"</joke>
, lgtm.
I somehow thought that kata had an abstraction over yq queries, but I must have misremembered. For CAA it's easier to deal with the version ambiguity, as it's only a couple of queries. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One nit, otherwise LGTM
yq3 (installed in kata builds as a side effect) and yq4 are different in cli and query syntax. the shim should abstract from those differences Signed-off-by: Magnus Kulke <[email protected]>
6c16aa2
to
ced7cbb
Compare
ok the worklfow in which the kata-build installs v3 and things still work passed the libvirt tests also seem to execute now, so that's good. i'll merge after the libvirt tests hopefully pass |
BTW, one question, we should use the yq-shim only when dealing with stuff related to kata or everywhere in CAA now we should use yq-shim? |
The amd-64 podvm image build failures look like a network flake:
so I've re-run them |
kata will mandate v3 for the time being, and it will even install it on you machine, overriding v4. so the yq-shim adds a compatibility layer that will make v4 queries (CAA) work with v3 and v4 this allows you to build kata + caa on the same machine. so you'd use the yq-shim when v3 is required (e.g. the azure build) |
yq3 (installed in kata builds as a side effect) and yq4 are different in cli and query syntax. the shim should abstract from those differences