diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml index abdab807b7..d8b36410d8 100644 --- a/.github/workflows/build-kata-static-tarball-amd64.yaml +++ b/.github/workflows/build-kata-static-tarball-amd64.yaml @@ -168,8 +168,6 @@ jobs: - rootfs-image-nvidia-gpu-confidential - rootfs-initrd - rootfs-initrd-confidential - - rootfs-initrd-nvidia-gpu - - rootfs-initrd-nvidia-gpu-confidential steps: - name: Login to Kata Containers quay.io if: ${{ inputs.push-to-registry == 'yes' }} diff --git a/.github/workflows/build-kata-static-tarball-arm64.yaml b/.github/workflows/build-kata-static-tarball-arm64.yaml index 9d666c2a74..1fbcc8dd57 100644 --- a/.github/workflows/build-kata-static-tarball-arm64.yaml +++ b/.github/workflows/build-kata-static-tarball-arm64.yaml @@ -152,7 +152,6 @@ jobs: - rootfs-image - rootfs-image-nvidia-gpu - rootfs-initrd - - rootfs-initrd-nvidia-gpu steps: - name: Login to Kata Containers quay.io if: ${{ inputs.push-to-registry == 'yes' }} diff --git a/src/runtime/Makefile b/src/runtime/Makefile index 714ae90f88..54f47d6fa9 100644 --- a/src/runtime/Makefile +++ b/src/runtime/Makefile @@ -65,8 +65,6 @@ INITRDCONFIDENTIALNAME = $(PROJECT_TAG)-initrd-confidential.img IMAGENAME_NV = $(PROJECT_TAG)-nvidia-gpu.img IMAGENAME_CONFIDENTIAL_NV = $(PROJECT_TAG)-nvidia-gpu-confidential.img -INITRDNAME_NV = $(PROJECT_TAG)-initrd-nvidia-gpu.img -INITRDNAME_CONFIDENTIAL_NV = $(PROJECT_TAG)-initrd-nvidia-gpu-confidential.img TARGET = $(BIN_PREFIX)-runtime RUNTIME_OUTPUT = $(CURDIR)/$(TARGET) @@ -136,8 +134,6 @@ INITRDCONFIDENTIALPATH := $(PKGDATADIR)/$(INITRDCONFIDENTIALNAME) IMAGEPATH_NV := $(PKGDATADIR)/$(IMAGENAME_NV) IMAGEPATH_CONFIDENTIAL_NV := $(PKGDATADIR)/$(IMAGENAME_CONFIDENTIAL_NV) -INITRDPATH_NV := $(PKGDATADIR)/$(INITRDNAME_NV) -INITRDPATH_CONFIDENTIAL_NV := $(PKGDATADIR)/$(INITRDNAME_CONFIDENTIAL_NV) ROOTFSTYPE_EXT4 := \"ext4\" ROOTFSTYPE_XFS := \"xfs\" @@ -656,10 +652,6 @@ USER_VARS += IMAGENAME_NV USER_VARS += IMAGENAME_CONFIDENTIAL_NV USER_VARS += IMAGEPATH_NV USER_VARS += IMAGEPATH_CONFIDENTIAL_NV -USER_VARS += INITRDNAME_NV -USER_VARS += INITRDNAME_CONFIDENTIAL_NV -USER_VARS += INITRDPATH_NV -USER_VARS += INITRDPATH_CONFIDENTIAL_NV USER_VARS += KERNELNAME_NV USER_VARS += KERNELPATH_NV USER_VARS += KERNELNAME_CONFIDENTIAL_NV diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index b415026fca..bc5a40a4dc 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -191,15 +191,9 @@ rootfs-initrd-tarball: agent-tarball rootfs-image-nvidia-gpu-tarball: agent-tarball busybox-tarball kernel-nvidia-gpu-tarball ${MAKE} $@-build -rootfs-initrd-nvidia-gpu-tarball: agent-tarball busybox-tarball kernel-nvidia-gpu-tarball - ${MAKE} $@-build - rootfs-image-nvidia-gpu-confidential-tarball: agent-tarball busybox-tarball pause-image-tarball coco-guest-components-tarball kernel-nvidia-gpu-tarball ${MAKE} $@-build -rootfs-initrd-nvidia-gpu-confidential-tarball: agent-tarball busybox-tarball pause-image-tarball coco-guest-components-tarball kernel-nvidia-gpu-tarball - ${MAKE} $@-build - rootfs-cca-confidential-image-tarball: agent-tarball pause-image-tarball coco-guest-components-tarball kernel-cca-confidential-tarball ${MAKE} $@-build diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index dc89e2f601..8d0b6fbd3f 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -607,16 +607,6 @@ install_image_nvidia_gpu() { install_image "nvidia-gpu" } -# Install NVIDIA GPU initrd -install_initrd_nvidia_gpu() { - export AGENT_POLICY - export MEASURED_ROOTFS="no" - local version=$(get_from_kata_deps .externals.nvidia.driver.version) - EXTRA_PKGS="apt curl ${EXTRA_PKGS}" - NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-"driver=${version},compute,dcgm,nvswitch"} - install_initrd "nvidia-gpu" -} - # Instal NVIDIA GPU confidential image install_image_nvidia_gpu_confidential() { export CONFIDENTIAL_GUEST="yes" @@ -628,18 +618,6 @@ install_image_nvidia_gpu_confidential() { install_image "nvidia-gpu-confidential" } -# Install NVIDIA GPU confidential initrd -install_initrd_nvidia_gpu_confidential() { - export CONFIDENTIAL_GUEST="yes" - export AGENT_POLICY - export MEASURED_ROOTFS="no" - local version=$(get_from_kata_deps .externals.nvidia.driver.version) - EXTRA_PKGS="apt curl ${EXTRA_PKGS}" - NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-"driver=${version},compute,dcgm,nvswitch"} - install_initrd "nvidia-gpu-confidential" -} - - install_se_image() { info "Create IBM SE image configured with AA_KBC=${AA_KBC}" "${se_image_builder}" --destdir="${destdir}" @@ -1383,12 +1361,8 @@ handle_build() { rootfs-image-nvidia-gpu) install_image_nvidia_gpu ;; - rootfs-initrd-nvidia-gpu) install_initrd_nvidia_gpu ;; - rootfs-image-nvidia-gpu-confidential) install_image_nvidia_gpu_confidential ;; - rootfs-initrd-nvidia-gpu-confidential) install_initrd_nvidia_gpu_confidential ;; - rootfs-cca-confidential-image) install_image_confidential ;; rootfs-cca-confidential-initrd) install_initrd_confidential ;;