mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-07-31 23:36:12 +00:00
Merge pull request #5922 from fidencio/3.0.1-branch-bump
# Kata Containers 3.0.1
This commit is contained in:
commit
cfbc834602
1
.github/workflows/kata-deploy-push.yaml
vendored
1
.github/workflows/kata-deploy-push.yaml
vendored
@ -25,6 +25,7 @@ jobs:
|
||||
- rootfs-image
|
||||
- rootfs-initrd
|
||||
- virtiofsd
|
||||
- nydus
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Install docker
|
||||
|
1
.github/workflows/kata-deploy-test.yaml
vendored
1
.github/workflows/kata-deploy-test.yaml
vendored
@ -44,6 +44,7 @@ jobs:
|
||||
- cloud-hypervisor
|
||||
- firecracker
|
||||
- kernel
|
||||
- nydus
|
||||
- qemu
|
||||
- rootfs-image
|
||||
- rootfs-initrd
|
||||
|
1
.github/workflows/release.yaml
vendored
1
.github/workflows/release.yaml
vendored
@ -13,6 +13,7 @@ jobs:
|
||||
- cloud-hypervisor
|
||||
- firecracker
|
||||
- kernel
|
||||
- nydus
|
||||
- qemu
|
||||
- rootfs-image
|
||||
- rootfs-initrd
|
||||
|
@ -167,6 +167,7 @@ func (nd *nydusd) args() ([]string, error) {
|
||||
logLevel = "debug"
|
||||
}
|
||||
args := []string{
|
||||
"virtiofs", "--hybrid-mode",
|
||||
"--log-level", logLevel,
|
||||
"--apisock", nd.apiSockPath,
|
||||
"--sock", nd.sockPath,
|
||||
|
@ -99,13 +99,13 @@ func TestNydusdArgs(t *testing.T) {
|
||||
apiSockPath: "/var/lib/api.sock",
|
||||
debug: true,
|
||||
}
|
||||
expected := "--log-level debug --apisock /var/lib/api.sock --sock /var/lib/vhost-user.sock"
|
||||
expected := "virtiofs --hybrid-mode --log-level debug --apisock /var/lib/api.sock --sock /var/lib/vhost-user.sock"
|
||||
args, err := nd.args()
|
||||
assert.NoError(err)
|
||||
assert.Equal(expected, strings.Join(args, " "))
|
||||
|
||||
nd.debug = false
|
||||
expected = "--log-level info --apisock /var/lib/api.sock --sock /var/lib/vhost-user.sock"
|
||||
expected = "virtiofs --hybrid-mode --log-level info --apisock /var/lib/api.sock --sock /var/lib/vhost-user.sock"
|
||||
args, err = nd.args()
|
||||
assert.NoError(err)
|
||||
assert.Equal(expected, strings.Join(args, " "))
|
||||
|
@ -18,7 +18,7 @@ spec:
|
||||
katacontainers.io/kata-runtime: cleanup
|
||||
containers:
|
||||
- name: kube-kata-cleanup
|
||||
image: quay.io/kata-containers/kata-deploy:3.0.0
|
||||
image: quay.io/kata-containers/kata-deploy:3.0.1
|
||||
imagePullPolicy: Always
|
||||
command: [ "bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh reset" ]
|
||||
env:
|
||||
|
@ -16,7 +16,7 @@ spec:
|
||||
serviceAccountName: kata-label-node
|
||||
containers:
|
||||
- name: kube-kata
|
||||
image: quay.io/kata-containers/kata-deploy:3.0.0
|
||||
image: quay.io/kata-containers/kata-deploy:3.0.1
|
||||
imagePullPolicy: Always
|
||||
lifecycle:
|
||||
preStop:
|
||||
|
@ -24,6 +24,7 @@ all-parallel: $(MK_DIR)/dockerbuild/install_yq.sh
|
||||
all: serial-targets \
|
||||
firecracker-tarball \
|
||||
kernel-tarball \
|
||||
nydus-tarball \
|
||||
qemu-tarball \
|
||||
shim-v2-tarball \
|
||||
virtiofsd-tarball
|
||||
@ -49,6 +50,8 @@ kernel-tarball:
|
||||
kernel-experimental-tarball:
|
||||
${MAKE} $@-build
|
||||
|
||||
nydus-tarball:
|
||||
${MAKE} $@-build
|
||||
|
||||
qemu-tarball:
|
||||
${MAKE} $@-build
|
||||
|
@ -27,6 +27,7 @@ readonly kernel_builder="${static_build_dir}/kernel/build.sh"
|
||||
readonly qemu_builder="${static_build_dir}/qemu/build-static-qemu.sh"
|
||||
readonly shimv2_builder="${static_build_dir}/shim-v2/build.sh"
|
||||
readonly virtiofsd_builder="${static_build_dir}/virtiofsd/build.sh"
|
||||
readonly nydus_builder="${static_build_dir}/nydus/build.sh"
|
||||
|
||||
readonly rootfs_builder="${repo_root_dir}/tools/packaging/guest-image/build_image.sh"
|
||||
|
||||
@ -73,6 +74,7 @@ options:
|
||||
firecracker
|
||||
kernel
|
||||
kernel-experimental
|
||||
nydus
|
||||
qemu
|
||||
rootfs-image
|
||||
rootfs-initrd
|
||||
@ -151,6 +153,17 @@ install_virtiofsd() {
|
||||
sudo install -D --owner root --group root --mode 0744 virtiofsd/virtiofsd "${destdir}/opt/kata/libexec/virtiofsd"
|
||||
}
|
||||
|
||||
# Install static nydus asset
|
||||
install_nydus() {
|
||||
info "build static nydus"
|
||||
"${nydus_builder}"
|
||||
info "Install static nydus"
|
||||
mkdir -p "${destdir}/opt/kata/libexec/"
|
||||
ls -tl . || true
|
||||
ls -tl nydus-static || true
|
||||
sudo install -D --owner root --group root --mode 0744 nydus-static/nydusd "${destdir}/opt/kata/libexec/nydusd"
|
||||
}
|
||||
|
||||
#Install all components that are not assets
|
||||
install_shimv2() {
|
||||
GO_VERSION="$(yq r ${versions_yaml} languages.golang.meta.newest-version)"
|
||||
@ -177,6 +190,7 @@ handle_build() {
|
||||
install_image
|
||||
install_initrd
|
||||
install_kernel
|
||||
install_nydus
|
||||
install_qemu
|
||||
install_shimv2
|
||||
install_virtiofsd
|
||||
@ -188,6 +202,8 @@ handle_build() {
|
||||
|
||||
kernel) install_kernel ;;
|
||||
|
||||
nydus) install_nydus ;;
|
||||
|
||||
kernel-experimental) install_experimental_kernel;;
|
||||
|
||||
qemu) install_qemu ;;
|
||||
@ -234,6 +250,7 @@ main() {
|
||||
firecracker
|
||||
kernel
|
||||
kernel-experimental
|
||||
nydus
|
||||
qemu
|
||||
rootfs-image
|
||||
rootfs-initrd
|
||||
|
41
tools/packaging/static-build/nydus/build.sh
Executable file
41
tools/packaging/static-build/nydus/build.sh
Executable file
@ -0,0 +1,41 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Copyright (c) 2022 Ant Group
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
|
||||
source "${script_dir}/../../scripts/lib.sh"
|
||||
|
||||
ARCH=${ARCH:-$(arch_to_golang "$(uname -m)")}
|
||||
|
||||
nydus_url="${nydus_url:-}"
|
||||
nydus_version="${nydus_version:-}"
|
||||
|
||||
info "Get nydus information from runtime versions.yaml"
|
||||
[ -n "$nydus_url" ] || nydus_url=$(get_from_kata_deps "externals.nydus.url")
|
||||
[ -n "$nydus_url" ] || die "failed to get nydus url"
|
||||
[ -n "$nydus_version" ] || nydus_version=$(get_from_kata_deps "externals.nydus.version")
|
||||
[ -n "$nydus_version" ] || die "failed to get nydus version"
|
||||
|
||||
nydus_tarball_url="${nydus_url}/releases/download"
|
||||
|
||||
file_name="nydus-static-${nydus_version}-linux-${ARCH}.tgz"
|
||||
download_url="${nydus_tarball_url}/${nydus_version}/${file_name}"
|
||||
|
||||
info "Download nydus version: ${nydus_version} from ${download_url}"
|
||||
curl -o ${file_name} -L $download_url
|
||||
|
||||
sha256sum="${file_name}.sha256sum"
|
||||
sha256sum_url="${nydus_tarball_url}/${nydus_version}/${sha256sum}"
|
||||
|
||||
info "Download nydus ${sha256sum} from ${sha256sum_url}"
|
||||
curl -o ${sha256sum} -L $sha256sum_url
|
||||
|
||||
sha256sum -c ${sha256sum}
|
||||
tar zxvf ${file_name}
|
@ -240,12 +240,12 @@ externals:
|
||||
nydus:
|
||||
description: "Nydus image acceleration service"
|
||||
url: "https://github.com/dragonflyoss/image-service"
|
||||
version: "v2.1.0-alpha.4"
|
||||
version: "v2.1.1"
|
||||
|
||||
nydus-snapshotter:
|
||||
description: "Snapshotter for Nydus image acceleration service"
|
||||
url: "https://github.com/containerd/nydus-snapshotter"
|
||||
version: "v0.2.3"
|
||||
version: "v0.3.3"
|
||||
|
||||
ovmf:
|
||||
description: "Firmware, implementation of UEFI for virtual machines."
|
||||
|
Loading…
Reference in New Issue
Block a user