Skip to content

Commit

Permalink
Use operator image from GHCR (#536)
Browse files Browse the repository at this point in the history
Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
  • Loading branch information
pavolloffay committed Nov 12, 2021
1 parent 9d09b22 commit cf2e7e1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
operator-sdk-version: v1.13.1

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

- name: "create the release in GitHub"
env:
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ AUTO_INSTRUMENTATION_JAVA_VERSION ?= "$(shell grep -v '\#' versions.txt | grep a
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}"

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

ensure-generate-is-noop: VERSION=$(OPERATOR_VERSION)
ensure-generate-is-noop: USER=opentelemetry
ensure-generate-is-noop: USER=open-telemetry
ensure-generate-is-noop: set-image-controller generate bundle
@# on make bundle config/manager/kustomization.yaml includes changes, which should be ignored for the below check
@git restore config/manager/kustomization.yaml
Expand Down Expand Up @@ -258,4 +258,4 @@ ifeq (, $(shell which crdoc))
API_REF_GEN=$(GOBIN)/crdoc
else
API_REF_GEN=$(shell which crdoc)
endif
endif
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ spec:
- args:
- --metrics-addr=127.0.0.1:8080
- --enable-leader-election
image: quay.io/opentelemetry/opentelemetry-operator:v0.38.0
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:v0.38.0
name: manager
ports:
- containerPort: 9443
Expand Down

0 comments on commit cf2e7e1

Please sign in to comment.