From ad6d967d9fa5d8f9e870f1503406cd8eca86d21a Mon Sep 17 00:00:00 2001
From: mytting <jianchang@yunshan.net>
Date: Mon, 17 Jul 2023 10:56:38 +0800
Subject: [PATCH] update to v6.2

---
 charts/deepflow-agent/templates/daemonset.yaml | 7 ++++++-
 charts/deepflow-agent/values.yaml              | 2 +-
 charts/deepflow/values.yaml                    | 8 ++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/charts/deepflow-agent/templates/daemonset.yaml b/charts/deepflow-agent/templates/daemonset.yaml
index aa16362..3ee9406 100644
--- a/charts/deepflow-agent/templates/daemonset.yaml
+++ b/charts/deepflow-agent/templates/daemonset.yaml
@@ -45,7 +45,7 @@ spec:
           privileged: true
         image: "{{ tpl .Values.image.repository . }}:{{ tpl (toString .Values.image.tag) . }}"
         imagePullPolicy: {{ tpl .Values.image.pullPolicy . }}
-        command: ["sysctl", "-w", "net.core.bpf_jit_enable=1"]
+        command: ["/bin/bash", "-c", "sysctl -w net.core.bpf_jit_enable=1 || true"]
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
@@ -86,6 +86,11 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
+          - name: K8S_MEM_LIMIT_FOR_DEEPFLOW
+            valueFrom:
+              resourceFieldRef:
+                divisor: 1Mi
+                resource: limits.memory
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
diff --git a/charts/deepflow-agent/values.yaml b/charts/deepflow-agent/values.yaml
index 724d3bf..ddebe46 100644
--- a/charts/deepflow-agent/values.yaml
+++ b/charts/deepflow-agent/values.yaml
@@ -15,7 +15,7 @@ image:
   repository: registry.cn-hongkong.aliyuncs.com/deepflow-ce
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: v6.2.6.5
+  tag: v6.2
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/charts/deepflow/values.yaml b/charts/deepflow/values.yaml
index e9cf575..7ebd04c 100644
--- a/charts/deepflow/values.yaml
+++ b/charts/deepflow/values.yaml
@@ -67,11 +67,11 @@ global:
 image:
   server:
     repository: "{{ .Values.global.image.repository }}/deepflow-server"
-    tag: v6.2.6.5
+    tag: v6.2
     pullPolicy: "{{ .Values.global.image.pullPolicy }}"
   app:
     repository:  "{{ .Values.global.image.repository }}/deepflow-app"
-    tag: v6.2.6.5
+    tag: v6.2
     pullPolicy: "{{ .Values.global.image.pullPolicy }}"
 
 imagePullSecrets: []
@@ -658,7 +658,7 @@ deepflow-agent:
     repository: "{{ .Values.global.image.repository }}/deepflow-agent"
     pullPolicy: "{{ .Values.global.image.pullPolicy }}"
     # Overrides the image tag whose default is the chart appVersion.
-    tag: v6.2.6.5
+    tag: v6.2
 
   imagePullSecrets: []
   nameOverride: ""
@@ -817,7 +817,7 @@ grafana:
 
   extraInitContainers:
     - name: init-custom-plugins
-      image: "{{ .Values.global.image.repository }}/deepflowio-init-grafana:v6.2.6.5"
+      image: "{{ .Values.global.image.repository }}/deepflowio-init-grafana:v6.2"
       imagePullPolicy: "{{ tpl .Values.global.image.pullPolicy . }}"
       volumeMounts:
       - name: custom-plugins