Removing seprating ec2 and eks options changes into a different PR

dloucasfx · dloucasfx · commit c5be18d9ccb2 · 2025-06-04T11:51:01.000-04:00
Signed-off-by: Dani Louca &lt;dlouca@splunk.com&gt;
diff --git a/examples/distribution-eks-automode/rendered_manifests/configmap-agent.yaml b/examples/distribution-eks-automode/rendered_manifests/configmap-agent.yaml
@@ -136,24 +136,8 @@ data:
         detectors:
         - env
         - eks
+        - ec2
         - system
-        eks:
-          node_from_env_var: K8S_NODE_NAME
-          resource_attributes:
-            cloud.account.id:
-              enabled: true
-            cloud.availability_zone:
-              enabled: true
-            cloud.region:
-              enabled: true
-            host.id:
-              enabled: true
-            host.image.id:
-              enabled: true
-            host.name:
-              enabled: true
-            host.type:
-              enabled: true
         override: true
         timeout: 15s
     receivers:
diff --git a/examples/distribution-eks-automode/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-eks-automode/rendered_manifests/configmap-cluster-receiver.yaml
@@ -76,24 +76,8 @@ data:
         detectors:
         - env
         - eks
+        - ec2
         - system
-        eks:
-          node_from_env_var: K8S_NODE_NAME
-          resource_attributes:
-            cloud.account.id:
-              enabled: true
-            cloud.availability_zone:
-              enabled: true
-            cloud.region:
-              enabled: true
-            host.id:
-              enabled: true
-            host.image.id:
-              enabled: true
-            host.name:
-              enabled: true
-            host.type:
-              enabled: true
         override: true
         timeout: 15s
     receivers:
diff --git a/examples/distribution-eks-automode/rendered_manifests/daemonset.yaml b/examples/distribution-eks-automode/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 6707d46e0c5ee56a70f729b82fab8f81d581e4dd5edd94355f10a31f3f2c3b5e
+        checksum/config: f091be5f814c5297691c5e4e6baea7df43ca38f05ff3cc2adc714680651e4bf6
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true
diff --git a/examples/distribution-eks-automode/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks-automode/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 16a5839c1a7f984f5d6f035a21042d90af607ecd14607ae37b949d25e6b58441
+        checksum/config: ac936ae115d54dedf85e5fcf262831b5528a5bc57b749745d26cdc6143a0bf4d
     spec:
       hostNetwork: true
       serviceAccountName: default-splunk-otel-collector
diff --git a/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml
@@ -72,24 +72,8 @@ data:
         detectors:
         - env
         - eks
+        - ec2
         - system
-        eks:
-          node_from_env_var: K8S_NODE_NAME
-          resource_attributes:
-            cloud.account.id:
-              enabled: true
-            cloud.availability_zone:
-              enabled: true
-            cloud.region:
-              enabled: true
-            host.id:
-              enabled: true
-            host.image.id:
-              enabled: true
-            host.name:
-              enabled: true
-            host.type:
-              enabled: true
         override: true
         timeout: 15s
     receivers:
diff --git a/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml
@@ -135,24 +135,8 @@ data:
         detectors:
         - env
         - eks
+        - ec2
         - system
-        eks:
-          node_from_env_var: K8S_NODE_NAME
-          resource_attributes:
-            cloud.account.id:
-              enabled: true
-            cloud.availability_zone:
-              enabled: true
-            cloud.region:
-              enabled: true
-            host.id:
-              enabled: true
-            host.image.id:
-              enabled: true
-            host.name:
-              enabled: true
-            host.type:
-              enabled: true
         override: true
         timeout: 15s
     receivers:
diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml
@@ -33,7 +33,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: c42ce4fc7d4da01255ba96b6f0fcd9a3c860318b7ac209c9c4c42305a278b4e5
+        checksum/config: b02c96cb6a703426c5995cd528481204c6544f7ebd5b87cee278efbc2b6026ee
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:
diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: 4e4f33d0eae41ad0942ee56c9167dc785f71de8152639ddbf54403144e911866
+        checksum/config: 214315940aed3f1e5a36eaa21d32f758ed9abce963fbb5df9d18199041f7c5f7
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:
diff --git a/examples/distribution-eks/rendered_manifests/configmap-agent.yaml b/examples/distribution-eks/rendered_manifests/configmap-agent.yaml
@@ -136,24 +136,8 @@ data:
         detectors:
         - env
         - eks
+        - ec2
         - system
-        eks:
-          node_from_env_var: K8S_NODE_NAME
-          resource_attributes:
-            cloud.account.id:
-              enabled: true
-            cloud.availability_zone:
-              enabled: true
-            cloud.region:
-              enabled: true
-            host.id:
-              enabled: true
-            host.image.id:
-              enabled: true
-            host.name:
-              enabled: true
-            host.type:
-              enabled: true
         override: true
         timeout: 15s
     receivers:
diff --git a/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml
@@ -76,24 +76,8 @@ data:
         detectors:
         - env
         - eks
+        - ec2
         - system
-        eks:
-          node_from_env_var: K8S_NODE_NAME
-          resource_attributes:
-            cloud.account.id:
-              enabled: true
-            cloud.availability_zone:
-              enabled: true
-            cloud.region:
-              enabled: true
-            host.id:
-              enabled: true
-            host.image.id:
-              enabled: true
-            host.name:
-              enabled: true
-            host.type:
-              enabled: true
         override: true
         timeout: 15s
     receivers:
diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 6707d46e0c5ee56a70f729b82fab8f81d581e4dd5edd94355f10a31f3f2c3b5e
+        checksum/config: f091be5f814c5297691c5e4e6baea7df43ca38f05ff3cc2adc714680651e4bf6
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true
diff --git a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 16a5839c1a7f984f5d6f035a21042d90af607ecd14607ae37b949d25e6b58441
+        checksum/config: ac936ae115d54dedf85e5fcf262831b5528a5bc57b749745d26cdc6143a0bf4d
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:
diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl
@@ -77,7 +77,9 @@ resourcedetection:
     {{- else if eq (include "splunk-otel-collector.distribution" .) "aks" }}
     - aks
     {{- end }}
-    {{- if eq (include "splunk-otel-collector.cloudProvider" .) "azure" }}
+    {{- if eq (include "splunk-otel-collector.cloudProvider" .) "aws" }}
+    - ec2
+    {{- else if eq (include "splunk-otel-collector.cloudProvider" .) "azure" }}
     - azure
     {{- end }}
     # The `system` detector goes last so it can't preclude cloud detectors from setting host/os info.
@@ -88,28 +90,11 @@ resourcedetection:
     resource_attributes:
       k8s.cluster.name:
         enabled: true
-  {{- else if hasPrefix "eks" (include "splunk-otel-collector.distribution" .) }}
+  {{- else if and (hasPrefix "eks" (include "splunk-otel-collector.distribution" .)) (not .Values.clusterName) }}
   eks:
-    node_from_env_var: K8S_NODE_NAME
     resource_attributes:
-      {{- if (not .Values.clusterName) }}
       k8s.cluster.name:
         enabled: true
-      {{- end }}
-      host.id:
-        enabled: true
-      cloud.region:
-        enabled: true
-      cloud.availability_zone:
-        enabled: true
-      cloud.account.id:
-        enabled: true
-      host.name:
-        enabled: true
-      host.image.id:
-        enabled: true
-      host.type:
-        enabled: true
   {{- end }}
   override: true
   timeout: 15s
@@ -165,7 +150,6 @@ resourcedetection/k8s_cluster_name:
         enabled: false
   {{- else if hasPrefix "eks" (include "splunk-otel-collector.distribution" .) }}
   eks:
-    node_from_env_var: K8S_NODE_NAME
     resource_attributes:
       k8s.cluster.name:
         enabled: true
diff --git a/helm-charts/splunk-otel-collector/values.schema.json b/helm-charts/splunk-otel-collector/values.schema.json
@@ -775,7 +775,10 @@
         },
         "hostNetwork": {
           "description": "Host network allows container to use networking stack of the host machine",
-          "type": ["null", "boolean"],
+          "type": [
+            "null",
+            "boolean"
+          ],
           "optional": true
         },
         "podLabels": {
diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml
@@ -563,7 +563,7 @@ clusterReceiver:
   k8sObjects: []
 
   # hostNetwork schedules the pod with the host's network namespace.
-  # The default value depends on distribution option: true for eks/auto-mode, otherwise false
+  # The default value depends on distribution option: true for eks/auto-mode, otherwise false.
   # Disregarded for Windows (unsupported by k8s).
   hostNetwork:
 
