deploy(helm): fix agent daemonset & config

Signed-off-by: xiayu.lyt <xiayu.lyt@alibaba-inc.com>
dreamerlzl · May 8, 2024 · 9bdcaf1 · 9bdcaf1
1 parent de036e0
commit 9bdcaf1
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 55 deletions.
diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
@@ -5,8 +5,8 @@ type: application
 annotations:
   category: Analytics
   licenses: Apache-2.0
-version: 1.0.1
-appVersion: 1.0.0
+version: 1.0.2
+appVersion: 1.0.0-rc.1
 icon: https://img.shields.io/github/v/tag/alibaba/kubeskoop
 keywords:
   - kubeskoop

diff --git a/deploy/helm/templates/configMap.yaml → deploy/helm/templates/configmap.yaml b/deploy/helm/templates/configMap.yaml → deploy/helm/templates/configmap.yaml
@@ -6,7 +6,8 @@ metadata:
 data:
   config.yaml: |-
     debugmode: {{ .Values.agent.debug }}
-    port: {{ .Values.agent.port }}
+    port: {{ .Values.agent.config.port }}
+    enableController: {{ .Values.controller.enabled }}
     metrics:
       probes:
       {{- toYaml .Values.config.metricProbes | nindent 6 }}

diff --git a/deploy/helm/templates/daemonset.yaml b/deploy/helm/templates/daemonset.yaml
@@ -30,7 +30,7 @@ spec:
           image: "{{ .btfhack.repository }}:{{ .btfhack.tag }}"
           imagePullPolicy: {{ .btfhack.imagePullPolicy }}
           volumeMounts:
-            - name: bpfdir
+            - name: btf-rawdata
               mountPath: /etc/net-exporter/btf
             - mountPath: /boot/
               name: boot
@@ -41,40 +41,44 @@ spec:
             - /etc/net-exporter/btf/
       {{- end }}
       containers:
-        - name: inspector
-          image:  "{{ .image.repository }}:{{ .image.tag }}"
-          imagePullPolicy: {{ .image.imagePullPolicy }}
-          env:
-          - name: INSPECTOR_NODENAME
-            valueFrom:
-              fieldRef:
-                fieldPath: spec.nodeName
-          volumeMounts:
-            - name: configvolume
-              mountPath: /etc/config/
-            - name: bpfdir
-              mountPath: /etc/net-exporter/btf
-            - name: procfs
-              mountPath: /proc
-            - mountPath: /run/containerd/containerd.sock
-              name: runtimeendpoint
-            - mountPath: /var/run/
-              name: rundir
-            - mountPath: /sys/fs/bpf
-              name: bpfmap
-              mountPropagation: HostToContainer
-            - mountPath: /sys/kernel/debug
-              name: bpfdebugfs
-              mountPropagation: HostToContainer
-            - mountPath: /etc/node-hostname
-              name: hostname
-          command:
-            - /bin/inspector
-            - server
-          securityContext:
-            privileged: true
-          resources:
-            {{- toYaml .resources | nindent 12 }}
+      - name: inspector
+        image:  "{{ .image.repository }}:{{ .image.tag }}"
+        imagePullPolicy: {{ .image.imagePullPolicy }}
+        env:
+        - name: INSPECTOR_NODENAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
+        volumeMounts:
+          - name: config-volume
+            mountPath: /etc/config/
+          - name: btf-rawdata
+            mountPath: /etc/net-exporter/btf
+          - name: proc
+            mountPath: /proc
+          - mountPath: /run/containerd/
+            name: containerd
+          - mountPath: /var/run/
+            name: dockershim
+          - mountPath: /sys/fs/bpf
+            name: bpf-maps
+            mountPropagation: HostToContainer
+          - mountPath: /sys/fs/cgroup
+            name: cgroup
+            mountPropagation: HostToContainer
+          - mountPath: /sys/kernel/debug
+            name: bpf-events
+            mountPropagation: HostToContainer
+          - mountPath: /etc/node-hostname
+            name: hostname
+        command:
+          - /bin/inspector
+          - server
+          - -d
+        securityContext:
+          privileged: true
+        resources:
+          {{- toYaml .resources | nindent 12 }}
       {{- with .nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -84,32 +88,37 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       volumes:
-        - name: procfs
+        - name: proc
           hostPath:
             path: /proc
-        - name: runtimeendpoint
-          hostPath:
-            path: {{ .config.runtimeEndpoint }}
-        - name: boot
+        - name: containerd
           hostPath:
-            path: /boot/
-        - name: rundir
+            path: /run/containerd/
+        - name: dockershim
           hostPath:
             path: /var/run/
         - hostPath:
             path: /sys/fs/bpf
             type: DirectoryOrCreate
-          name: bpfmap
+          name: bpf-maps
+        - name: boot
+          hostPath:
+            path: /boot
+            type: DirectoryOrCreate
+        - hostPath:
+            path: /sys/fs/cgroup
+            type: DirectoryOrCreate
+          name: cgroup
         - hostPath:
             path: /sys/kernel/debug
-          name: bpfdebugfs
+          name: bpf-events
         - name: hostname
           hostPath:
             path: /etc/hostname
             type: FileOrCreate
-        - name: configvolume
+        - name: config-volume
           configMap:
             name: kubeskoop-config
-        - name: bpfdir
+        - name: btf-rawdata
           emptyDir: {}
 {{- end }}
diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -9,7 +9,6 @@ config:
     - name: tcp
     - name: tcpext
     - name: udp
-    - name: kernellatency
     - name: packetloss
     - name: flow
       args:
@@ -28,10 +27,9 @@ agent:
   config:
     debug: false
     port: 9102
-    runtimeEndpoint: /run/containerd/containerd.sock
   image:
     repository: kubeskoop/agent
-    tag: v1.0.0
+    tag: v1.0.0-rc.1
     imagePullPolicy: IfNotPresent
   resources:
     limits:
@@ -43,7 +41,7 @@ agent:
   btfhack:
     enabled: true
     repository: kubeskoop/agent
-    tag: v1.0.0
+    tag: v1.0.0-rc.1
     imagePullPolicy: IfNotPresent
   nodeSelector: {}
   tolerations: {}
@@ -56,7 +54,7 @@ controller:
     lokiEndpoint: http://loki-service:3100
   image:
     repository: kubeskoop/controller
-    tag: v1.0.0
+    tag: v1.0.0-rc.1
     imagePullPolicy: IfNotPresent
   resources:
     limits:
@@ -85,7 +83,7 @@ webconsole:
     password: kubeskoop
   image:
     repository: kubeskoop/controller
-    tag: v1.0.0
+    tag: v1.0.0-rc.1
     imagePullPolicy: IfNotPresent
   resources:
     limits: