From 25b4dd350ff915607b683aeb4f5d354d291e7cbd Mon Sep 17 00:00:00 2001 From: Md Irshad Sheikh Date: Wed, 15 Mar 2023 04:04:35 -0400 Subject: [PATCH] Remove Intel plugin image builder scripts from distroless dir In this commit, we are removing intel plugin docker image creation scripts from distroless directory. Path: https://github.com/starlingx/integ/tree/master/kubernetes/plugins/intel-device-plugin/distroless Now,intel released pre-built image is used for intel QAT and GPU plugins from docker hub. https://hub.docker.com/r/intel/intel-gpu-plugin/tags TEST PLAN: PASS: build and bootstap is successful. Story: 2010604 Task: 47855 Signed-off-by: Md Irshad Sheikh Change-Id: I0546213ef5c69cfbe291a0ead0857371e35fd805 --- distroless_stable_docker_images.inc | 2 +- .../build-intel-device-plugins-image.sh | 43 ------------------- ...-fpga-admissionwebhook.stable_docker_image | 7 --- ...tel-fpga-initcontainer.stable_docker_image | 7 --- .../intel-fpga-plugin.stable_docker_image | 7 --- .../intel-gpu-plugin.stable_docker_image | 7 --- .../intel-qat-plugin.stable_docker_image | 7 --- 7 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 kubernetes/plugins/intel-device-plugin/distroless/build-intel-device-plugins-image.sh delete mode 100644 kubernetes/plugins/intel-device-plugin/distroless/intel-fpga-admissionwebhook.stable_docker_image delete mode 100644 kubernetes/plugins/intel-device-plugin/distroless/intel-fpga-initcontainer.stable_docker_image delete mode 100644 kubernetes/plugins/intel-device-plugin/distroless/intel-fpga-plugin.stable_docker_image delete mode 100644 kubernetes/plugins/intel-device-plugin/distroless/intel-gpu-plugin.stable_docker_image delete mode 100644 kubernetes/plugins/intel-device-plugin/distroless/intel-qat-plugin.stable_docker_image diff --git a/distroless_stable_docker_images.inc b/distroless_stable_docker_images.inc index 4f304a61d..711155f09 100644 --- a/distroless_stable_docker_images.inc +++ b/distroless_stable_docker_images.inc @@ -1,2 +1,2 @@ kubernetes/armada -kubernetes/plugins/intel-device-plugin +#kubernetes/plugins/intel-device-plugin diff --git a/kubernetes/plugins/intel-device-plugin/distroless/build-intel-device-plugins-image.sh b/kubernetes/plugins/intel-device-plugin/distroless/build-intel-device-plugins-image.sh deleted file mode 100644 index 9e7d10b0c..000000000 --- a/kubernetes/plugins/intel-device-plugin/distroless/build-intel-device-plugins-image.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -################################################################################ -# Copyright (c) 2019 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# -################################################################################ - -DEVICE=$1 -IMAGE_TAG=$2 - -if [ -z "${IMAGE_TAG}" ]; then - echo "image tag must be specified. build ${DEVICE} Aborting..." >&2 - exit 1 -fi - -# https://bugs.launchpad.net/starlingx/+bug/1927153 -# https://bugs.launchpad.net/starlingx/+bug/1939448 -# pin clearlinux/golang to the last known working tag -CLEAR_LINUX_BASE=clearlinux/golang:1.15.10 -CLEAR_LINUX_VERSION=34900 - -sed -i -r \ - -e 's!^(\s*ARG\s+CLEAR_LINUX_BASE\s*=\s*).*!\1'$CLEAR_LINUX_BASE'!' \ - -e 's!^(\s*ARG\s+CLEAR_LINUX_VERSION\s*=\s*).*!\1--version='$CLEAR_LINUX_VERSION'!' \ - build/docker/${DEVICE}.Dockerfile || exit 1 - -make ${DEVICE} - -if [ $? -ne 0 ]; then - echo "Failed to make ${DEVICE}. Aborting..." >&2 - exit 1 -fi - -RETVAL=0 -docker tag intel/${DEVICE}:devel "${IMAGE_TAG}" -if [ $? -ne 0 ]; then - echo "Failed to tag ${DEVICE} with ${IMAGE_TAG}. Aborting..." >&2 - RETVAL=1 -fi - -docker rmi intel/${DEVICE}:devel -exit ${RETVAL} diff --git a/kubernetes/plugins/intel-device-plugin/distroless/intel-fpga-admissionwebhook.stable_docker_image b/kubernetes/plugins/intel-device-plugin/distroless/intel-fpga-admissionwebhook.stable_docker_image deleted file mode 100644 index 776642d14..000000000 --- a/kubernetes/plugins/intel-device-plugin/distroless/intel-fpga-admissionwebhook.stable_docker_image +++ /dev/null @@ -1,7 +0,0 @@ -BUILDER=script -LABEL=intel-fpga-admissionwebhook -SOURCE_REPO=https://github.com/intel/intel-device-plugins-for-kubernetes.git -SOURCE_REF=4f28657b6b4a37a7ed2e8398808c150eb4f1bdd1 -COMMAND=bash -SCRIPT=build-intel-device-plugins-image.sh -ARGS=intel-fpga-admissionwebhook diff --git a/kubernetes/plugins/intel-device-plugin/distroless/intel-fpga-initcontainer.stable_docker_image b/kubernetes/plugins/intel-device-plugin/distroless/intel-fpga-initcontainer.stable_docker_image deleted file mode 100644 index ba4f665b8..000000000 --- a/kubernetes/plugins/intel-device-plugin/distroless/intel-fpga-initcontainer.stable_docker_image +++ /dev/null @@ -1,7 +0,0 @@ -BUILDER=script -LABEL=intel-fpga-initcontainer -SOURCE_REPO=https://github.com/intel/intel-device-plugins-for-kubernetes.git -SOURCE_REF=4f28657b6b4a37a7ed2e8398808c150eb4f1bdd1 -COMMAND=bash -SCRIPT=build-intel-device-plugins-image.sh -ARGS=intel-fpga-initcontainer diff --git a/kubernetes/plugins/intel-device-plugin/distroless/intel-fpga-plugin.stable_docker_image b/kubernetes/plugins/intel-device-plugin/distroless/intel-fpga-plugin.stable_docker_image deleted file mode 100644 index d9c8dc9b9..000000000 --- a/kubernetes/plugins/intel-device-plugin/distroless/intel-fpga-plugin.stable_docker_image +++ /dev/null @@ -1,7 +0,0 @@ -BUILDER=script -LABEL=intel-fpga-plugin -SOURCE_REPO=https://github.com/intel/intel-device-plugins-for-kubernetes.git -SOURCE_REF=4f28657b6b4a37a7ed2e8398808c150eb4f1bdd1 -COMMAND=bash -SCRIPT=build-intel-device-plugins-image.sh -ARGS=intel-fpga-plugin diff --git a/kubernetes/plugins/intel-device-plugin/distroless/intel-gpu-plugin.stable_docker_image b/kubernetes/plugins/intel-device-plugin/distroless/intel-gpu-plugin.stable_docker_image deleted file mode 100644 index 3bda84ae7..000000000 --- a/kubernetes/plugins/intel-device-plugin/distroless/intel-gpu-plugin.stable_docker_image +++ /dev/null @@ -1,7 +0,0 @@ -BUILDER=script -LABEL=intel-gpu-plugin -SOURCE_REPO=https://github.com/intel/intel-device-plugins-for-kubernetes.git -SOURCE_REF=4f28657b6b4a37a7ed2e8398808c150eb4f1bdd1 -COMMAND=bash -SCRIPT=build-intel-device-plugins-image.sh -ARGS=intel-gpu-plugin diff --git a/kubernetes/plugins/intel-device-plugin/distroless/intel-qat-plugin.stable_docker_image b/kubernetes/plugins/intel-device-plugin/distroless/intel-qat-plugin.stable_docker_image deleted file mode 100644 index 19f72e4cf..000000000 --- a/kubernetes/plugins/intel-device-plugin/distroless/intel-qat-plugin.stable_docker_image +++ /dev/null @@ -1,7 +0,0 @@ -BUILDER=script -LABEL=intel-qat-plugin -SOURCE_REPO=https://github.com/intel/intel-device-plugins-for-kubernetes.git -SOURCE_REF=c48c502d002ee5e03bbd8fa02884730da3cdff11 -COMMAND=bash -SCRIPT=build-intel-device-plugins-image.sh -ARGS=intel-qat-plugin