From 00ed3fd1eb5f0dafa1652b8d0857b27ca8ba3dcf Mon Sep 17 00:00:00 2001 From: Joseph Richard Date: Fri, 7 Feb 2025 12:24:43 -0700 Subject: [PATCH] Revert "REDHAT DOWNSTREAM ONLY: revert image name changes" This reverts commit 685d08fab01fd33b7c21ace8ec4bdae164424383. --- Makefile | 4 ++-- config/manager/kustomization.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 957c3e512..fd917ad1f 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) # # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both # openshift.io/ptp-operator-bundle:$VERSION and openshift.io/ptp-operator-catalog:$VERSION. -IMAGE_TAG_BASE ?= quay.io/openshift/origin-ptp-operator:$(VERSION) +IMAGE_TAG_BASE ?= ghcr.io/k8snetworkplumbingwg/ptp-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=/:) @@ -43,7 +43,7 @@ BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION).0 $(BUNDLE_METADATA_OPTS OPERATOR_SDK_VERSION ?= v1.22.0-ocp # Image URL to use all building/pushing image targets -IMG ?= quay.io/openshift/origin-ptp-operator:4.19 +IMG ?= ghcr.io/k8snetworkplumbingwg/ptp-operator:latest # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 0fae8ff27..6a3a6e484 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -12,7 +12,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: quay.io/openshift/origin-ptp-operator - newTag: "4.19" + newName: ghcr.io/k8snetworkplumbingwg/ptp-operator + newTag: latest patchesStrategicMerge: - env.yaml