From 0dd25b59c5e661142f710e3c6e48105003b539f2 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 17 Oct 2023 14:44:39 +0200 Subject: [PATCH 1/6] Set useGOMEMLIMIT to true for testing --- ci/scripts/ci-deploy-staging.sh | 2 +- ci/values-staging.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/scripts/ci-deploy-staging.sh b/ci/scripts/ci-deploy-staging.sh index e4174a191d8b..fcab172215f4 100644 --- a/ci/scripts/ci-deploy-staging.sh +++ b/ci/scripts/ci-deploy-staging.sh @@ -16,7 +16,7 @@ install_collector() { # if repo already exists, helm 3+ will skip helm --debug repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts - + helm list --all-namespaces # --install will run `helm install` if not already present. helm --debug upgrade "${release_name}" -n "${namespace}" open-telemetry/opentelemetry-collector --install \ -f ./ci/values.yaml \ diff --git a/ci/values-staging.yaml b/ci/values-staging.yaml index cfbb2a92722d..d43e863f9f83 100644 --- a/ci/values-staging.yaml +++ b/ci/values-staging.yaml @@ -3,3 +3,4 @@ nodeSelector: presets: logsCollection: enabled: false +useGOMEMLIMIT: true From a27af80fc6b76d7ddf3132bf1c55c24aca410ab6 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 17 Oct 2023 14:54:48 +0200 Subject: [PATCH 2/6] Change Dockerfile base image The xenial image got removed --- ci/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index 18681ecb2ca5..56b68654a7c8 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -3,7 +3,7 @@ WORKDIR /src ADD . /src RUN make otelcontribcol -FROM 486234852809.dkr.ecr.us-east-1.amazonaws.com/base:xenial +FROM 486234852809.dkr.ecr.us-east-1.amazonaws.com/base:focal USER root RUN clean-apt install make \ From aee3d234bd36d8ee53561877b4bb02b31061d184 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 17 Oct 2023 15:11:03 +0200 Subject: [PATCH 3/6] Force update of the repository --- ci/scripts/ci-deploy-staging.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/scripts/ci-deploy-staging.sh b/ci/scripts/ci-deploy-staging.sh index fcab172215f4..5a1847c8bb29 100644 --- a/ci/scripts/ci-deploy-staging.sh +++ b/ci/scripts/ci-deploy-staging.sh @@ -16,14 +16,14 @@ install_collector() { # if repo already exists, helm 3+ will skip helm --debug repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts - helm list --all-namespaces + helm repo update open-telemetry # --install will run `helm install` if not already present. helm --debug upgrade "${release_name}" -n "${namespace}" open-telemetry/opentelemetry-collector --install \ -f ./ci/values.yaml \ -f "${values}" \ --set-string image.tag="otelcolcontrib-v$CI_COMMIT_SHORT_SHA" \ --set-string image.repository="601427279990.dkr.ecr.us-east-1.amazonaws.com/otel-collector-contrib" - + helm list --all-namespaces } ########################################################################################################### From 0804a44a266565a2d4413009e8a3409c6f6085c0 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 17 Oct 2023 15:26:56 +0200 Subject: [PATCH 4/6] Set debug to null --- ci/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/values.yaml b/ci/values.yaml index 85cf84aea01e..6509dcbce39b 100644 --- a/ci/values.yaml +++ b/ci/values.yaml @@ -66,6 +66,7 @@ config: http: endpoint: 0.0.0.0:4318 exporters: + debug: null logging: verbosity: detailed datadog: From e25c39f18fa83e6ec642dcef023079dbaa87396c Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Tue, 17 Oct 2023 16:26:25 +0200 Subject: [PATCH 5/6] Lower the memory limit --- ci/values-staging.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/values-staging.yaml b/ci/values-staging.yaml index d43e863f9f83..90561551e8d8 100644 --- a/ci/values-staging.yaml +++ b/ci/values-staging.yaml @@ -4,3 +4,6 @@ presets: logsCollection: enabled: false useGOMEMLIMIT: true +resources: + limits: + memory: 160Mi From a3b9649278b61b2aa0035b32eacece5f4780eb43 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Thu, 19 Oct 2023 16:17:38 +0200 Subject: [PATCH 6/6] Address feedback --- ci/values-staging.yaml | 3 --- ci/values.yaml | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/values-staging.yaml b/ci/values-staging.yaml index 90561551e8d8..d43e863f9f83 100644 --- a/ci/values-staging.yaml +++ b/ci/values-staging.yaml @@ -4,6 +4,3 @@ presets: logsCollection: enabled: false useGOMEMLIMIT: true -resources: - limits: - memory: 160Mi diff --git a/ci/values.yaml b/ci/values.yaml index 6509dcbce39b..9fdc63ab8701 100644 --- a/ci/values.yaml +++ b/ci/values.yaml @@ -66,6 +66,7 @@ config: http: endpoint: 0.0.0.0:4318 exporters: + # Disable debug exporter until we pull change that adds it from upstream debug: null logging: verbosity: detailed