Undo hard coded images

Makefile

@@ -13,7 +13,6 @@ PROJECT_PATH := $(patsubst %/,%,$(dir $(MKFILE_PATH)))
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
 VERSION ?= 0.0.0
-VERSION = unified_kuadrant #ToDo(mnairn) Remove this before merge
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -55,7 +54,6 @@ else
 BUNDLE_VERSION = 0.0.0
 IMAGE_TAG ?= $(DEFAULT_IMAGE_TAG)
 endif
-IMAGE_TAG = unified_kuadrant  #ToDo(mnairn) Remove this before merge
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
@@ -142,7 +140,6 @@ LIMITADOR_OPERATOR_BUNDLE_IMG ?= quay.io/kuadrant/limitador-operator-bundle:$(LI
 ## dns
 #ToDo Pin this version once we have an initial release of the dns operator
 DNS_OPERATOR_VERSION ?= latest
-DNS_OPERATOR_VERSION = unified_kuadrant #ToDo(mnairn) Remove this before merge
 
 kuadrantdns_bundle_is_semantic := $(call is_semantic_version,$(DNS_OPERATOR_VERSION))
 ifeq (latest,$(DNS_OPERATOR_VERSION))
@@ -401,7 +398,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 deploy: manifests dependencies-manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	$(KUSTOMIZE) build config/deploy | kubectl apply -f -
-	#cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMAGE_TAG_BASE):latest #ToDo(mnairn) Uncomment this before merge
+	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMAGE_TAG_BASE):latest
 
 undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
 	$(KUSTOMIZE) build config/deploy | kubectl delete -f -

config/dependencies/dns/kustomization.yaml

@@ -1,5 +1,5 @@
 resources:
-- github.com/kuadrant/dns-operator/config/default?ref=unified_kuadrant 
+- github.com/kuadrant/dns-operator/config/default?ref=main
 
 patches:
   - path: deployment_patch.yaml