From 48fd34d2a8ef788b8182bb533b764958aee5c7c0 Mon Sep 17 00:00:00 2001
From: Jonathan Knight <jk@thegridman.com>
Date: Wed, 5 Mar 2025 21:19:06 +0300
Subject: [PATCH] Attach bundle to release

---
 .github/workflows/release.yml     | 11 +++++++++++
 Makefile                          |  7 ++++++-
 config/manager/kustomization.yaml |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 40426bc4f..87a43fcc1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -163,6 +163,17 @@ jobs:
         asset_name: coherence-dashboards.tar.gz
         asset_content_type: application/tar+gzip
 
+    - name: Upload Bundle
+      id: upload-bundle
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: /tmp/coherence-operator/_output/coherence-operator-bundle.tar.gz
+        asset_name: coherence-operator-bundle.tar.gz
+        asset_content_type: application/tar+gzip
+
     - name: Upload Docs
       id: upload-docs
       uses: actions/upload-release-asset@v1
diff --git a/Makefile b/Makefile
index 2a45f09bf..cde416190 100644
--- a/Makefile
+++ b/Makefile
@@ -940,6 +940,11 @@ bundle: $(BUILD_PROPS) ensure-sdk $(TOOLS_BIN)/kustomize $(BUILD_TARGETS)/manife
 	$(OPERATOR_SDK) bundle validate ./bundle --select-optional name=operatorhubv2 --optional-values=k8s-version=1.26
 	$(OPERATOR_SDK) bundle validate ./bundle --select-optional name=capabilities --optional-values=k8s-version=1.26
 	$(OPERATOR_SDK) bundle validate ./bundle --select-optional name=categories --optional-values=k8s-version=1.26
+	rm -rf $(BUILD_OUTPUT)/bundle || true
+	mkdir -p $(BUILD_OUTPUT)/bundle/coherence-operator/$(VERSION) || true
+	cp -R bundle/ $(BUILD_OUTPUT)/bundle/coherence-operator/$(VERSION)/
+	rm $(BUILD_OUTPUT)/bundle/coherence-operator/$(VERSION)/ci.yaml
+	tar -C $(BUILD_OUTPUT)/bundle -czf $(BUILD_OUTPUT)/coherence-operator-bundle.tar.gz .
 	rm -rf bundle_tmp*
 
 # ----------------------------------------------------------------------------------------------------------------------
@@ -2533,7 +2538,7 @@ push-all-ttl-images:  push-ttl-operator-images push-ttl-test-images
 # Push all of the images that are released
 # ----------------------------------------------------------------------------------------------------------------------
 .PHONY: push-release-images
-push-release-images: push-operator-image bundle-push catalog-build catalog-push tanzu-repo
+push-release-images: push-operator-image bundle-push catalog-push tanzu-repo
 
 # ----------------------------------------------------------------------------------------------------------------------
 # Install Prometheus
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index a1c9e267a..cd886fd92 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -8,5 +8,5 @@ resources:
 
 images:
 - name: controller
-  newName: ghcr.io/thegridman/coherence-operator
+  newName: ghcr.io/oracle/coherence-operator
   newTag: 3.4.3