Merge pull request #176 from kube-logging/chore/upgrade-otelcol-image-v0.129.0

chore: upgrade axoflow-otel-col image to v0.129.0

Author: csatib02

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.

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 (

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