diff --git a/Makefile b/Makefile index a547430e2..42a3e7941 100644 --- a/Makefile +++ b/Makefile @@ -58,8 +58,8 @@ CONTAINER_PLATFORM ?= amd64 # 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 -# hybrid-cloud-patterns.io/patterns-operator-bundle:$VERSION and hybrid-cloud-patterns.io/patterns-operator-catalog:$VERSION. -IMAGE_TAG_BASE ?= quay.io/hybridcloudpatterns/$(OPERATOR_NAME)-operator +# quay.io/validatedpatterns/patterns-operator-bundle:$VERSION and quay.io/validatedpatterns/patterns-operator-catalog:$VERSION. +IMAGE_TAG_BASE ?= $(UPLOADREGISTRY)/$(OPERATOR_NAME)-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=/:) diff --git a/hack/operator-build-deploy.sh b/hack/operator-build-deploy.sh index a52ed56f0..08059cc3d 100755 --- a/hack/operator-build-deploy.sh +++ b/hack/operator-build-deploy.sh @@ -5,7 +5,6 @@ CATALOGSOURCE="test-pattern-operator" NS="openshift-operators" OPERATOR="patterns-operator" VERSION="${VERSION:-6.6.6}" -REGISTRY="${REGISTRY:-kuemper.int.rhx/bandini}" UPLOADREGISTRY="${UPLOADREGISTRY:-kuemper.int.rhx/bandini}" wait_for_resource() { @@ -75,7 +74,7 @@ if [ $ret -ne 0 ]; then exit 1 fi -make VERSION=${VERSION} UPLOADREGISTRY="${UPLOADREGISTRY}" IMAGE_TAG_BASE=${REGISTRY}/patterns-operator CHANNELS=fast USE_IMAGE_DIGESTS="" \ +make VERSION=${VERSION} UPLOADREGISTRY="${UPLOADREGISTRY}" CHANNELS=fast USE_IMAGE_DIGESTS="" \ manifests bundle generate docker-build docker-push bundle-build bundle-push catalog-build \ catalog-push catalog-install