Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge mackjmr/add-demo-deploy-staging to prod #20

Merged
merged 3 commits into from
Sep 5, 2023
Merged

Merge mackjmr/add-demo-deploy-staging to prod #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33cfac4
Deploy demo to ng-5 (gateway)
mackjmr Aug 17, 2023
f206fa9
Merge pull request #18 from DataDog/mackjmr/add-gateway-deploy-staging
mackjmr Sep 5, 2023
8b36060
Merge branch 'mackjmr/add-demo-deploy-staging' into mackjmr/merge-bra…
mackjmr Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
Loading