Skip to content

Commit 56f72fe

Browse files
committed
Merge branch 'prod' into dd-con-fix-staging
2 parents 5ae7cd0 + 04ab518 commit 56f72fe

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ WORKDIR /src
33
ADD . /src
44
RUN make otelcontribcol
55

6-
FROM 486234852809.dkr.ecr.us-east-1.amazonaws.com/base:xenial
6+
FROM 486234852809.dkr.ecr.us-east-1.amazonaws.com/base:focal
77
USER root
88

99
RUN clean-apt install make \

ci/scripts/ci-deploy-staging.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ install_collector() {
1616

1717
# if repo already exists, helm 3+ will skip
1818
helm --debug repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
19-
19+
helm repo update open-telemetry
2020
# --install will run `helm install` if not already present.
2121
helm --debug upgrade "${release_name}" -n "${namespace}" open-telemetry/opentelemetry-collector --install \
2222
-f ./ci/values.yaml \
2323
-f "${values}" \
2424
--set-string image.tag="otelcolcontrib-v$CI_COMMIT_SHORT_SHA" \
2525
--set-string image.repository="601427279990.dkr.ecr.us-east-1.amazonaws.com/otel-collector-contrib"
26-
26+
helm list --all-namespaces
2727
}
2828

2929
###########################################################################################################

ci/values-staging.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ nodeSelector:
33
presets:
44
logsCollection:
55
enabled: false
6+
useGOMEMLIMIT: true

ci/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ config:
6666
http:
6767
endpoint: 0.0.0.0:4318
6868
exporters:
69+
# Disable debug exporter until we pull change that adds it from upstream
70+
debug: null
6971
logging:
7072
verbosity: detailed
7173
datadog:

0 commit comments

Comments
 (0)