Merge pull request NVIDIA#884 from elezar/use-only-ubi8-images

Remove Ubuntu 22.04 images

Author: elezar

.common-ci.yml

@@ -73,10 +73,6 @@ trigger-pipeline:
   variables:
     DIST: "ubi8"
 
-.dist-ubuntu22.04:
-  variables:
-    DIST: "ubuntu22.04"
-
 # Define the platform targets
 .platform-amd64:
   variables:
@@ -123,23 +119,6 @@ trigger-pipeline:
     - .scan-base
 
 # Define the scan targets
-scan-ubuntu22.04-amd64:
-  extends:
-    - .scan
-    - .dist-ubuntu22.04
-    - .platform-amd64
-  needs:
-    - image-ubuntu22.04
-
-scan-ubuntu22.04-arm64:
-  extends:
-    - .scan
-    - .dist-ubuntu22.04
-    - .platform-arm64
-  needs:
-    - image-ubuntu22.04
-    - scan-ubuntu22.04-amd64
-
 scan-ubi8-amd64:
   extends:
     - .scan
@@ -230,10 +209,3 @@ release:staging-ubi8:
     - .dist-ubi8
   needs:
     - image-ubi8
-
-release:staging-ubuntu22.04:
-  extends:
-    - .release:staging
-    - .dist-ubuntu22.04
-  needs:
-    - image-ubuntu22.04

.github/workflows/image.yaml

@@ -31,9 +31,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dist: [ubuntu22.04, ubi8]
     steps:
       - uses: actions/checkout@v4
         name: Check out code
@@ -72,4 +69,4 @@ jobs:
           VERSION: ${COMMIT_SHORT_SHA}
         run: |
           echo "${VERSION}"
-          make -f deployments/container/Makefile build-${{ matrix.dist }}
+          make -f deployments/container/Makefile build

.nvidia-ci.yml

@@ -70,11 +70,6 @@ image-ubi8:
     - .image-pull
     - .dist-ubi8
 
-image-ubuntu22.04:
-  extends:
-    - .image-pull
-    - .dist-ubuntu22.04
-
 # We skip the integration tests for the internal CI:
 .integration:
   stage: test
@@ -118,11 +113,6 @@ image-ubuntu22.04:
 
 # Define the external release targets
 # Release to NGC
-release:ngc-ubuntu22.04:
-  extends:
-    - .release:ngc
-    - .dist-ubuntu22.04
-
 release:ngc-ubi8:
   extends:
     - .release:ngc
@@ -170,17 +160,10 @@ sign:ngc-short-tag:
   extends:
     - .sign:ngc
   needs:
-    - release:ngc-ubuntu22.04
+    - release:ngc-ubi8
   variables:
     IMAGE_TAG: "${CI_COMMIT_TAG}"
 
-sign:ngc-ubuntu22.04:
-  extends:
-    - .dist-ubuntu22.04
-    - .sign:ngc
-  needs:
-    - release:ngc-ubuntu22.04
-
 sign:ngc-ubi8:
   extends:
     - .dist-ubi8

README.md

@@ -951,7 +951,7 @@ Option 2, build without cloning the repository:
 ```shell
 $ docker build \
     -t nvcr.io/nvidia/k8s-device-plugin:devel \
-    -f deployments/container/Dockerfile.ubuntu \
+    -f deployments/container/Dockerfile \
     https://github.com/NVIDIA/k8s-device-plugin.git#v0.16.2
 ```
 
@@ -960,7 +960,7 @@ Option 3, if you want to modify the code:
 $ git clone https://github.com/NVIDIA/k8s-device-plugin.git && cd k8s-device-plugin
 $ docker build \
     -t nvcr.io/nvidia/k8s-device-plugin:devel \
-    -f deployments/container/Dockerfile.ubuntu \
+    -f deployments/container/Dockerfile \
     .
 ```
 

demo/clusters/kind/scripts/common.sh

@@ -30,7 +30,6 @@ DRIVER_IMAGE_REGISTRY=$(from_versions_mk "REGISTRY")
 DRIVER_IMAGE_VERSION=$(from_versions_mk "VERSION")
 
 : ${DRIVER_IMAGE_NAME:=${DRIVER_NAME}}
-: ${DRIVER_IMAGE_PLATFORM:="ubuntu22.04"}
 : ${DRIVER_IMAGE_TAG:=${DRIVER_IMAGE_VERSION}}
 # The derived name of the driver image to build
 : ${DRIVER_IMAGE:="${DRIVER_IMAGE_REGISTRY}/${DRIVER_IMAGE_NAME}:${DRIVER_IMAGE_TAG}"}

deployments/container/Dockerfile.ubi8 renamed to deployments/container/Dockerfile

@@ -38,8 +38,8 @@ OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(DIST)
 OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
 
 ##### Public rules #####
-DEFAULT_PUSH_TARGET := ubuntu22.04
-DISTRIBUTIONS = $(DEFAULT_PUSH_TARGET) ubi8
+DEFAULT_PUSH_TARGET := ubi8
+DISTRIBUTIONS = $(DEFAULT_PUSH_TARGET)
 
 IMAGE_TARGETS := $(patsubst %,image-%,$(DISTRIBUTIONS))
 BUILD_TARGETS := $(patsubst %,build-%,$(DISTRIBUTIONS))
@@ -69,7 +69,7 @@ push-%: DIST = $(*)
 push-short: DIST = $(DEFAULT_PUSH_TARGET)
 
 build-%: DIST = $(*)
-build-%: DOCKERFILE = $(CURDIR)/deployments/container/Dockerfile.$(DOCKERFILE_SUFFIX)
+build-%: DOCKERFILE = $(CURDIR)/deployments/container/Dockerfile
 
 # Use a generic build target to build the relevant images
 $(IMAGE_TARGETS): image-%:
@@ -86,10 +86,6 @@ $(IMAGE_TARGETS): image-%:
 		-f $(DOCKERFILE) \
 		$(CURDIR)
 
-build-ubuntu%: DOCKERFILE_SUFFIX := ubuntu
-
-build-ubi8: DOCKERFILE_SUFFIX := ubi8
-
 # Handle the default build target.
 .PHONY: build
 build: $(DEFAULT_PUSH_TARGET)