From 40adbc3550c68f621b1efaa79916c8125c944132 Mon Sep 17 00:00:00 2001
From: moleyi <moleyi@yunshan.net>
Date: Wed, 25 Sep 2024 04:11:17 +0000
Subject: [PATCH] add config K8S_WATCH_POLICY

---
 charts/deepflow-agent/Chart.yaml                       |  4 ++--
 charts/deepflow-agent/templates/daemonset.yaml         |  4 ++++
 .../deepflow-agent/templates/watcher-deployment.yaml   |  4 ++--
 charts/deepflow-agent/values.yaml                      |  3 ++-
 charts/deepflow/Chart.yaml                             |  4 ++--
 charts/deepflow/values.yaml                            | 10 +++++-----
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/charts/deepflow-agent/Chart.yaml b/charts/deepflow-agent/Chart.yaml
index a161892..5dc2f94 100644
--- a/charts/deepflow-agent/Chart.yaml
+++ b/charts/deepflow-agent/Chart.yaml
@@ -3,8 +3,8 @@ description: An automated observability platform for cloud-native developers.
 name: deepflow-agent
 engine: gotpl
 type: application
-version: 6.6.010
-appVersion: "6.6.4"
+version: 6.6.011
+appVersion: "6.6.5"
 kubeVersion: ">=1.16.0-0"
 sources:
   - https://github.com/deepflowio/deepflow
diff --git a/charts/deepflow-agent/templates/daemonset.yaml b/charts/deepflow-agent/templates/daemonset.yaml
index 2753a50..07fbec1 100644
--- a/charts/deepflow-agent/templates/daemonset.yaml
+++ b/charts/deepflow-agent/templates/daemonset.yaml
@@ -101,6 +101,10 @@ spec:
           - name: CTRL_NETWORK_INTERFACE
             value: "eth0"
           {{- end }}
+          {{- if .Values.AgentWatchDisabled }}
+          - name: K8S_WATCH_POLICY
+            value: "watch-disabled"
+          {{- end }}
           - name: K8S_POD_IP_FOR_DEEPFLOW
             valueFrom:
               fieldRef:
diff --git a/charts/deepflow-agent/templates/watcher-deployment.yaml b/charts/deepflow-agent/templates/watcher-deployment.yaml
index d43eee3..76a9e67 100644
--- a/charts/deepflow-agent/templates/watcher-deployment.yaml
+++ b/charts/deepflow-agent/templates/watcher-deployment.yaml
@@ -53,8 +53,8 @@ spec:
           #   initialDelaySeconds: 5
           #   periodSeconds: 10
           env:
-          - name: ONLY_WATCH_K8S_RESOURCE
-            value: "true"
+          - name: K8S_WATCH_POLICY
+            value: "watch-only"
           {{- range .Values.env}}
           - name: {{ .name }}
             value: {{ .value }}
diff --git a/charts/deepflow-agent/values.yaml b/charts/deepflow-agent/values.yaml
index 1458525..d6f1bf0 100644
--- a/charts/deepflow-agent/values.yaml
+++ b/charts/deepflow-agent/values.yaml
@@ -14,12 +14,13 @@ deployComponent:
 # - "watcher"
 # 
 tke_sidecar: false
+AgentWatchDisabled: false  # Whether to disable the watch for Agent configured through daemonset
 
 image:
   repository: registry.cn-hongkong.aliyuncs.com/deepflow-ce/deepflow-agent
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: v6.6.4
+  tag: v6.6.5
 
 env: []
 
diff --git a/charts/deepflow/Chart.yaml b/charts/deepflow/Chart.yaml
index 444dc3f..6647a5a 100644
--- a/charts/deepflow/Chart.yaml
+++ b/charts/deepflow/Chart.yaml
@@ -3,8 +3,8 @@ description: An automated observability platform for cloud-native developers.
 name: deepflow
 engine: gotpl
 type: application
-version: 6.6.010
-appVersion: "6.6.4"
+version: 6.6.011
+appVersion: "6.6.5"
 kubeVersion: ">=1.16.0-0"
 sources:
   - https://github.com/deepflowio/deepflow
diff --git a/charts/deepflow/values.yaml b/charts/deepflow/values.yaml
index 79e8412..001d9b0 100644
--- a/charts/deepflow/values.yaml
+++ b/charts/deepflow/values.yaml
@@ -70,11 +70,11 @@ global:
 image:
   server:
     repository: "{{ .Values.global.image.repository }}/deepflow-server"
-    tag: v6.6.4
+    tag: v6.6.5
     pullPolicy: "{{ .Values.global.image.pullPolicy }}"
   app:
     repository:  "{{ .Values.global.image.repository }}/deepflow-app"
-    tag: v6.6.4
+    tag: v6.6.5
     pullPolicy: "{{ .Values.global.image.pullPolicy }}"
 
 imagePullSecrets: []
@@ -667,7 +667,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.6.4
+    tag: v6.6.5
 
   imagePullSecrets: []
   nameOverride: ""
@@ -679,7 +679,7 @@ deepflow-agent:
   # - "watcher"
   # 
   tke_sidecar: false
-
+  AgentWatchDisabled: false  # Whether to disable the watch for Agent configured through daemonset
   podAnnotations: {}
   nodeIPInjection: true
   podSecurityContext: {}
@@ -836,7 +836,7 @@ grafana:
 
   extraInitContainers:
     - name: init-custom-plugins
-      image: "{{ .Values.global.image.repository }}/deepflowio-init-grafana:v6.6.4"
+      image: "{{ .Values.global.image.repository }}/deepflowio-init-grafana:v6.6.5"
       imagePullPolicy: "{{ tpl .Values.global.image.pullPolicy . }}"
       volumeMounts:
       - name: custom-plugins