Skip to content

Commit

Permalink
Merge branch 'mackjmr/add-demo-deploy-staging' into mackjmr/merge-bra…
Browse files Browse the repository at this point in the history
…nch-to-prod
  • Loading branch information
mackjmr committed Sep 5, 2023
2 parents 713728f + f206fa9 commit 8b36060
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
14 changes: 14 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ prod-deploy-otel-ingest-agent-eks:
# - aws sts get-caller-identity
- bash $SCRIPT

# Demo env:otel-staging
staging-deploy-otel-demo-eks:
!!merge <<: *staging-deploy
variables:
Expand All @@ -214,6 +215,7 @@ staging-deploy-otel-demo-eks:
CLUSTER_NAME: dd-otel
CLUSTER_ARN: "arn:aws:eks:us-east-1:601427279990:cluster/dd-otel"
REGION: us-east-1
# Demo env:otel-ingest-staging
staging-deploy-otel-ingest-demo-eks:
!!merge <<: *staging-deploy
variables:
Expand All @@ -224,6 +226,7 @@ staging-deploy-otel-ingest-demo-eks:
CLUSTER_NAME: dd-otel
CLUSTER_ARN: "arn:aws:eks:us-east-1:601427279990:cluster/dd-otel"
REGION: us-east-1
# Agent env:otel-ingest-staging
staging-deploy-otel-ingest-agent-eks:
!!merge <<: *staging-deploy
variables:
Expand All @@ -233,3 +236,14 @@ staging-deploy-otel-ingest-agent-eks:
CLUSTER_ARN: "arn:aws:eks:us-east-1:601427279990:cluster/dd-otel"
REGION: us-east-1
VALUES: ./ci/datadog-agent-values-staging.yaml
# Demo env:otel-gateway
staging-deploy-gateway-demo-eks:
!!merge <<: *staging-deploy
variables:
NAMESPACE: otel-gateway
VALUES: ./ci/values-gateway.yaml
NODE_GROUP: ng-5
SCRIPT: ./ci/scripts/ci-deploy-demo-staging.sh
CLUSTER_NAME: dd-otel
CLUSTER_ARN: "arn:aws:eks:us-east-1:601427279990:cluster/dd-otel"
REGION: us-east-1
9 changes: 9 additions & 0 deletions ci/values-gateway.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
default:
envOverrides:
- name: OTEL_COLLECTOR_NAME
value: opentelemetry-collector
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: http://opentelemetry-collector:4317
schedulingRules:
nodeSelector:
alpha.eksctl.io/nodegroup-name: ng-5

0 comments on commit 8b36060

Please sign in to comment.