Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

kata-deploy: Add support for qemu and kernel with virtio-fs 3.0 #710

Merged
merged 1 commit into from
Sep 18, 2019

Conversation

GabyCT
Copy link
Contributor

@GabyCT GabyCT commented Sep 10, 2019

This adds the kata deploy for QEMU and kernel with virtio-fs 3.0

Depends-on: github.com/kata-containers/runtime#2052

Fixes #709

Signed-off-by: Gabriela Cervantes [email protected]

Copy link
Member

@egernst egernst left a comment

Choose a reason for hiding this comment

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

Can you also add the corresponding virtio-fs enabled kernel as well?

@GabyCT GabyCT force-pushed the topic/qemuvirt branch 6 times, most recently from c6c0fdc to 5fd590d Compare September 12, 2019 18:38
@GabyCT
Copy link
Contributor Author

GabyCT commented Sep 12, 2019

@egernst , I did some changes to the build-kernel.sh script, the first thing was to enable the -e while running the build-kernel.sh script in order to run the experimental kernel, then that it took the corresponding version because as it was it was taking version as 4.19.

@GabyCT GabyCT changed the title WIP: Add support for qemu with virtio-fs 3.0 kata-deploy: Add support for qemu and kernel with virtio-fs 3.0 Sep 12, 2019
@GabyCT
Copy link
Contributor Author

GabyCT commented Sep 12, 2019

/cc @egernst and @jcvenegas changes applied

@GabyCT
Copy link
Contributor Author

GabyCT commented Sep 12, 2019

@jcvenegas , I open the #717 about of what we discussed, thanks

@GabyCT GabyCT requested review from jcvenegas and egernst September 12, 2019 20:43
This adds the kata deploy for QEMU and kernel with virtio-fs 3.0

Depends-on: github.com/kata-containers/runtime#2052

Fixes kata-containers#709

Signed-off-by: Gabriela Cervantes <[email protected]>
@GabyCT
Copy link
Contributor Author

GabyCT commented Sep 13, 2019

/test

@GabyCT
Copy link
Contributor Author

GabyCT commented Sep 13, 2019

/test

Copy link
Member

@jcvenegas jcvenegas left a comment

Choose a reason for hiding this comment

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

Thank you gaby - added some question and suggestions \cc @egernst

@@ -103,6 +103,15 @@ install_kernel() {
)
}

#Install experimental kernel asset
install_experimental_kernel() {
info "build experimental kernel"
Copy link
Member

Choose a reason for hiding this comment

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

you will need to enter to the dir of the downloaded packaging kernel.

This script is to ask to create a tarball based on a tag or branch. If we use the the current scripts and someone does a binaries potentially use the old kernel. Additionally I recently sent a patch do it in this way.

Talking offline with you the issue using the the content the issue is that if you do
./kata-deploy-binaries.sh master this will use the packaging of master and not your local changes. Probably would be good to have a flag or argument to say to not use master but what we have locally.

\cc @egernst

Copy link
Member

Choose a reason for hiding this comment

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

the main issue I had in the past was ./kata-deploy-binaries.sh 1.9.0-alpha1 could you take if that works for you @GabyCT ?

Copy link
Member

Choose a reason for hiding this comment

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

@GabyCT I suppose #722 addresses the above issue that @jcvenegas pointed out?
If so, does that PR need to go before this one?

#Remove extra 'v'
kernel_version="${kernel_version#v}"
if [[ ${experimental_kernel} == "true" ]]; then
kernel_version="virtio-fs-v0.3"
Copy link
Member

Choose a reason for hiding this comment

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

@egernst should we have defined this in versions.yaml ?
And do
kernel_version="kernel_version=$(get_from_kata_deps "assets.kernel.experimental.version")
If we have hidden here will not not help for people or scripts that use this centralized place of what is used for a kata release.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, ultimately this should end up coming from versions.yaml.

apiVersion: v1
kind: Service
metadata:
name: php-apache-kata-qemu-virtiofs
Copy link
Member

Choose a reason for hiding this comment

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

We dont have a test today for this you better try locally to see if we are not missing something here :)

@nitkon
Copy link
Contributor

nitkon commented Sep 13, 2019

@GabyCT : Are arch specific kernel fragment directory a must to build experimental kernel for virtio-fs?

++ kernel_ver=virtio-fs-v0.3
++ archfragdir=/home/nitesh/split_patch/src/github.com/kata-containers/packaging/kernel/configs/fragments/powerpc
++ '[' -d /home/nitesh/split_patch/src/github.com/kata-containers/packaging/kernel/configs/fragments/powerpc ']'
++ config=/home/nitesh/split_patch/src/github.com/kata-containers/packaging/kernel/configs/powerpc_kata_kvm_virtio-fs-v0.3.x
++ '[' -f /home/nitesh/split_patch/src/github.com/kata-containers/packaging/kernel/configs/powerpc_kata_kvm_virtio-fs-v0.3.x ']'
++ die 'failed to find default config /home/nitesh/split_patch/src/github.com/kata-containers/packaging/kernel/configs/powerpc_kata_kvm_virtio-fs-v0.3.x'
++ echo 'ERROR: failed to find default config /home/nitesh/split_patch/src/github.com/kata-containers/packaging/kernel/configs/powerpc_kata_kvm_virtio-fs-v0.3.x'
ERROR: failed to find default config /home/nitesh/split_patch/src/github.com/kata-containers/packaging/kernel/configs/powerpc_kata_kvm_virtio-fs-v0.3.x
++ exit 1
+ kernel_config_path=

@GabyCT
Copy link
Contributor Author

GabyCT commented Sep 13, 2019

@nitkon probably @egernst is the person who can answer that as he took that task

GabyCT added a commit to GabyCT/runtime-1 that referenced this pull request Sep 13, 2019
This adds QEMU and the kernel with virtiofs 3.0 at the versions.yaml
file.

Depends-on: github.com/kata-containers/packaging#710

Fixes kata-containers#2051

Signed-off-by: Gabriela Cervantes <[email protected]>
GabyCT added a commit to GabyCT/runtime-1 that referenced this pull request Sep 13, 2019
This adds QEMU and the kernel with virtiofs 3.0 at the versions.yaml
file.

Depends-on: github.com/kata-containers/packaging#710

Fixes kata-containers#2051

Signed-off-by: Gabriela Cervantes <[email protected]>
GabyCT added a commit to GabyCT/runtime-1 that referenced this pull request Sep 13, 2019
Enable a new configuration file for QEMU with virtiofs 3.0

Depends-on: github.com/kata-containers/packaging#710

Fixes kata-containers#2053

Signed-off-by: Gabriela Cervantes <[email protected]>
@GabyCT
Copy link
Contributor Author

GabyCT commented Sep 13, 2019

@jcvenegas changes applied, here are the related PRs
kata-containers/runtime#2052
kata-containers/runtime#2054

@GabyCT
Copy link
Contributor Author

GabyCT commented Sep 13, 2019

/test

@@ -1 +1 @@
49
50
Copy link
Contributor

Choose a reason for hiding this comment

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

I see you have bumped the version here but still CI is failing with:

23:01:19 Kernel directory has changes check kernel/kata_config_version changed
23:01:19 ERROR: Please bump version in kernel/kata_config_version
23:01:19 Makefile:24: recipe for target 'test' failed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jcvenegas any idea of this failure?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jcvenegas and @nitkon, I just fixed it

@GabyCT GabyCT force-pushed the topic/qemuvirt branch 2 times, most recently from df57b6f to 88d2048 Compare September 13, 2019 18:28
@GabyCT
Copy link
Contributor Author

GabyCT commented Sep 13, 2019

/test

@GabyCT
Copy link
Contributor Author

GabyCT commented Sep 13, 2019

/AzurePipelines run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

GabyCT added a commit to GabyCT/runtime-1 that referenced this pull request Sep 13, 2019
Enable a new configuration file for QEMU with virtiofs 3.0

Depends-on: github.com/kata-containers/packaging#710

Fixes kata-containers#2053

Signed-off-by: Gabriela Cervantes <[email protected]>
Copy link
Member

@egernst egernst left a comment

Choose a reason for hiding this comment

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

Looks good. I wonder if we should wait for a runtime toml to be in place before merging?

@egernst egernst dismissed their stale review September 14, 2019 04:18

addressed issues.

GabyCT added a commit to GabyCT/runtime-1 that referenced this pull request Sep 17, 2019
Enable a new configuration file for QEMU with virtiofs 3.0

Depends-on: github.com/kata-containers/packaging#710

Fixes kata-containers#2053

Signed-off-by: Gabriela Cervantes <[email protected]>
GabyCT added a commit to GabyCT/runtime-1 that referenced this pull request Sep 17, 2019
Enable a new configuration file for QEMU with virtiofs 3.0

Depends-on: github.com/kata-containers/packaging#710

Fixes kata-containers#2053

Signed-off-by: Gabriela Cervantes <[email protected]>
GabyCT added a commit to GabyCT/runtime-1 that referenced this pull request Sep 17, 2019
Enable a new configuration file for QEMU with virtiofs 3.0

Depends-on: github.com/kata-containers/packaging#710

Fixes kata-containers#2053

Signed-off-by: Gabriela Cervantes <[email protected]>
GabyCT added a commit to GabyCT/runtime-1 that referenced this pull request Sep 17, 2019
Enable a new configuration file for QEMU with virtiofs 3.0

Depends-on: github.com/kata-containers/packaging#710

Fixes kata-containers#2053

Signed-off-by: Gabriela Cervantes <[email protected]>
GabyCT added a commit to GabyCT/runtime-1 that referenced this pull request Sep 17, 2019
Enable a new configuration file for QEMU with virtiofs 3.0

Depends-on: github.com/kata-containers/packaging#710

Fixes kata-containers#2053

Signed-off-by: Gabriela Cervantes <[email protected]>
GabyCT added a commit to GabyCT/runtime-1 that referenced this pull request Sep 17, 2019
Enable a new configuration file for QEMU with virtiofs 3.0

Depends-on: github.com/kata-containers/packaging#710

Fixes kata-containers#2053

Signed-off-by: Gabriela Cervantes <[email protected]>
GabyCT added a commit to GabyCT/runtime-1 that referenced this pull request Sep 17, 2019
Enable a new configuration file for QEMU with virtiofs 3.0

Depends-on: github.com/kata-containers/packaging#710

Fixes kata-containers#2053

Signed-off-by: Gabriela Cervantes <[email protected]>
@GabyCT
Copy link
Contributor Author

GabyCT commented Sep 17, 2019

Looks good. I wonder if we should wait for a runtime toml to be in place before merging?

@egernst , I already submitted the changes for the runtime toml kata-containers/runtime#2054

GabyCT added a commit to GabyCT/runtime-1 that referenced this pull request Sep 17, 2019
Enable a new configuration file for QEMU with virtiofs 3.0

Depends-on: github.com/kata-containers/packaging#710

Fixes kata-containers#2053

Signed-off-by: Gabriela Cervantes <[email protected]>
GabyCT added a commit to GabyCT/runtime-1 that referenced this pull request Sep 17, 2019
Enable a new configuration file for QEMU with virtiofs 3.0

Depends-on: github.com/kata-containers/packaging#710

Fixes kata-containers#2053

Signed-off-by: Gabriela Cervantes <[email protected]>
GabyCT added a commit to GabyCT/runtime-1 that referenced this pull request Sep 17, 2019
Enable a new configuration file for QEMU with virtiofs 3.0

Depends-on: github.com/kata-containers/packaging#710

Fixes kata-containers#2053

Signed-off-by: Gabriela Cervantes <[email protected]>
@GabyCT
Copy link
Contributor Author

GabyCT commented Sep 17, 2019

@amshinde , I include the changes at kata-containers/runtime#2054

@jcvenegas jcvenegas merged commit 827e85d into kata-containers:master Sep 18, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add kata deploy for QEMU and kernel with virtio-fs 3.0
5 participants