Switch to use kata-containers main branch #1754
Merged
Conversation
This file contains 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
stevenhorsman
force-pushed
the
kata-runtime-bump
branch
4 times, most recently
from
32f8e17
to
169400f
Compare
stevenhorsman
force-pushed
the
kata-runtime-bump
branch
from
169400f
to
b17593d
Compare
|
Hi @stevenhorsman here is the commit that we need to fix the fieldMask error: Build is passing locally here when including this commit. Feel free to incorporate it in your PR. |
stevenhorsman
force-pushed
the
kata-runtime-bump
branch
4 times, most recently
from
f6191f5
to
ea9c24b
Compare
stevenhorsman
force-pushed
the
kata-runtime-bump
branch
4 times, most recently
from
bcf9d39
to
fad3fb7
Compare
stevenhorsman
force-pushed
the
kata-runtime-bump
branch
4 times, most recently
from
d8a5a05
to
c7b8c6c
Compare
stevenhorsman
force-pushed
the
kata-runtime-bump
branch
7 times, most recently
from
4dd86b7
to
c7c48d6
Compare
|
If anyone is interested. I've created some instructions for how to test this PR out in #1596 (comment) There are still some things to resolve though, so it's not fully ready yet:
|
wainersm
reviewed
May 14, 2024
| @@ -536,6 +536,30 @@ func (p *CloudAPIAdaptor) Deploy(ctx context.Context, cfg *envconf.Config, props | |||
| return err | |||
| } | |||
|
|
|||
| // TODO can we do this better with go code? | |||
There was a problem hiding this comment.
I think so. I just found this example https://github.com/kubernetes/client-go/blob/master/examples/create-update-delete-deployment/main.go#L111 of using client-go to update a deployment.
stevenhorsman
force-pushed
the
kata-runtime-bump
branch
2 times, most recently
from
f19b998
to
3ac419d
Compare
wainersm
reviewed
May 14, 2024
stevenhorsman
force-pushed
the
kata-runtime-bump
branch
3 times, most recently
from
05d1072
to
4b51ae4
Compare
stevenhorsman
force-pushed
the
kata-runtime-bump
branch
2 times, most recently
from
b532596
to
18d15d3
Compare
- Remove old PullImage and image service code as image protos not supported on kata main - Also remove the criClient code. We used to use the this to get the image based on digest, but don't have that code now that we've moved to the snapshotter approach, so remove the unused references - As we don't need the cri runtime endpoint in the code now, we can also remove the related kustomizes that set it Signed-off-by: stevenhorsman <steven@uk.ibm.com>
- Update the agentServer to match the kata-runtime changes in protobuf versions in kata-containers/kata-containers#8061 - Primarily swapping `types.Empty` for `emptypb.Empty` Signed-off-by: stevenhorsman <steven@uk.ibm.com>
- Re generate the podvminfo proto implementation with the new protobuff - The re-gened podvm info is in a package __, so we need to alias the package to podvm in our code Signed-off-by: stevenhorsman <steven@uk.ibm.com>
stevenhorsman
force-pushed
the
kata-runtime-bump
branch
2 times, most recently
from
c8816d8
to
d9f219d
Compare
Remove specific nydus test now it is needed for all image pulls Signed-off-by: stevenhorsman <steven@uk.ibm.com>
- Update IsPulledWithNydusSnapshotter to no longer check for the old direct pull image messages as that isn't used anymore Signed-off-by: stevenhorsman <steven@uk.ibm.com>
- Bump kata-containers to use the 3.5.0 release of the agent to match the runtime version we are using Signed-off-by: stevenhorsman <steven@uk.ibm.com>
The kata-agent build (specifically libseccomp) requires the version of yq that kata-containers uses. So run the kata install_yq.sh before we build it Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Bump kata-runtime go module to use the 3.5.0 as the latest released runtime that has remote hypervisor and guest image pull support Signed-off-by: stevenhorsman <steven@uk.ibm.com>
- Perform go mod tidy after bumping kata runtime Signed-off-by: stevenhorsman <steven@uk.ibm.com>
stevenhorsman
force-pushed
the
kata-runtime-bump
branch
from
d9f219d
to
1037c9d
Compare
We don't think with the latest nydus-snapshotter changes, so that cri-runtime annotation is needed, so try drop the comments completely Signed-off-by: stevenhorsman <steven@uk.ibm.com>
stevenhorsman
force-pushed
the
kata-runtime-bump
branch
from
1037c9d
to
02b99ec
Compare
In order to switch to `main` kata-containers payload we need to switch to use the latest operator. There isn't a released version of it yet that supports the peer pods and nydus-snapshotter changes required, so switch to the latest branch for now Signed-off-by: stevenhorsman <steven@uk.ibm.com>
mkulke
approved these changes
May 17, 2024
liudalibj
approved these changes
May 17, 2024
There was a problem hiding this comment.
Thanks @stevenhorsman I tested this PR in my x86/s390x cluster, they worked as expected, thanks!
Here the images I built out:
quay.io/liudalibj/podvm-generic-ubuntu-s390x:bcc4c405f4aa5ac4526f508a4bdb3e8a86f4d6500d4eb56337944b1be83423a1
quay.io/liudalibj/podvm-generic-ubuntu-amd64:bcc4c405f4aa5ac4526f508a4bdb3e8a86f4d6500d4eb56337944b1be83423a1
quay.io/liudalibj/podvm-binaries-ubuntu-s390x:bcc4c405f4aa5ac4526f508a4bdb3e8a86f4d6500d4eb56337944b1be83423a1
quay.io/liudalibj/podvm-binaries-ubuntu-amd64:bcc4c405f4aa5ac4526f508a4bdb3e8a86f4d6500d4eb56337944b1be83423a1
quay.io/liudalibj/podvm-builder-ubuntu:bcc4c405f4aa5ac4526f508a4bdb3e8a86f4d6500d4eb56337944b1be83423a1
quay.io/liudalibj/cloud-api-adaptor:dev-6c395be8927835b6e5e0a59dfab891abedb4893b
wainersm
approved these changes
May 17, 2024
There was a problem hiding this comment.
HI @stevenhorsman ! Re-reviewed, my eyes I couldn't spot any error. Great work, thanks once again!
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.
No description provided.