Skip to content

Commit cf2e7e1

Browse files
authored
Use operator image from GHCR (#536)
Signed-off-by: Pavol Loffay <[email protected]>
1 parent 9d09b22 commit cf2e7e1

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
operator-sdk-version: v1.13.1
2727

2828
- name: "generate release resources"
29-
run: make release-artifacts IMG_PREFIX="quay.io/opentelemetry"
29+
run: make release-artifacts IMG_PREFIX="ghcr.io/open-telemetry/opentelemetry-operator/"
3030

3131
- name: "create the release in GitHub"
3232
env:

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ AUTO_INSTRUMENTATION_JAVA_VERSION ?= "$(shell grep -v '\#' versions.txt | grep a
99
LD_FLAGS ?= "-X ${VERSION_PKG}.version=${VERSION} -X ${VERSION_PKG}.buildDate=${VERSION_DATE} -X ${VERSION_PKG}.otelCol=${OTELCOL_VERSION} -X ${VERSION_PKG}.targetAllocator=${TARGETALLOCATOR_VERSION} -X ${VERSION_PKG}.autoInstrumentationJava=${AUTO_INSTRUMENTATION_JAVA_VERSION}"
1010

1111
# Image URL to use all building/pushing image targets
12-
IMG_PREFIX ?= quay.io/${USER}
12+
IMG_PREFIX ?= ghcr.io/${USER}/opentelemetry-operator
1313
IMG_REPO ?= opentelemetry-operator
1414
IMG ?= ${IMG_PREFIX}/${IMG_REPO}:$(addprefix v,${VERSION})
1515
BUNDLE_IMG ?= ${IMG_PREFIX}/${IMG_REPO}-bundle:${VERSION}
@@ -49,7 +49,7 @@ KIND_CONFIG ?= kind-$(KUBE_VERSION).yaml
4949
CERTMANAGER_VERSION ?= 1.6.1
5050

5151
ensure-generate-is-noop: VERSION=$(OPERATOR_VERSION)
52-
ensure-generate-is-noop: USER=opentelemetry
52+
ensure-generate-is-noop: USER=open-telemetry
5353
ensure-generate-is-noop: set-image-controller generate bundle
5454
@# on make bundle config/manager/kustomization.yaml includes changes, which should be ignored for the below check
5555
@git restore config/manager/kustomization.yaml
@@ -258,4 +258,4 @@ ifeq (, $(shell which crdoc))
258258
API_REF_GEN=$(GOBIN)/crdoc
259259
else
260260
API_REF_GEN=$(shell which crdoc)
261-
endif
261+
endif

bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ spec:
232232
- args:
233233
- --metrics-addr=127.0.0.1:8080
234234
- --enable-leader-election
235-
image: quay.io/opentelemetry/opentelemetry-operator:v0.38.0
235+
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:v0.38.0
236236
name: manager
237237
ports:
238238
- containerPort: 9443

0 commit comments

Comments
 (0)