From 96501258eb56b4f1d5d375af25f8e15fb22d81d8 Mon Sep 17 00:00:00 2001 From: Szilard Parrag Date: Wed, 23 Jul 2025 11:39:59 +0200 Subject: [PATCH 1/2] chore: upgrade image to v0.129.0 Signed-off-by: Szilard Parrag --- Makefile | 9 +++++---- pkg/resources/manager/collector_manager.go | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0781071..553532c 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,8 @@ LICENSEI_VERSION = 0.9.0 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.32.0 -ENVTEST_OTEL_OPERATOR_VERSION=v0.120.0 +ENVTEST_OTEL_OPERATOR_VERSION=0.129.1 +CERT_MANAGER_VERSION = 1.18.2 BIN := ${PWD}/bin @@ -186,8 +187,8 @@ endif .PHONY: install-deps install-deps: ## Install dependencies into the actual K8s cluster - kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.16.2/cert-manager.yaml - kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/download/v0.112.0/opentelemetry-operator.yaml + kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v$(CERT_MANAGER_VERSION)/cert-manager.yaml + kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/download/v$(ENVTEST_OTEL_OPERATOR_VERSION)/opentelemetry-operator.yaml .PHONY: install install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config. @@ -236,7 +237,7 @@ $(CONTROLLER_GEN): $(LOCALBIN) # Download CRDs for envtest crddir/github.com/open-telemetry/opentelemetry-operator: - git clone --depth 1 --branch ${ENVTEST_OTEL_OPERATOR_VERSION} https://github.com/open-telemetry/opentelemetry-operator.git crddir/github.com/open-telemetry/opentelemetry-operator + git clone --depth 1 --branch v${ENVTEST_OTEL_OPERATOR_VERSION} https://github.com/open-telemetry/opentelemetry-operator.git crddir/github.com/open-telemetry/opentelemetry-operator .PHONY: envtest envtest: $(ENVTEST) crddir/github.com/open-telemetry/opentelemetry-operator ## Download envtest-setup locally if necessary. diff --git a/pkg/resources/manager/collector_manager.go b/pkg/resources/manager/collector_manager.go index a8537ee..acd7621 100644 --- a/pkg/resources/manager/collector_manager.go +++ b/pkg/resources/manager/collector_manager.go @@ -43,7 +43,7 @@ import ( const ( otelCollectorKind = "OpenTelemetryCollector" - axoflowOtelCollectorImageRef = "ghcr.io/axoflow/axoflow-otel-collector/axoflow-otel-collector:0.120.0-axoflow.6" + axoflowOtelCollectorImageRef = "ghcr.io/axoflow/axoflow-otel-collector/axoflow-otel-collector:0.120.0-axoflow.28" ) var ( From f9e153de3fc233080dbcaf9532d4f282cc7e50b0 Mon Sep 17 00:00:00 2001 From: Szilard Parrag Date: Thu, 24 Jul 2025 11:07:10 +0200 Subject: [PATCH 2/2] chore: remove obsolete telemetry.disableAddressFieldForInternalTelemetry featuregate Signed-off-by: Szilard Parrag --- pkg/resources/otel_conf_gen/otel_conf_gen.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/resources/otel_conf_gen/otel_conf_gen.go b/pkg/resources/otel_conf_gen/otel_conf_gen.go index c36820d..c07b625 100644 --- a/pkg/resources/otel_conf_gen/otel_conf_gen.go +++ b/pkg/resources/otel_conf_gen/otel_conf_gen.go @@ -334,8 +334,7 @@ func assembleAdditionalArgs(otelConfig *otelv1beta1.Config) map[string]string { flattenDataKey = "flatten_data" ) const ( - flattenLogsFeatureGateValue = "transform.flatten.logs" - telemetryDisableAddressFieldForInternalTelemetry = "telemetry.disableAddressFieldForInternalTelemetry" + flattenLogsFeatureGateValue = "transform.flatten.logs" ) type enableConstraint func() bool @@ -349,9 +348,6 @@ func assembleAdditionalArgs(otelConfig *otelv1beta1.Config) map[string]string { } return false }, - telemetryDisableAddressFieldForInternalTelemetry: func() bool { - return true - }, } var enabledFeatureGates []string