From ce778a2dc79b0c096b132e94ed9b29341cee4fd2 Mon Sep 17 00:00:00 2001
From: Craig Brookes <maleck13@users.noreply.github.com>
Date: Thu, 21 Nov 2024 14:52:22 +0000
Subject: [PATCH] final couple of tweaks (#1043)

Signed-off-by: craig <cbrookes@redhat.com>

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
---
 Makefile                                      |  5 ++++
 .../install/openshift/kuadrant-version.yaml   |  6 -----
 config/install/openshift/kustomization.yaml   |  6 -----
 config/install/openshift/sail-operator.yaml   | 26 -------------------
 config/install/standard/kuadrant-version.yaml |  2 +-
 config/install/standard/kustomization.yaml    | 24 +++++++----------
 6 files changed, 15 insertions(+), 54 deletions(-)
 delete mode 100644 config/install/openshift/kuadrant-version.yaml
 delete mode 100644 config/install/openshift/sail-operator.yaml

diff --git a/Makefile b/Makefile
index 897ef1c6d..64736dc9e 100644
--- a/Makefile
+++ b/Makefile
@@ -474,6 +474,7 @@ VERSION=$(VERSION)" > $(RELEASE_FILE)
 		DNS_OPERATOR_VERSION=$(DNS_OPERATOR_VERSION) \
 		WASM_SHIM_VERSION=$(WASM_SHIM_VERSION) \
 		RELATED_IMAGE_CONSOLEPLUGIN=$(RELATED_IMAGE_CONSOLEPLUGIN)
+	$(MAKE) update-catalogsource CATALOG_IMG=$(CATALOG_IMG)		
 
 .PHONY: bundle-operator-image-url
 bundle-operator-image-url: $(YQ) ## Read operator image reference URL from the manifest bundle.
@@ -486,6 +487,10 @@ read-release-version: ## Reads release version
 print-bundle-image: ## Pring bundle images.
 	@echo $(BUNDLE_IMG)
 
+.PHONY: update-catalogsource
+update-catalogsource:
+	@$(YQ) e -i '.spec.image = "${CATALOG_IMG}"' config/deploy/olm/catalogsource.yaml	
+
 ##@ Code Style
 
 GOLANGCI-LINT = $(PROJECT_PATH)/bin/golangci-lint
diff --git a/config/install/openshift/kuadrant-version.yaml b/config/install/openshift/kuadrant-version.yaml
deleted file mode 100644
index c86be4166..000000000
--- a/config/install/openshift/kuadrant-version.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: operators.coreos.com/v1alpha1
-kind: CatalogSource
-metadata:
-  name: kuadrant-operator-catalog
-spec:
-  image: quay.io/kuadrant/kuadrant-operator-catalog:v1.0.0-rc4 #change this to the version you want to install
diff --git a/config/install/openshift/kustomization.yaml b/config/install/openshift/kustomization.yaml
index 693bab216..6eefcc09b 100644
--- a/config/install/openshift/kustomization.yaml
+++ b/config/install/openshift/kustomization.yaml
@@ -11,9 +11,3 @@ patches:
       kind: Subscription
       name: sailoperator
     path: catalog-patch.yaml
-  - target:
-      group: operators.coreos.com
-      version: v1alpha1
-      kind: CatalogSource
-      name: kuadrant-operator-catalog
-    path: kuadrant-version.yaml
diff --git a/config/install/openshift/sail-operator.yaml b/config/install/openshift/sail-operator.yaml
deleted file mode 100644
index f1c071534..000000000
--- a/config/install/openshift/sail-operator.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    control-plane: sail
-  name: gateway-system
----
-kind: OperatorGroup
-apiVersion: operators.coreos.com/v1
-metadata:
-  name: sail
-  namespace: gateway-system
-spec:
-  upgradeStrategy: Default
----
-apiVersion: operators.coreos.com/v1alpha1
-kind: Subscription
-metadata:
-  name: sailoperator
-  namespace: gateway-system
-spec:
-  channel: candidates
-  installPlanApproval: Automatic
-  name: sailoperator
-  source: operatorhubio-catalog
-  sourceNamespace: openshift-marketplace
diff --git a/config/install/standard/kuadrant-version.yaml b/config/install/standard/kuadrant-version.yaml
index c86be4166..135d7016a 100644
--- a/config/install/standard/kuadrant-version.yaml
+++ b/config/install/standard/kuadrant-version.yaml
@@ -3,4 +3,4 @@ kind: CatalogSource
 metadata:
   name: kuadrant-operator-catalog
 spec:
-  image: quay.io/kuadrant/kuadrant-operator-catalog:v1.0.0-rc4 #change this to the version you want to install
+  image: quay.io/kuadrant/kuadrant-operator-catalog:v1.0.0-rc6 #change this to the version you want to install
diff --git a/config/install/standard/kustomization.yaml b/config/install/standard/kustomization.yaml
index 1a8808b0a..69d773e2e 100644
--- a/config/install/standard/kustomization.yaml
+++ b/config/install/standard/kustomization.yaml
@@ -1,22 +1,16 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
+# note by default this will install the version of kuadrant you checkout from v1 onwards
+# if you want to install a different version you can use the patch option below
 resources:
   - https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.1.0/standard-install.yaml
   - sail-operator.yaml
   - ../../deploy/olm
-
-patches:
-  - target:
-      group: operators.coreos.com
-      version: v1alpha1
-      kind: CatalogSource
-      name: kuadrant-operator-catalog
-    path: kuadrant-version.yaml
-  # - patch: |-
-  #     apiVersion: operators.coreos.com/v1alpha1
-  #     kind: CatalogSource
-  #     metadata:
-  #       name: kuadrant-operator-catalog
-  #     spec:
-  #       image: quay.io/kuadrant/kuadrant-operator-catalog:v1.0.0-rc4  #change this to the version you want to install
+# patches:
+#   - target:
+#       group: operators.coreos.com
+#       version: v1alpha1
+#       kind: CatalogSource
+#       name: kuadrant-operator-catalog
+#     path: kuadrant-version.yaml