final couple of tweaks (#1043)

Signed-off-by: craig <[email protected]>

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED

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

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

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

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