github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-22 11:13:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6845 from fidencio/topic/yet-more-nvidia-gpu-naming-fixes

Browse Source 
gpu: Rename the last bits from `gpu` to `nvidia-gpu`
This commit is contained in:
Fabiano Fidêncio 2023-05-17 09:05:12 +02:00 committed by GitHub
commit 9630c13ac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/runtime/Makefile
View File

@ -96,10 +96,10 @@ GENERATED_VARS = \
VERSION \ VERSION \
CONFIG_ACRN_IN \ CONFIG_ACRN_IN \
CONFIG_QEMU_IN \ CONFIG_QEMU_IN \
CONFIG_QEMU_NVIDIA_GPU_IN \
CONFIG_QEMU_SEV_IN \ CONFIG_QEMU_SEV_IN \
CONFIG_QEMU_TDX_IN \ CONFIG_QEMU_TDX_IN \
CONFIG_QEMU_SNP_IN \ CONFIG_QEMU_SNP_IN \
CONFIG_QEMU_GPU_IN \
CONFIG_CLH_IN \ CONFIG_CLH_IN \
CONFIG_FC_IN \ CONFIG_FC_IN \
$(USER_VARS) $(USER_VARS)
@ -322,11 +322,11 @@ ifneq (,$(QEMUCMD))
CONFIGS += $(CONFIG_QEMU_SNP) CONFIGS += $(CONFIG_QEMU_SNP)
CONFIG_FILE_QEMU_GPU = configuration-qemu-gpu.toml CONFIG_FILE_QEMU_NVIDIA_GPU = configuration-qemu-nvidia-gpu.toml
CONFIG_QEMU_GPU = config/$(CONFIG_FILE_QEMU_GPU) CONFIG_QEMU_NVIDIA_GPU = config/$(CONFIG_FILE_QEMU_NVIDIA_GPU)
CONFIG_QEMU_GPU_IN = $(CONFIG_QEMU_GPU).in CONFIG_QEMU_NVIDIA_GPU_IN = $(CONFIG_QEMU_NVIDIA_GPU).in
CONFIGS += $(CONFIG_QEMU_GPU) CONFIGS += $(CONFIG_QEMU_NVIDIA_GPU)
# qemu-specific options (all should be suffixed by "_QEMU") # qemu-specific options (all should be suffixed by "_QEMU")
DEFBLOCKSTORAGEDRIVER_QEMU := virtio-scsi DEFBLOCKSTORAGEDRIVER_QEMU := virtio-scsi

0
src/runtime/config/configuration-qemu-gpu.toml.in → src/runtime/config/configuration-qemu-nvidia-gpu.toml.in
View File

2
tools/packaging/kata-deploy/local-build/Makefile
View File

@ -24,7 +24,7 @@ all-parallel: $(MK_DIR)/dockerbuild/install_yq.sh
all: serial-targets \ all: serial-targets \
firecracker-tarball \ firecracker-tarball \
kernel-dragonball-experimental-tarball \ kernel-dragonball-experimental-tarball \
kernel-nvidia-gpu \ kernel-nvidia-gpu-tarball \
kernel-nvidia-gpu-snp-tarball \ kernel-nvidia-gpu-snp-tarball \
kernel-nvidia-gpu-tdx-experimental-tarball \ kernel-nvidia-gpu-tdx-experimental-tarball \
kernel-tarball \ kernel-tarball \

4
tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml
View File

@ -93,8 +93,8 @@ scheduling:
kind: RuntimeClass kind: RuntimeClass
apiVersion: node.k8s.io/v1 apiVersion: node.k8s.io/v1
metadata: metadata:
name: kata-qemu-gpu name: kata-qemu-nvidia-gpu
handler: kata-qemu-gpu handler: kata-qemu-nvidia-gpu
overhead: overhead:
podFixed: podFixed:
memory: "160Mi" memory: "160Mi"

2
tools/packaging/kata-deploy/scripts/kata-deploy.sh
View File

@ -16,8 +16,8 @@ containerd_conf_file_backup="${containerd_conf_file}.bak"
shims=( shims=(
"fc" "fc"
"qemu" "qemu"
"qemu-nvidia-gpu"
"qemu-tdx" "qemu-tdx"
"qemu-gpu"
"qemu-snp" "qemu-snp"
"clh" "clh"
"dragonball" "dragonball"