Skip to content

Commit

Permalink
Use OTEL operator with pinned version and fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
IshwarKanse committed Nov 7, 2024
1 parent 45b7540 commit 5c74c1b
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,13 @@ endif
ECHO ?= @echo $(echo_prefix)


# Default namespace of the operator
# Default namespace of the Tempo operator
OPERATOR_NAMESPACE ?= tempo-operator-system

# OTEL operator vars
OTEL_OPERATOR_NAMESPACE ?= otel-operator-system
OTEL_BUNDLE_IMG ?= ghcr.io/open-telemetry/opentelemetry-operator/operator-bundle:v0.112.0

# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
# To re-generate a bundle for other specific channels without changing the standard setup, you can:
Expand Down Expand Up @@ -214,6 +218,11 @@ olm-deploy: operator-sdk ## Deploy operator via OLM
olm-upgrade: operator-sdk ## Upgrade operator via OLM
$(OPERATOR_SDK) run bundle-upgrade -n $(OPERATOR_NAMESPACE) $(BUNDLE_IMG)

##@ OpenTelemetry Operator deployment
.PHONY otel-deploy
otel-deploy: operator-sdk ## Deploy OpenTelemetry operator via OLM
$(OPERATOR_SDK) run bundle -n $(OTEL_OPERATOR_NAMESPACE) $(OTEL_BUNDLE_IMG)

##@ Build Dependencies

## Location to install dependencies to
Expand Down Expand Up @@ -381,7 +390,7 @@ deploy-minio:

# generic end-to-tests
.PHONY: prepare-e2e
prepare-e2e: chainsaw start-kind cert-manager set-test-image-vars build docker-build load-image-operator deploy
prepare-e2e: chainsaw start-kind cert-manager set-test-image-vars build docker-build load-image-operator deploy olm-install

.PHONY: e2e
e2e:
Expand Down

0 comments on commit 5c74c1b

Please sign in to comment.