Skip to content

Commit

Permalink
remove ds-gateway script
Browse files Browse the repository at this point in the history
  • Loading branch information
mackjmr committed Jan 29, 2024
1 parent 98d5426 commit c864866
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 57 deletions.
7 changes: 6 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,12 @@ staging-deploy-gateway-eks:
staging-deploy-ds-gateway-eks:
!!merge <<: *staging-deploy
variables:
SCRIPT: ./ci/scripts/ci-deploy-ds-gateway.sh
SCRIPT: ./ci/scripts/ci-deploy-staging.sh
NAMESPACE: otel-ds-gateway
NODE_GROUP: ng-6
MODE: deployment
REPLICA_COUNT: 3
CLUSTER_ROLE: opentelemetry-collector-ds-gateway

# DEPLOY COLLECTOR PROD
prod-deploy-demo-eks:
Expand Down
45 changes: 0 additions & 45 deletions ci/scripts/ci-deploy-ds-gateway.sh

This file was deleted.

18 changes: 15 additions & 3 deletions ci/scripts/ci-deploy-staging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,24 @@ install_collector() {
--set clusterRole.clusterRoleBinding.name="${clusterRole}"


# only deploy jmx deployment for otel-staging
if [ "$namespace" == "otel-staging" ]; then
install_deployment
# only deploy otlp col for otel-ds-gateway
if [ "$namespace" == "otel-ds-gateway" ]; then
install_ds_otlp
fi
}

install_ds_otlp() {
release_name="opentelemetry-collector-ds"

# daemonset with otlp exporter
helm --debug upgrade "${release_name}" -n "${namespace}" open-telemetry/opentelemetry-collector --install \
-f ./ci/values.yaml \
-f ./ci/values-otlp-col.yaml \
--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"
}


install_deployment() {
release_name_deployment="opentelemetry-collector-deployment"

Expand Down
8 changes: 0 additions & 8 deletions ci/values-ds-gateway.yaml

This file was deleted.

0 comments on commit c864866

Please sign in to comment.