Train 3556 update configmap (#123)

## Description
Adds the value for `NEXT_PUBLIC_DD_VERSION_FRONTEND` to the configmap
for Storedog. Also sets `DD_ENV` to be set with an environment variable
in the configmap. These variables are set when running `subenvt` before
applying the configmap.

## How to test
Use the k8s sandbox to run Storedog from this branch
Check RUM version in Datadog UI

Author: arosenkranz

k8s-manifests/README.md

@@ -105,6 +105,7 @@ The deployment process uses several environment variables to template image loca
 |-------------------------------|---------------------------------------------|---------------------------------|
 | `REGISTRY_URL`                | Container registry base URL                 | `localhost:5000`               |
 | `SD_TAG`                      | Storedog image tag/version                  | `latest`                       |
+| `DD_ENV`                      | Datadog environment                         | `storedog-k8s`                 |
 | `DD_VERSION_ADS`              | Version tag for ads service                 | `1.0.0`                        |
 | `DD_VERSION_ADS_PYTHON`       | Version tag for ads Python service (optional) | `1.0.0`                        |
 | `DD_VERSION_BACKEND`          | Version tag for backend & worker services   | `1.0.0`                        |
@@ -139,6 +140,7 @@ export SD_TAG=1.5.0
 ### Set environment variables for Storedog
 
 ```bash
+export DD_ENV=storedog-k8s
 export DD_VERSION_ADS=1.0.0
 export DD_VERSION_ADS_PYTHON=1.0.0
 export DD_VERSION_BACKEND=1.0.0
@@ -147,7 +149,7 @@ export DD_VERSION_NGINX=1.28.0
 export NEXT_PUBLIC_DD_VERSION_FRONTEND=1.0.0
 ```
 
-The Datadog environment variable `DD_ENV` is set in two places. Update both values as needed.
+The Datadog environment variable `DD_ENV` is set in two places. Update both values as needed. The commands below uses `envsubst` to update the variable values in place before applying the definition file.
 
 * The `datadog/datadog-agent.yaml` file on line 19.
 * The `storedog-app/configmaps/storedog-config.yaml` file on line 22.
@@ -169,19 +171,19 @@ helm install datadog-operator datadog/datadog-operator
 
 ```bash
 kubectl create secret generic datadog-secret \
-  --from-literal api-key=$DD_API_KEY \
-  --from-literal app-key=$DD_APP_KEY
+  --from-literal api-key=${DD_API_KEY} \
+  --from-literal app-key=${DD_APP_KEY}
 ```
 
-3. Apply the Datadog Agent definition:
+3. Apply the Datadog Agent definition and use `envsubst` to substitute the environment variable in the definition file.
 
 ```bash
-kubectl apply -f k8s-manifests/datadog/datadog-agent.yaml
+envsubst < k8s-manifests/datadog/datadog-agent.yaml | kubectl apply -f -
 ```
 
 ### Deploy Cluster Setup and Storedog
 
-The storedog-app definition files contain variables which need to be set before applying them to the cluster. The command below uses `envsubst` to update the variable values in place before applying the definition file.
+The storedog-app definition files contain variables which need to be set before applying them to the cluster. The command below uses `envsubst` to substitute the environment variable in the definition file.
 
 1. **Deploy Cluster Components (one-time setup per cluster):**
 

k8s-manifests/datadog/datadog-agent.yaml

@@ -16,7 +16,7 @@ spec:
         secretName: datadog-secret
         keyName: app-key
     tags:
-      - "env:storedog-k8s"
+      - "env:${DD_ENV}"
   features:
     logCollection: # Logs
       enabled: true

k8s-manifests/storedog-app/configmaps/shared-config.yaml

@@ -18,4 +18,5 @@ data:
   NEXT_PUBLIC_SPREE_CLIENT_HOST: /services/backend
   NEXT_PUBLIC_SPREE_IMAGE_HOST: /services/backend
   NEXT_PUBLIC_SPREE_ALLOWED_IMAGE_DOMAIN: service-proxy
-  DD_ENV: storedog-k8s
+  NEXT_PUBLIC_DD_VERSION_FRONTEND: ${NEXT_PUBLIC_DD_VERSION_FRONTEND}
+  DD_ENV: ${DD_ENV}

k8s-manifests/storedog-app/deployments/frontend.yaml

@@ -88,6 +88,11 @@ spec:
                 configMapKeyRef:
                   name: storedog-config
                   key: NEXT_PUBLIC_SPREE_ALLOWED_IMAGE_DOMAIN
+            - name: NEXT_PUBLIC_DD_VERSION_FRONTEND
+              valueFrom:
+                configMapKeyRef:
+                  name: storedog-config
+                  key: NEXT_PUBLIC_DD_VERSION_FRONTEND
             - name: NEXT_PUBLIC_DD_ENV
               valueFrom:
                 configMapKeyRef:
@@ -111,7 +116,10 @@ spec:
             - name: DD_SERVICE
               value: store-frontend-api
             - name: DD_VERSION
-              value: ${NEXT_PUBLIC_DD_VERSION_FRONTEND}
+              valueFrom:
+                configMapKeyRef:
+                  name: storedog-config
+                  key: NEXT_PUBLIC_DD_VERSION_FRONTEND
             - name: DD_RUNTIME_METRICS_ENABLED
               value: "true"
             - name: DD_PROFILING_ENABLED

services/dbm/README.md

@@ -186,8 +186,8 @@ helm install datadog-operator datadog/datadog-operator
 
 ```bash
 kubectl create secret generic datadog-secret \
- --from-literal api-key=$DD_API_KEY \
- --from-literal app-key=$DD_APP_KEY \
+ --from-literal api-key=${DD_API_KEY} \
+ --from-literal app-key=${DD_APP_KEY} \
  --from-literal=dd_application_id=${DD_APPLICATION_ID} \
  --from-literal=dd_client_token=${DD_CLIENT_TOKEN}
 ```

services/dbm/k8s-manifests/datadog/datadog-agent.yaml

@@ -19,7 +19,7 @@ spec:
         secretName: datadog-secret
         keyName: app-key
     tags:
-      - "env:storedog-k8s"
+      - "env:${DD_ENV}"
   features:
     logCollection: # Logs
       enabled: true

services/dbm/k8s-manifests/storedog-app/deployments/dbm.yaml

@@ -62,9 +62,12 @@ spec:
                   name: storedog-config
                   key: DB_HOST
             - name: DD_ENV
-              value: ${DD_ENV}
+              valueFrom:
+                configMapKeyRef:
+                  name: storedog-config
+                  key: DD_ENV
             - name: DD_SERVICE
-              value: storedog-dbm
+              value: store-dbm
             - name: DD_VERSION
               value: ${DD_VERSION_DBM}
             - name: DD_DBM_PROPAGATION_MODE