Skip to content

Commit

Permalink
Merge branch 'prod' into dd-con-fix-staging
Browse files Browse the repository at this point in the history
  • Loading branch information
songy23 committed Oct 19, 2023
2 parents 5ae7cd0 + 04ab518 commit 56f72fe
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions ci/scripts/ci-deploy-staging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

###########################################################################################################
Expand Down
1 change: 1 addition & 0 deletions ci/values-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ nodeSelector:
presets:
logsCollection:
enabled: false
useGOMEMLIMIT: true
2 changes: 2 additions & 0 deletions ci/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 56f72fe

Please sign in to comment.