Skip to content

Commit a4b6d42

Browse files
tariq1890tariq1890
committed
drop the DIST (ubi9) suffix in image tags
Signed-off-by: Tariq Ibrahim <[email protected]>
1 parent 4a7f9dc commit a4b6d42

File tree

8 files changed

+19
-61
lines changed

8 files changed

+19
-61
lines changed

‎.github/workflows/ci.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,9 @@ jobs:
237237
LOWERCASE_REPO_OWNER=$(echo "${GITHUB_REPOSITORY_OWNER}" | awk '{print tolower($0)}')
238238
echo "LOWERCASE_REPO_OWNER=$(echo "${GITHUB_REPOSITORY_OWNER}" | awk '{print tolower($0)}')" >> $GITHUB_ENV
239239
240-
echo "OPERATOR_VERSION=${COMMIT_SHORT_SHA}-ubi9" >> $GITHUB_ENV
240+
echo "OPERATOR_VERSION=${COMMIT_SHORT_SHA}" >> $GITHUB_ENV
241241
echo "OPERATOR_IMAGE=ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator" >> $GITHUB_ENV
242-
echo "VALIDATOR_VERSION=${COMMIT_SHORT_SHA}-ubi9" >> $GITHUB_ENV
242+
echo "VALIDATOR_VERSION=${COMMIT_SHORT_SHA}" >> $GITHUB_ENV
243243
echo "VALIDATOR_IMAGE=ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator/gpu-operator-validator" >> $GITHUB_ENV
244244
245245
echo "instance_hostname=ubuntu@${{ steps.get_public_dns_name.outputs.result }}" >> $GITHUB_ENV
@@ -289,9 +289,9 @@ jobs:
289289
LOWERCASE_REPO_OWNER=$(echo "${GITHUB_REPOSITORY_OWNER}" | awk '{print tolower($0)}')
290290
echo "LOWERCASE_REPO_OWNER=$(echo "${GITHUB_REPOSITORY_OWNER}" | awk '{print tolower($0)}')" >> $GITHUB_ENV
291291
292-
echo "OPERATOR_VERSION=${COMMIT_SHORT_SHA}-ubi9" >> $GITHUB_ENV
292+
echo "OPERATOR_VERSION=${COMMIT_SHORT_SHA}" >> $GITHUB_ENV
293293
echo "OPERATOR_IMAGE=ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator" >> $GITHUB_ENV
294-
echo "VALIDATOR_VERSION=${COMMIT_SHORT_SHA}-ubi9" >> $GITHUB_ENV
294+
echo "VALIDATOR_VERSION=${COMMIT_SHORT_SHA}" >> $GITHUB_ENV
295295
echo "VALIDATOR_IMAGE=ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator/gpu-operator-validator" >> $GITHUB_ENV
296296
297297
echo "instance_hostname=ubuntu@${{ steps.get_public_dns_name.outputs.result }}" >> $GITHUB_ENV

‎.gitlab-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ build:gpu-operator-validator:
111111
TF_VAR_additional_ingress_ip_ranges: '["216.228.112.0/26", "217.111.27.192/26"]'
112112
# These should match the images generated by the deploy step.
113113
# TODO: Should these use the staging release instead?
114-
OPERATOR_VERSION: "${CI_COMMIT_SHORT_SHA}-${DIST}"
114+
OPERATOR_VERSION: "${CI_COMMIT_SHORT_SHA}"
115115
OPERATOR_IMAGE: "${CI_REGISTRY_IMAGE}"
116-
VALIDATOR_VERSION: "${CI_COMMIT_SHORT_SHA}-${DIST}"
116+
VALIDATOR_VERSION: "${CI_COMMIT_SHORT_SHA}"
117117
VALIDATOR_IMAGE: "${CI_REGISTRY_IMAGE}/gpu-operator-validator"
118118
GPU_PRODUCT_NAME: "Tesla-T4"
119119
extends:

‎Makefile

+6-19
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,18 @@ include $(CURDIR)/versions.mk
2626

2727
MODULE := github.com/NVIDIA/gpu-operator
2828
BUILDER_IMAGE ?= golang:$(GOLANG_VERSION)
29-
DIST ?= ubi9
3029

3130
ifeq ($(IMAGE_NAME),)
3231
REGISTRY ?= nvcr.io/nvidia/cloud-native
3332
IMAGE_NAME := $(REGISTRY)/gpu-operator
3433
endif
3534

36-
IMAGE_VERSION := $(VERSION)
37-
IMAGE_TAG ?= $(IMAGE_VERSION)-$(DIST)
35+
IMAGE_TAG ?= $(VERSION)
3836
IMAGE = $(IMAGE_NAME):$(IMAGE_TAG)
3937
BUILDIMAGE ?= $(IMAGE_NAME):$(IMAGE_TAG)-build
4038

4139
OUT_IMAGE_NAME ?= $(IMAGE_NAME)
42-
OUT_IMAGE_VERSION ?= $(VERSION)
43-
OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(DIST)
40+
OUT_IMAGE_TAG = $(VERSION)
4441
OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
4542

4643
# CHANNELS define the bundle channels used in the bundle.
@@ -78,9 +75,10 @@ all: gpu-operator
7875
GOOS ?= linux
7976
VERSION_PKG = github.com/NVIDIA/gpu-operator/internal/info
8077

81-
CLIENT_GEN = $(shell pwd)/bin/client-gen
82-
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
83-
KUSTOMIZE = $(shell pwd)/bin/kustomize
78+
PWD = $(shell pwd)
79+
CLIENT_GEN = $(PWD)/bin/client-gen
80+
CONTROLLER_GEN = $(PWD)/bin/controller-gen
81+
KUSTOMIZE = $(PWD)/bin/kustomize
8482

8583
# Build gpu-operator binary
8684
gpu-operator:
@@ -280,17 +278,6 @@ $(ALL_TARGETS): %:
280278
make -C $(SUBCOMPONENT) $(*)
281279
else
282280

283-
# For the default push target we also push a short tag equal to the version.
284-
# We skip this for the development release
285-
DEVEL_RELEASE_IMAGE_VERSION ?= devel
286-
ifneq ($(strip $(VERSION)),$(DEVEL_RELEASE_IMAGE_VERSION))
287-
push-$(DEFAULT_PUSH_TARGET): push-short
288-
endif
289-
290-
push-%: DIST = $(*)
291-
push-short: DIST = $(DEFAULT_PUSH_TARGET)
292-
293-
build-%: DIST = $(*)
294281
build-%: DOCKERFILE = $(CURDIR)/docker/Dockerfile
295282

296283
$(DISTRIBUTIONS): %: build-%

‎bundle/manifests/gpu-operator-certified.clusterserviceversion.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ metadata:
189189
capabilities: Deep Insights
190190
categories: AI/Machine Learning, OpenShift Optional
191191
certified: "true"
192-
containerImage: registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator:main-latest-ubi8
192+
containerImage: registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator:main-latest
193193
createdAt: "Thu Jul 27 13:57:56 PDT 2023"
194194
description: Automate the management and monitoring of NVIDIA GPUs.
195195
provider: NVIDIA
@@ -201,7 +201,7 @@ spec:
201201
apiservicedefinitions: {}
202202
relatedImages:
203203
- name: gpu-operator-image
204-
image: registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator:main-latest-ubi8
204+
image: registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator:main-latest
205205
- name: dcgm-exporter-image
206206
image: nvcr.io/nvidia/k8s/dcgm-exporter@sha256:21f4c8b88716e8e6f732f9fb4c2efaef937c227491a8631c5e55036f80f39a4d
207207
- name: dcgm-image
@@ -223,7 +223,7 @@ spec:
223223
- name: init-container-image
224224
image: nvcr.io/nvidia/cuda@sha256:9cb5831de5d058e0799c7bec24b5081293d7feff98ea793047deffd1a56b1889
225225
- name: gpu-operator-validator-image
226-
image: registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator-validator:main-latest-ubi8
226+
image: registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator-validator:main-latest
227227
- name: k8s-driver-manager-image
228228
image: nvcr.io/nvidia/cloud-native/k8s-driver-manager@sha256:740abc3ff657545c10effd5354f09af525200ed9a1b7623f0c2e8c7bd9e4a4e2
229229
- name: vfio-manager-image
@@ -818,7 +818,7 @@ spec:
818818
- --leader-elect
819819
- --leader-lease-renew-deadline
820820
- "60s"
821-
image: registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator:main-latest-ubi8
821+
image: registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator:main-latest
822822
command:
823823
- gpu-operator
824824
livenessProbe:
@@ -856,7 +856,7 @@ spec:
856856
fieldRef:
857857
fieldPath: metadata.namespace
858858
- name: "VALIDATOR_IMAGE"
859-
value: "registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator-validator:main-latest-ubi8"
859+
value: "registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator-validator:main-latest"
860860
- name: "GFD_IMAGE"
861861
value: "nvcr.io/nvidia/k8s-device-plugin@sha256:7ad2c9f71fe06f9f7745ac8635f46740fbdff4f11edd468addfab81afcdfa534"
862862
- name: "CONTAINER_TOOLKIT_IMAGE"

‎multi-arch.mk

-5
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,3 @@ $(PUSH_TARGETS): push-%:
2222
$(REGCTL) \
2323
image copy \
2424
$(IMAGE) $(OUT_IMAGE)
25-
26-
push-short:
27-
$(REGCTL) \
28-
image copy \
29-
$(IMAGE) $(OUT_IMAGE_NAME):$(OUT_IMAGE_VERSION)

‎native-only.mk

-5
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,3 @@ $(PUSH_TARGETS): OUT_IMAGE ?= $(IMAGE_NAME):$(IMAGE_TAG)
1818
$(PUSH_TARGETS): push-%:
1919
$(DOCKER) tag "$(IMAGE_NAME):$(VERSION)-$(DEFAULT_PUSH_TARGET)" "$(OUT_IMAGE)"
2020
$(DOCKER) push "$(OUT_IMAGE)"
21-
22-
push-short: OUT_IMAGE ?= $(IMAGE_NAME):$(VERSION)
23-
push-short:
24-
$(DOCKER) tag "$(IMAGE_NAME):$(VERSION)-$(DEFAULT_PUSH_TARGET)" "$(OUT_IMAGE)"
25-
$(DOCKER) push "$(OUT_IMAGE)"

‎validator/Makefile

+2-16
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,11 @@ endif
3131

3232
BUILD_DIR ?= ../
3333

34-
IMAGE_VERSION := $(VERSION)
35-
IMAGE_TAG ?= $(IMAGE_VERSION)-$(DIST)
34+
IMAGE_TAG ?= $(VERSION)
3635
IMAGE = $(IMAGE_NAME):$(IMAGE_TAG)
3736

3837
OUT_IMAGE_NAME ?= $(IMAGE_NAME)
39-
OUT_IMAGE_VERSION ?= $(VERSION)
40-
OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(DIST)
38+
OUT_IMAGE_TAG = $(VERSION)
4139
OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
4240

4341
##### Public rules #####
@@ -64,17 +62,6 @@ validator:
6462
CGO_ENABLED=0 GOOS=$(GOOS) \
6563
go build -ldflags "-s -w -X $(VERSION_PKG).gitCommit=$(GIT_COMMIT) -X $(VERSION_PKG).version=$(VERSION)" -o validator .
6664

67-
# For the default push target we also push a short tag equal to the version.
68-
# We skip this for the development release
69-
DEVEL_RELEASE_IMAGE_VERSION ?= devel
70-
ifneq ($(strip $(VERSION)),$(DEVEL_RELEASE_IMAGE_VERSION))
71-
push-$(DEFAULT_PUSH_TARGET): push-short
72-
endif
73-
74-
push-%: DIST = $(*)
75-
push-short: DIST = $(DEFAULT_PUSH_TARGET)
76-
77-
build-%: DIST = $(*)
7865
build-%: DOCKERFILE = $(CURDIR)/Dockerfile
7966

8067
$(DISTRIBUTIONS): %: build-%:
@@ -97,4 +84,3 @@ $(BUILD_TARGETS): build-%:
9784
docker-image: OUT_IMAGE ?= $(IMAGE_NAME):$(IMAGE_TAG)
9885
docker-image: $(DEFAULT_PUSH_TARGET)
9986
$(DOCKER) tag $(IMAGE_NAME):$(IMAGE_TAG) $(OUT_IMAGE)
100-

‎validator/multi-arch.mk

-5
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,3 @@ $(PUSH_TARGETS): push-%:
2222
$(REGCTL) \
2323
image copy \
2424
$(IMAGE) $(OUT_IMAGE)
25-
26-
push-short:
27-
$(REGCTL) \
28-
image copy \
29-
$(IMAGE) $(OUT_IMAGE_NAME):$(OUT_IMAGE_VERSION)

0 commit comments

Comments
 (0)