fixes

Author: mackjmr

.gitlab-ci.yml

@@ -198,9 +198,9 @@ 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/datadog-agent-values-prod.yaml
+    VALUES: ./ci/agent-values/datadog-agent-values-prod.yaml
     RELEASE_NAME: datadog-agent
-    DD_VALUES: ./ci/datadog-agent-ddvalues-prod.yaml
+    DD_VALUES: ./ci/agent-values/datadog-agent-ddvalues-prod.yaml
 
 # STAGING DEPLOY DEMO / AGENT 
 .staging-deploy: &staging-deploy
@@ -257,7 +257,7 @@ staging-deploy-gateway-demo-eks:
   !!merge <<: *staging-deploy
   variables:
     NAMESPACE: otel-gateway
-    VALUES: ./ci/values-gateway.yaml
+    VALUES: ./ci/demo-values/values-gateway.yaml
     NODE_GROUP: ng-5
     SCRIPT: ./ci/scripts/ci-deploy-demo.sh
     CLUSTER_NAME: dd-otel
@@ -306,8 +306,8 @@ 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/datadog-agent-values-staging.yaml
-    DD_VALUES: ./ci/datadog-agent-ddvalues-staging.yaml
+    VALUES: ./ci/agent-values/datadog-agent-values-staging.yaml
+    DD_VALUES: ./ci/agent-values/datadog-agent-ddvalues-staging.yaml
     RELEASE_NAME: datadog-agent
 # Agent env:dd-ingest-staging
 staging-deploy-dd-ingest-agent-eks:
@@ -318,6 +318,6 @@ 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/datadog-agent-values-dd-staging.yaml
-    DD_VALUES: ./ci/datadog-agent-values-dd.yaml
+    VALUES: ./ci/agent-values/datadog-agent-values-dd-staging.yaml
+    DD_VALUES: ./ci/agent-values/datadog-agent-values-dd.yaml
     RELEASE_NAME: datadog-agent-dd

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

@@ -24,14 +24,14 @@ install_demo() {
 
   # HELM COMMAND
   helm_cmd="helm --debug upgrade ${release_name} -n ${namespace} open-telemetry/opentelemetry-demo --install \
-    -f ./ci/values.yaml \
+    -f ./ci/demo-values/values.yaml \
     --set-string default.image.tag="v$CI_COMMIT_SHORT_SHA" \
     --set-string default.image.repository=${REGISTRY}"
 
   # REPLACEMENTS
   if [ -n "$nodeGroup" ]; then
-      # sed -i "s/PLACEHOLDER_NODE_GROUP/$nodeGroup/g" ./src/zookeeperservice/${zookeeper_deployment}
-      # sed -i "s/PLACEHOLDER_NODE_GROUP/$nodeGroup/g" ./src/orderproducerservice/${orderproducer_deployment}
+      sed -i "s/PLACEHOLDER_NODE_GROUP/$nodeGroup/g" ./src/zookeeperservice/${zookeeper_deployment}
+      sed -i "s/PLACEHOLDER_NODE_GROUP/$nodeGroup/g" ./src/orderproducerservice/${orderproducer_deployment}
       helm_cmd+=" --set default.schedulingRules.nodeSelector.\"alpha\\.eksctl\\.io/nodegroup-name\"=${nodeGroup}"
   fi
   if [ -n "$values" ]; then