flatten all image values

otterize · Aug 7, 2024 · 5b2aa9d · 5b2aa9d
1 parent 25bad88
commit 5b2aa9d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/network-mapper/templates/agent-daemonset.yaml b/network-mapper/templates/agent-daemonset.yaml
@@ -1,4 +1,4 @@
-{{ if or .Values.sniffer.enable .Values.ebpf.enable }}
+{{ if or .Values.sniffer.enable .Values.bpfman.enable }}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
@@ -72,9 +72,9 @@ spec:
 
       containers:
         - name: node-agent
-          image: "{{ .Values.agent.image.repository }}/{{ .Values.agent.image.image }}:{{ .Values.agent.image.tag }}"
-          {{ if .Values.agent.image.pullPolicy }}
-          imagePullPolicy: {{ .Values.agent.image.pullPolicy }}
+          image: "{{ .Values.agent.repository }}/{{ .Values.agent.image }}:{{ .Values.agent.tag }}"
+          {{ if .Values.agent.pullPolicy }}
+          imagePullPolicy: {{ .Values.agent.pullPolicy }}
           {{ end }}
           env:
             - name: POD_NAME
@@ -181,12 +181,14 @@ spec:
               readOnly: true
         {{ end }}
 
-        {{ if .Values.ebpf.enable }}
+        {{ if .Values.bpfman.enable }}
         - name: ebpf-agent
-          image: "{{ .Values.ebpf.image.repository }}/{{ .Values.ebpf.image.image }}:{{ .Values.ebpf.image.tag }}"
-          {{ if .Values.ebpf.image.pullPolicy }}
-          imagePullPolicy: {{ .Values.ebpf.image.pullPolicy }}
+          image: "{{ .Values.bpfman.repository }}/{{ .Values.bpfman.image }}:{{ .Values.bpfman.tag }}"
+
+          {{ if .Values.bpfman.pullPolicy }}
+          imagePullPolicy: {{ .Values.bpfman.pullPolicy }}
           {{ end }}
+
           securityContext:
             privileged: true
           volumeMounts:
@@ -197,7 +199,7 @@ spec:
               name: ebpfman-socket
           env:
             - name: RUST_LOG
-              value: "{{ .Values.ebpf.logLevel }}"
+              value: "{{ .Values.bpfman.logLevel }}"
         {{ end }}
 
 {{ end }}
diff --git a/network-mapper/values.yaml b/network-mapper/values.yaml
@@ -41,11 +41,10 @@ mapper:
 
 agent:
   enable: true
-  image:
-    repository: otterize
-    image: node-agent
-    tag: latest
-    pullPolicy:
+  repository: otterize
+  image: node-agent
+  tag: latest
+  pullPolicy:
   tolerations: []
   podSecurityContext:
     runAsNonRoot: false
@@ -144,13 +143,12 @@ visibilitydns:
   pullSecrets:
   resources: { } # see comment under mapper.resources
 
-ebpf:
+bpfman:
   enable: true
-  image:
-    repository: otterize
-    image: bpfman
-    tag: latest
-    pullPolicy:
+  repository: otterize
+  image: bpfman
+  tag: latest
+  pullPolicy:
   logLevel: info
 
 aws: