Tag git commit sha with bundle image

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

Author: Shiva Kumar

.github/workflows/ci.yaml

@@ -443,8 +443,9 @@ jobs:
           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_TAG: "ghcr.io/nvidia/gpu-operator/gpu-operator-bundle:${{ env.COMMIT_SHORT_SHA }}"
+          BUNDLE_IMAGE: "ghcr.io/nvidia/gpu-operator-bundle:${{ github.ref_name }}-latest"
+          BUNDLE_IMAGE_TAG: "ghcr.io/nvidia/gpu-operator-bundle:${{ env.COMMIT_SHORT_SHA }}"
+          OPERATOR_IMAGE_TAG: "ghcr.io/nvidia/gpu-operator:${{ env.COMMIT_SHORT_SHA }}"
           VERSION: ""
           DEFAULT_CHANNEL: "stable"
           CHANNELS: "stable"

Makefile

@@ -61,6 +61,8 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 # 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_TAG ?= gpu-operator-bundle:$(VERSION)
+BUNDLE_CSV_FILE ?= bundle/manifests/gpu-operator-certified.clusterserviceversion.yaml
+OPERATOR_IMAGE_TAG ?= gpu-operator:$(VERSION)
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -127,6 +129,14 @@ 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 image tag in csv file
+update-bundle-csv:
+	@echo "Updating GPU operator image in $(BUNDLE_CSV_FILE) to $(OPERATOR_IMAGE_TAG)"
+	@sed -i -e 's|gpu-operator:[^ " ]*|$(OPERATOR_IMAGE_TAG)|g' $(BUNDLE_CSV_FILE)
+	@git diff --exit-code -- $(BUNDLE_CSV_FILE)
+	@cat $(BUNDLE_CSV_FILE)
+	@echo "Bundle CSV updated successfully"
+
 # Build the bundle image.
 build-bundle-image:
 	$(DOCKER) build \
@@ -135,7 +145,7 @@ build-bundle-image:
 	-f docker/bundle.Dockerfile -t $(BUNDLE_IMAGE) -t $(BUNDLE_IMAGE_TAG) .
 
 # Push the bundle image.
-push-bundle-image: build-bundle-image
+push-bundle-image: update-bundle-csv build-bundle-image
 	$(DOCKER) push $(BUNDLE_IMAGE)
 	$(DOCKER) push $(BUNDLE_IMAGE_TAG)