From 556fad616e152c214c1fb7f7ff2604ba7752e3fd Mon Sep 17 00:00:00 2001
From: Pawel Szkamruk <pszkamruk@splunk.com>
Date: Wed, 13 Nov 2024 10:00:04 +0100
Subject: [PATCH] removing not needed env variables

---
 .../templates/config/_common.tpl              |  4 +--
 .../deployment-cluster-receiver.yaml          | 30 -------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl
index 4c29c33e07..4bfd5855ae 100644
--- a/helm-charts/splunk-otel-collector/templates/config/_common.tpl
+++ b/helm-charts/splunk-otel-collector/templates/config/_common.tpl
@@ -224,9 +224,7 @@ k8sattributes/clusterReceiver:
       - k8s.node.name
       - k8s.pod.name
       - k8s.pod.uid
-      - container.id
-      - container.image.name
-      - container.image.tag
+      - k8s.pod.ip
     annotations:
       - key: splunk.com/sourcetype
         from: pod
diff --git a/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml
index 76ca03fbb6..108181e039 100644
--- a/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml
+++ b/helm-charts/splunk-otel-collector/templates/deployment-cluster-receiver.yaml
@@ -91,15 +91,6 @@ spec:
           image: public.ecr.aws/amazonlinux/amazonlinux:latest
           imagePullPolicy: IfNotPresent
           command: ["bash", "-c", "/splunk-scripts/init-eks-fargate-cluster-receiver.sh"]
-          env:
-            - name: K8S_POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: K8S_NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
           volumeMounts:
             - name: init-eks-fargate-cluster-receiver-script
               mountPath: /splunk-scripts
@@ -132,27 +123,6 @@ spec:
         env:
           - name: SPLUNK_MEMORY_TOTAL_MIB
             value: "{{ include "splunk-otel-collector.convertMemToMib" $clusterReceiver.resources.limits.memory | int64 }}"
-          - name: K8S_NODE_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: spec.nodeName
-          - name: K8S_POD_IP
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: status.podIP
-          - name: K8S_POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-          - name: K8S_POD_UID
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.uid
-          - name: K8S_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
           {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }}
           - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN
             valueFrom: