Tag git commit sha with bundle image

Signed-off-by: Shiva Kumar (SW-CLOUD) <[email protected]>

Author: Shiva Kumar

.github/workflows/ci.yaml

@@ -438,9 +438,17 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set environment variables
+        id: vars
+        run: |
+          echo "COMMIT_SHORT_SHA=${GITHUB_SHA:0:8}" >> $GITHUB_ENV
       - name: Build bundle-image
         env:
-          BUNDLE_IMAGE: "ghcr.io/nvidia/gpu-operator/gpu-operator-bundle:${{ github.ref_name }}-latest"
+          BUNDLE_IMAGE_NAME: "ghcr.io/nvidia/gpu-operator/gpu-operator-bundle"
+          BUNDLE_VERSION: "bundlecommitsha-latest"
+          BUNDLE_GIT_TAG: "${{ env.COMMIT_SHORT_SHA }}"
+          OPERATOR_IMAGE_NAME: "ghcr.io/nvidia/gpu-operator"
+          OPERATOR_VERSION: "${{ env.COMMIT_SHORT_SHA }}"
           VERSION: ""
           DEFAULT_CHANNEL: "stable"
           CHANNELS: "stable"

Makefile

@@ -59,7 +59,15 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 
 # BUNDLE_IMAGE defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMAGE=<some-registry>/<project-name-bundle>:<tag>)
-BUNDLE_IMAGE ?= gpu-operator-bundle:$(VERSION)
+BUNDLE_IMAGE_NAME ?= gpu-operator-bundle
+BUNDLE_VERSION ?= $(VERSION)
+BUNDLE_GIT_TAG ?= $(GIT_COMMIT)
+OPERATOR_IMAGE_NAME ?= gpu-operator
+OPERATOR_VERSION ?= $(VERSION)
+BUNDLE_CSV_FILE ?= bundle/manifests/gpu-operator-certified.clusterserviceversion.yaml
+
+BUNDLE_IMAGE := $(BUNDLE_IMAGE_NAME):$(BUNDLE_VERSION)
+BUNDLE_IMAGE_GIT := $(if $(BUNDLE_GIT_TAG),$(BUNDLE_IMAGE_NAME):$(BUNDLE_GIT_TAG))
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -126,16 +134,26 @@ bundle: manifests install-tools
 	$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
 	operator-sdk bundle validate ./bundle
 
+# Update the bundle CSV file with operator image tag
+update-bundle-csv:
+	@echo "Updating GPU operator image in $(BUNDLE_CSV_FILE) to $(OPERATOR_IMAGE_NAME):$(OPERATOR_VERSION)"
+	@sed -i'' -e 's|ghcr.io/nvidia/gpu-operator:[^ "]*|$(OPERATOR_IMAGE_NAME):$(OPERATOR_VERSION)|g' $(BUNDLE_CSV_FILE)
+	@echo "Bundle CSV updated successfully"
+
 # Build the bundle image.
-build-bundle-image:
+build-bundle-image: update-bundle-csv
 	$(DOCKER) build \
 	--build-arg DEFAULT_CHANNEL=$(DEFAULT_CHANNEL) \
 	--build-arg GIT_COMMIT=$(GIT_COMMIT) \
-	-f docker/bundle.Dockerfile -t $(BUNDLE_IMAGE) .
+	-f docker/bundle.Dockerfile \
+	-t $(BUNDLE_IMAGE) \
+	$(if $(BUNDLE_IMAGE_GIT),-t $(BUNDLE_IMAGE_GIT)) \
+	.
 
 # Push the bundle image.
 push-bundle-image: build-bundle-image
 	$(DOCKER) push $(BUNDLE_IMAGE)
+	$(if $(BUNDLE_IMAGE_GIT),$(DOCKER) push $(BUNDLE_IMAGE_GIT))
 
 # Define local and dockerized golang targets