Merge pull request #8 from mikenairn/fix_image_tag

Set default image

Makefile

@@ -28,8 +28,8 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 # This variable is used to construct full image tags for bundle and catalog images.
 #
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
-# kuadrant.io/kuadrant-dns-operator-bundle:$VERSION and kuadrant.io/kuadrant-dns-operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= kuadrant.io/kuadrant-dns-operator
+# quay.io/kuadrant/kuadrant-dns-operator-bundle:$VERSION and quay.io/kuadrant/kuadrant-dns-operator-catalog:$VERSION.
+IMAGE_TAG_BASE ?= quay.io/kuadrant/kuadrant-dns-operator
 
 # 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>)
@@ -51,7 +51,8 @@ endif
 OPERATOR_SDK_VERSION ?= v1.33.0
 
 # Image URL to use all building/pushing image targets
-IMG ?= controller:latest
+DEFAULT_IMG ?= $(IMAGE_TAG_BASE):latest
+IMG ?= $(DEFAULT_IMG)
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.27.1
 

bundle/manifests/kuadrant-dns-operator.clusterserviceversion.yaml

@@ -69,7 +69,7 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2024-02-02T21:32:57Z"
+    createdAt: "2024-02-03T00:24:09Z"
     operators.operatorframework.io/builder: operator-sdk-v1.33.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
   name: kuadrant-dns-operator.v0.0.1
@@ -249,7 +249,7 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
-                image: controller:latest
+                image: quay.io/kuadrant/kuadrant-dns-operator:latest
                 livenessProbe:
                   httpGet:
                     path: /healthz

config/manager/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: controller
+  newName: quay.io/kuadrant/kuadrant-dns-operator
   newTag: latest