simplify

Author: mackjmr

.gitlab-ci.yml

@@ -198,9 +198,8 @@ prod-deploy-otel-ingest-agent-eks:
     CLUSTER_ARN: arn:aws:eks:us-east-1:172597598159:cluster/prod-eks-otel-ingest-a-usea-1
     REGION: us-east-1
     NAMESPACE: otel-ingest
-    VALUES: ./ci/agent-values/datadog-agent-values-prod.yaml
+    VALUES: ./ci/agent-values/prod-unified.yaml
     RELEASE_NAME: datadog-agent
-    DD_VALUES: ./ci/agent-values/datadog-agent-ddvalues-prod.yaml
 
 # STAGING DEPLOY DEMO / AGENT 
 .staging-deploy: &staging-deploy
@@ -306,8 +305,7 @@ staging-deploy-otel-ingest-agent-eks:
     CLUSTER_NAME: dd-otel
     CLUSTER_ARN: "arn:aws:eks:us-east-1:601427279990:cluster/dd-otel"
     REGION: us-east-1
-    VALUES: ./ci/agent-values/datadog-agent-values-staging.yaml
-    DD_VALUES: ./ci/agent-values/datadog-agent-ddvalues-staging.yaml
+    VALUES: ./ci/agent-values/otel-staging-unified.yaml
     RELEASE_NAME: datadog-agent
 # Agent env:dd-ingest-staging
 staging-deploy-dd-ingest-agent-eks:
@@ -318,6 +316,5 @@ staging-deploy-dd-ingest-agent-eks:
     CLUSTER_NAME: dd-otel
     CLUSTER_ARN: "arn:aws:eks:us-east-1:601427279990:cluster/dd-otel"
     REGION: us-east-1
-    VALUES: ./ci/agent-values/datadog-agent-values-dd-staging.yaml
-    DD_VALUES: ./ci/agent-values/datadog-agent-values-dd.yaml
+    VALUES: ./ci/agent-values/dd-staging-unified.yaml
     RELEASE_NAME: datadog-agent-dd

ci/agent-values/datadog-agent-values-dd-staging.yaml

@@ -1,8 +1,12 @@
 agents:
+  nodeSelector:
+    alpha.eksctl.io/nodegroup-name: ng-7
   image:
     tag: 7.51.0-rc.1
     tagSuffix: jmx
 datadog:
+  tags:
+    - "env:dd-ingest-staging"
   apiKey: $DD_API_KEY
   apm:
     portEnabled: true

ci/agent-values/datadog-agent-values-prod.yaml

@@ -1,9 +1,13 @@
 agents:
+  nodeSelector:
+    alpha.eksctl.io/nodegroup-name: ng-4
   image:
     repository: docker.io/datadog/agent-dev
     tag: stanley-liu-top-level-spans-poc-py3-jmx
     doNotCheckTag: true
 datadog:
+  tags:
+    - "env:otel-ingest-staging"
   apiKey: $DD_API_KEY
   logs:
     enabled: true
@@ -21,3 +25,4 @@ datadog:
           name: datadog-secrets
           key: api-key
           optional: false
+

ci/agent-values/datadog-agent-values-staging.yaml

@@ -3,6 +3,8 @@ agents:
     tag: 7.51.0-rc.1
     tagSuffix: jmx
 datadog:
+  tags:
+    - "env:otel-ingest"
   apiKey: $DD_API_KEY
   logs:
     enabled: true

ci/agent-values/datadog-agent-values-dd.yaml ci/agent-values/dd-staging-unified.yaml

@@ -13,7 +13,6 @@ clusterArn=$CLUSTER_ARN
 region=$REGION
 namespace=$NAMESPACE
 releaseName=$RELEASE_NAME
-ddValues=$DD_VALUES
 values=$VALUES
 
 install_agent() {
@@ -22,7 +21,6 @@ install_agent() {
 
   # --install will run `helm install` if not already present.
   helm upgrade "${releaseName}" -n "${namespace}" datadog/datadog --install \
-    -f "${ddValues}" \
     -f "${values}"
 }