Skip to content

Commit

Permalink
Merge pull request #10 from k8snetworkplumbingwg/revert_downstream_only
Browse files Browse the repository at this point in the history
Revert "REDHAT DOWNSTREAM ONLY: revert image name changes"
  • Loading branch information
josephdrichard authored Feb 10, 2025
2 parents 3bb1738 + 00ed3fd commit 9b1b64a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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=<some-registry>/<project-name-bundle>:<tag>)
Expand All @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9b1b64a

Please sign in to comment.