Pass the namespace to k8sattributes in CI

gcp/helmfile.yaml

@@ -21,8 +21,9 @@ environments:
     values:
       - namespace: otel-demo
   cicd:
-    values: []
-    # namespace must be specified on the command line
+    values:
+      - single_namespace: true
+      # namespace must be specified on the command line
 ---
 repositories:
   - name: open-telemetry
@@ -36,3 +37,4 @@ releases:
     values:
       - opentelemetry-demo-values.yaml
       - opentelemetry-demo-workload-identity.yaml.gotmpl
+      - opentelemetry-demo-cicd.yaml.gotmpl

gcp/opentelemetry-demo-cicd.yaml.gotmpl

@@ -0,0 +1,26 @@
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# this file is used by Helm chart launch steps.
+# when merging YAML with the default values, objects are merged but lists are overwritten.
+# so, where a list is used, we have copied the defaults from the upstream values to preserve them.
+
+{{ if .Values | getOrNil "single_namespace" }}
+opentelemetry-collector:
+  config:
+    processors:
+      k8sattributes:
+        filter:
+          namespace: {{ .Values.namespace }}
+{{ end }}