From bd936c0f21cf04388c80c460b1b62ae9fa4055c4 Mon Sep 17 00:00:00 2001 From: mackjmr Date: Wed, 3 Jul 2024 14:13:20 +0200 Subject: [PATCH] fix --- ci/scripts/ci-deploy.sh | 3 ++- ci/values.yaml | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ci/scripts/ci-deploy.sh b/ci/scripts/ci-deploy.sh index 65c286bac947..29743b0e9b38 100644 --- a/ci/scripts/ci-deploy.sh +++ b/ci/scripts/ci-deploy.sh @@ -8,6 +8,7 @@ set -euo pipefail IFS=$'\n\t' set -x + namespace=$NAMESPACE nodegroup=$NODE_GROUP mode=$MODE @@ -28,7 +29,7 @@ install_collector() { --set-string image.tag=otelcolcontrib-v$CI_COMMIT_SHORT_SHA \ --set clusterRole.name=${clusterRole} \ --set clusterRole.clusterRoleBinding.name=${clusterRole} \ - --set-string image.repository=601427279990.dkr.ecr.us-east-1.amazonaws.com/otel-collector-contrib \ + --set-string image.repository=${clusterArn} \ --set mode=${mode} \ --set replicaCount=${replicaCount}" diff --git a/ci/values.yaml b/ci/values.yaml index dec5e66161fc..ba0bccaacc39 100644 --- a/ci/values.yaml +++ b/ci/values.yaml @@ -102,11 +102,6 @@ config: - key: service from_attribute: service_name action: upsert - attributes/trace: - actions: - - key: mack.cluster.test - action: insert - value: juillet transform: metric_statements: &statements - context: resource @@ -240,11 +235,11 @@ config: exporters: [datadog] traces: receivers: [otlp] - processors: [resourcedetection, k8sattributes, transform, attributes/trace, batch] + processors: [resourcedetection, k8sattributes, transform, batch] exporters: [datadog/connector] traces/sampled: receivers: [datadog/connector] - processors: [probabilistic_sampler, attributes/trace, batch] + processors: [probabilistic_sampler, batch] exporters: [datadog] logs: processors: [memory_limiter, resourcedetection, k8sattributes, attributes, attributes/kafkasrc, transform, batch]