Remove UBI sufix from image build

Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>

Author: ArangoGutierrez

.nvidia-ci.yml

@@ -77,15 +77,12 @@ workflow:
     - export PATH=$(pwd)/bin:${PATH}
 
 # .copy-images copies the required application and packaging images from the
-# IN_IMAGE="${IN_IMAGE_NAME}:${IN_IMAGE_TAG}${TAG_SUFFIX}"
+# IN_IMAGE="${IN_IMAGE_NAME}:${IN_IMAGE_TAG}"
 # to
-# OUT_IMAGE="${OUT_IMAGE_NAME}:${OUT_IMAGE_TAG}${TAG_SUFFIX}"
+# OUT_IMAGE="${OUT_IMAGE_NAME}:${OUT_IMAGE_TAG}"
 # The script also logs into IN_REGISTRY and OUT_REGISTRY using the supplied
 # username and tokens.
 .copy-images:
-  parallel:
-    matrix:
-      - TAG_SUFFIX: ["-ubi9"]
   before_script:
     - !reference [.regctl-setup, before_script]
     - apk add --no-cache make bash
@@ -103,8 +100,8 @@ workflow:
         ${REGCTL} registry login "${OUT_REGISTRY}" -u "${OUT_REGISTRY_USER}" -p "${OUT_REGISTRY_TOKEN}" || exit 1
       fi
 
-      export IN_IMAGE="${IN_IMAGE_NAME}:${IN_IMAGE_TAG}${TAG_SUFFIX}"
-      export OUT_IMAGE="${OUT_IMAGE_NAME}:${OUT_IMAGE_TAG}${TAG_SUFFIX}"
+      export IN_IMAGE="${IN_IMAGE_NAME}:${IN_IMAGE_TAG}"
+      export OUT_IMAGE="${OUT_IMAGE_NAME}:${OUT_IMAGE_TAG}"
 
       echo "Copying ${IN_IMAGE} to ${OUT_IMAGE}"
       ${REGCTL} image copy ${IN_IMAGE} ${OUT_IMAGE}
@@ -158,7 +155,6 @@ scan-images:
   image: "${PULSE_IMAGE}"
   parallel:
     matrix:
-      - TAG_SUFFIX: ["-ubi9"]
         PLATFORM: ["linux/amd64", "linux/arm64"]
   variables:
     IMAGE: "${CI_REGISTRY_IMAGE}/k8s-dra-driver-gpu:${CI_COMMIT_SHORT_SHA}"
@@ -167,10 +163,9 @@ scan-images:
   script:
     - |
       docker login -u "${CI_REGISTRY_USER}" -p "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
-      export SCAN_IMAGE=${IMAGE}${TAG_SUFFIX}
-      echo "Scanning image ${SCAN_IMAGE} for ${PLATFORM}"
-      docker pull --platform="${PLATFORM}" "${SCAN_IMAGE}"
-      docker save "${SCAN_IMAGE}" -o "${IMAGE_ARCHIVE}"
+      echo "Scanning image ${IMAGE} for ${PLATFORM}"
+      docker pull --platform="${PLATFORM}" "${IMAGE}"
+      docker save "${IMAGE}" -o "${IMAGE_ARCHIVE}"
       AuthHeader=$(echo -n $SSA_CLIENT_ID:$SSA_CLIENT_SECRET | base64 -w0)
       export SSA_TOKEN=$(curl --request POST --header "Authorization: Basic $AuthHeader" --header "Content-Type: application/x-www-form-urlencoded" ${SSA_ISSUER_URL} | jq ".access_token" |  tr -d '"')
       if [ -z "$SSA_TOKEN" ]; then exit 1; else echo "SSA_TOKEN set!"; fi
@@ -243,8 +238,7 @@ push-images-to-staging:
       echo "publishing to ${NGC_PUBLISHING_PROJECT_PATH}"
 
       rm -f ${VERSION_FILE}
-      echo "${IN_IMAGE_TAG}-ubi9 ${OUT_IMAGE_TAG}-ubi9" >> ${VERSION_FILE}
-      echo "${IN_IMAGE_TAG}-ubi9 ${OUT_IMAGE_TAG}" >> ${VERSION_FILE}
+      echo "${IN_IMAGE_TAG} ${OUT_IMAGE_TAG}" >> ${VERSION_FILE}
       cat ${VERSION_FILE}
   script:
     - |

demo/clusters/gke/install-dra-driver-gpu.sh

@@ -27,6 +27,7 @@ DRIVER_NAME=$(from_versions_mk "DRIVER_NAME")
 
 : ${IMAGE_REGISTRY:=ghcr.io/nvidia}
 : ${IMAGE_NAME:=${DRIVER_NAME}}
+# TODO: update to the latest tag once we remove the ubi tag suffix
 : ${IMAGE_TAG:=d1fad7ed-ubi9}
 
 helm upgrade -i --create-namespace --namespace nvidia nvidia-dra-driver-gpu ${PROJECT_DIR}/deployments/helm/nvidia-dra-driver-gpu \

demo/clusters/kind/scripts/common.sh

@@ -30,6 +30,7 @@ DRIVER_IMAGE_REGISTRY=$(from_versions_mk "REGISTRY")
 DRIVER_IMAGE_VERSION=$(from_versions_mk "VERSION")
 
 : ${DRIVER_IMAGE_NAME:=${DRIVER_NAME}}
+# TODO: update to the latest tag once we remove the ubi tag suffix
 : ${DRIVER_IMAGE_PLATFORM:="ubi9"}
 : ${DRIVER_IMAGE_TAG:=${DRIVER_IMAGE_VERSION}}
 # The derived name of the driver image to build

deployments/container/Makefile

@@ -14,10 +14,13 @@
 
 BUILD_MULTI_ARCH_IMAGES ?= no
 DOCKER ?= docker
-BUILDX  =
+REGCTL ?= regctl
+BUILDX =
+
 ifeq ($(BUILD_MULTI_ARCH_IMAGES),true)
 BUILDX = buildx
 endif
+
 MKDIR    ?= mkdir
 
 ##### Global variables #####
@@ -33,50 +36,39 @@ endif
 # is not v-prefixed.
 IMAGE_VERSION := $(VERSION)
 
-IMAGE_TAG ?= $(IMAGE_VERSION)-$(DIST)
+IMAGE_TAG ?= $(IMAGE_VERSION)
 IMAGE = $(IMAGE_NAME):$(IMAGE_TAG)
 
 OUT_IMAGE_NAME ?= $(IMAGE_NAME)
 OUT_IMAGE_VERSION ?= $(IMAGE_VERSION)
-OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(DIST)
+OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)
 OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
 
 ##### Public rules #####
-DEFAULT_PUSH_TARGET := ubi9
-DISTRIBUTIONS = $(DEFAULT_PUSH_TARGET)
-
-IMAGE_TARGETS := $(patsubst %,image-%,$(DISTRIBUTIONS))
-BUILD_TARGETS := $(patsubst %,build-%,$(DISTRIBUTIONS))
-PUSH_TARGETS := $(patsubst %,push-%,$(DISTRIBUTIONS))
-TEST_TARGETS := $(patsubst %,test-%, $(DISTRIBUTIONS))
-
-.PHONY: $(DISTRIBUTIONS) $(PUSH_TARGETS) $(BUILD_TARGETS) $(TEST_TARGETS) $(BUILD_TARGETS)
+# Direct targets without distribution abstraction
+.PHONY: image build push test push-short
 
 ifneq ($(BUILD_MULTI_ARCH_IMAGES),true)
 include $(CURDIR)/deployments/container/native-only.mk
 else
 include $(CURDIR)/deployments/container/multi-arch.mk
 endif
 
-# For the default push target we also push a short tag equal to the version.
+# For the main push target we also push a short tag equal to the version.
 # We skip this for the development release
 DEVEL_RELEASE_IMAGE_VERSION ?= devel
 PUSH_MULTIPLE_TAGS ?= true
 ifeq ($(strip $(OUT_IMAGE_VERSION)),$(DEVEL_RELEASE_IMAGE_VERSION))
 PUSH_MULTIPLE_TAGS = false
 endif
 ifeq ($(PUSH_MULTIPLE_TAGS),true)
-push-$(DEFAULT_PUSH_TARGET): push-short
+push: push-short
 endif
 
-push-%: DIST = $(*)
-push-short: DIST = $(DEFAULT_PUSH_TARGET)
-
-build-%: DIST = $(*)
-build-%: DOCKERFILE = $(CURDIR)/deployments/container/Dockerfile
+DOCKERFILE = $(CURDIR)/deployments/container/Dockerfile
 
-# Use a generic build target to build the relevant images
-$(IMAGE_TARGETS): image-%:
+# Build the container image
+image:
 	DOCKER_BUILDKIT=1 \
 		$(DOCKER) $(BUILDX) build --pull \
 		--provenance=false --sbom=false \
@@ -92,14 +84,8 @@ $(IMAGE_TARGETS): image-%:
 		-f $(DOCKERFILE) \
 		$(CURDIR)
 
-# Handle the default build target.
-.PHONY: build
-build: $(DEFAULT_PUSH_TARGET)
-$(DEFAULT_PUSH_TARGET): build-$(DEFAULT_PUSH_TARGET)
-$(DEFAULT_PUSH_TARGET): DIST = $(DEFAULT_PUSH_TARGET)
-
-REGCTL ?= regctl
-$(PUSH_TARGETS): push-%:
+# Push the image to the registry
+push:
 	$(REGCTL) \
 		image copy \
 		$(IMAGE) $(OUT_IMAGE)

deployments/container/multi-arch.mk

@@ -16,4 +16,5 @@ PUSH_ON_BUILD ?= false
 DOCKER_BUILD_OPTIONS = --output=type=image,push=$(PUSH_ON_BUILD)
 DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64,linux/arm64
 
-$(BUILD_TARGETS): build-%: image-%
+# Build target depends on image
+build: image

deployments/container/native-only.mk

@@ -18,17 +18,10 @@ PUSH_ON_BUILD ?= false
 ARCH ?= $(shell uname -m | sed -e 's,aarch64,arm64,' -e 's,x86_64,amd64,')
 DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/$(ARCH)
 
+# Build target depends on image
 ifeq ($(PUSH_ON_BUILD),true)
-$(BUILD_TARGETS): build-%: image-%
+build: image
 	$(DOCKER) push "$(IMAGE)"
 else
-$(BUILD_TARGETS): build-%: image-%
-endif
-
-# For the default distribution we also retag the image.
-# Note: This needs to be updated for multi-arch images.
-ifeq ($(IMAGE_TAG),$(VERSION)-$(DIST))
-$(DEFAULT_PUSH_TARGET):
-	$(DOCKER) image inspect $(IMAGE) > /dev/null || $(DOCKER) pull $(IMAGE)
-	$(DOCKER) tag $(IMAGE) $(subst :$(IMAGE_TAG),:$(VERSION),$(IMAGE))
+build: image
 endif