move configmap to helper template

Author: NimrodAvni78

charts/opentelemetry-ebpf-instrumentation/examples/default/rendered/configmap.yaml

@@ -15,14 +15,14 @@ metadata:
     app.kubernetes.io/component: config
 data:
   ebpf-instrument-config.yml: |
-    discovery:
-      services:
-        - k8s_namespace: .
-      exclude_services:
-        - exe_path: ".*ebpf-instrument.*|.*otelcol.*"
     attributes:
       kubernetes:
         enable: true
+    discovery:
+      exclude_services:
+      - exe_path: .*ebpf-instrument.*|.*otelcol.*
+      services:
+      - k8s_namespace: .
     filter:
       network:
         k8s_dst_owner_name:

charts/opentelemetry-ebpf-instrumentation/examples/default/rendered/daemonset.yaml

@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 38494832e2d0254bc1eb17e86788cec59c5f5c607cc486a44dc90fa20517c46d
+        checksum/config: 2ddd12b5cac5f3eab28d8bc500cb3db81df076a39a5143c879aed1772dfdc4ee
       labels:
         helm.sh/chart: opentelemetry-ebpf-instrumentation-0.1.0
         app.kubernetes.io/name: opentelemetry-ebpf-instrumentation

charts/opentelemetry-ebpf-instrumentation/templates/_helpers.tpl

@@ -133,3 +133,22 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{ toYaml . }}
 {{- end }}
 {{- end }}
+
+{{/*
+Generate the configmap data based on preset and configuration values
+*/}}
+{{- define "obi.configData" -}}
+{{- $config := deepCopy .Values.config.data }}
+{{- if eq .Values.preset "network" }}
+{{- if not .Values.config.data.network }}
+{{- $_ := set $config "network" (dict "enable" true) }}
+{{- end }}
+{{- end }}
+{{- if eq .Values.preset "application" }}
+{{- if not .Values.config.data.discovery }}
+{{- $discovery := dict "services" (list (dict "k8s_namespace" ".")) "exclude_services" (list (dict "exe_path" ".*ebpf-instrument.*|.*otelcol.*")) }}
+{{- $_ := set $config "discovery" $discovery }}
+{{- end }}
+{{- end }}
+{{- toYaml $config }}
+{{- end }}

charts/opentelemetry-ebpf-instrumentation/templates/configmap.yaml

@@ -18,20 +18,5 @@ metadata:
   {{- end }}
 data:
   ebpf-instrument-config.yml: |
-    {{- if eq .Values.preset "network" }}
-    {{- if not .Values.config.data.network }}
-    network:
-      enable: true
-    {{- end }}
-    {{- end }}
-    {{- if eq .Values.preset "application" }}
-    {{- if not .Values.config.data.discovery }}
-    discovery:
-      services:
-        - k8s_namespace: .
-      exclude_services:
-        - exe_path: ".*ebpf-instrument.*|.*otelcol.*"
-    {{- end }}
-    {{- end }}
-  {{- toYaml .Values.config.data | nindent 4}}
+{{- include "obi.configData" . | nindent 4 }}
 {{- end }}