Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ COSIGN := $(BIN_DIR)/cosign
GIT_SYNC_VERSION := v4.4.2-gke.14__linux_amd64
GIT_SYNC_IMAGE_NAME := gcr.io/config-management-release/git-sync:$(GIT_SYNC_VERSION)

OTELCONTRIBCOL_VERSION := v0.127.0-gke.5
OTELCONTRIBCOL_VERSION := v0.127.0-gke.6

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

Bumping to this version of otelcontribcol makes the --feature-gates=-pkg.translator.prometheus.NormalizeName flag used in manifests/templates/otel-collector.yaml obsolete. This feature gate was removed in v0.93.0 of opentelemetry-collector-contrib, and using it with v0.127.0 will likely cause the collector to fail. Please remove the flag and the associated comment from manifests/templates/otel-collector.yaml as part of this change.

OTELCONTRIBCOL_IMAGE_NAME := gcr.io/config-management-release/otelcontribcol:$(OTELCONTRIBCOL_VERSION)

# Directory used for staging Docker contexts.
Expand Down