From 5413fbdd636135fe60165798b4489aa2ca4ba6fa Mon Sep 17 00:00:00 2001 From: Michael Nairn Date: Sat, 3 Feb 2024 00:25:21 +0000 Subject: [PATCH] Set default image Set default image to quay.io/kuadrant/kuadrant-dns-operator:latest --- Makefile | 7 ++++--- .../kuadrant-dns-operator.clusterserviceversion.yaml | 4 ++-- config/manager/kustomization.yaml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index aad38cc6..cf7ba751 100644 --- a/Makefile +++ b/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=/:) @@ -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 diff --git a/bundle/manifests/kuadrant-dns-operator.clusterserviceversion.yaml b/bundle/manifests/kuadrant-dns-operator.clusterserviceversion.yaml index 2c4f94f0..4f9c6367 100644 --- a/bundle/manifests/kuadrant-dns-operator.clusterserviceversion.yaml +++ b/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 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index ad13e96b..3c64182b 100644 --- a/config/manager/kustomization.yaml +++ b/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