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 \ diff --git a/ci/scripts/ci-deploy-staging.sh b/ci/scripts/ci-deploy-staging.sh index e4174a191d8b..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 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 } ########################################################################################################### 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 diff --git a/ci/values.yaml b/ci/values.yaml index 85cf84aea01e..9fdc63ab8701 100644 --- a/ci/values.yaml +++ b/ci/values.yaml @@ -66,6 +66,8 @@ 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 datadog: