diff --git a/charts/deepflow-agent/Chart.yaml b/charts/deepflow-agent/Chart.yaml index 5dc2f94..8fb0456 100644 --- a/charts/deepflow-agent/Chart.yaml +++ b/charts/deepflow-agent/Chart.yaml @@ -3,7 +3,7 @@ description: An automated observability platform for cloud-native developers. name: deepflow-agent engine: gotpl type: application -version: 6.6.011 +version: 6.6.012 appVersion: "6.6.5" kubeVersion: ">=1.16.0-0" sources: diff --git a/charts/deepflow-agent/templates/daemonset.yaml b/charts/deepflow-agent/templates/daemonset.yaml index 07fbec1..aeea0e5 100644 --- a/charts/deepflow-agent/templates/daemonset.yaml +++ b/charts/deepflow-agent/templates/daemonset.yaml @@ -15,7 +15,7 @@ spec: checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} checksum/customConfig: {{ sha256sum (print .Values.deepflowAgentConfig) }} container.apparmor.security.beta.kubernetes.io/deepflow-agent: unconfined - {{- if .Values.tke_sidecar }} + {{- if .Values.tkeSidecar }} eks.tke.cloud.tencent.com/ds-injection: "true" {{- end }} {{- with .Values.podAnnotations }} @@ -56,7 +56,7 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ tpl .Values.image.repository . }}:{{ tpl (toString .Values.image.tag) . }}" imagePullPolicy: {{ tpl .Values.image.pullPolicy . }} - {{- if .Values.tke_sidecar }} + {{- if .Values.tkeSidecar }} command: - /usr/bin/deepflow-agent args: @@ -97,18 +97,18 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name - {{- if .Values.tke_sidecar }} + {{- if .Values.tkeSidecar }} - name: CTRL_NETWORK_INTERFACE value: "eth0" {{- end }} - {{- if .Values.AgentWatchDisabled }} + {{- if .Values.daemonsetWatchDisabled }} - name: K8S_WATCH_POLICY value: "watch-disabled" {{- end }} - name: K8S_POD_IP_FOR_DEEPFLOW valueFrom: fieldRef: - {{- if .Values.tke_sidecar }} + {{- if .Values.tkeSidecar }} fieldPath: status.hostIP {{- else }} fieldPath: status.podIP diff --git a/charts/deepflow-agent/values.yaml b/charts/deepflow-agent/values.yaml index d6f1bf0..e9ededf 100644 --- a/charts/deepflow-agent/values.yaml +++ b/charts/deepflow-agent/values.yaml @@ -13,8 +13,8 @@ deployComponent: - "daemonset" # - "watcher" # -tke_sidecar: false -AgentWatchDisabled: false # Whether to disable the watch for Agent configured through daemonset +tkeSidecar: false +daemonsetWatchDisabled: false # Whether to disable the watch for Agent configured through daemonset image: repository: registry.cn-hongkong.aliyuncs.com/deepflow-ce/deepflow-agent diff --git a/charts/deepflow/Chart.yaml b/charts/deepflow/Chart.yaml index 6647a5a..4007855 100644 --- a/charts/deepflow/Chart.yaml +++ b/charts/deepflow/Chart.yaml @@ -3,7 +3,7 @@ description: An automated observability platform for cloud-native developers. name: deepflow engine: gotpl type: application -version: 6.6.011 +version: 6.6.012 appVersion: "6.6.5" kubeVersion: ">=1.16.0-0" sources: diff --git a/charts/deepflow/values.yaml b/charts/deepflow/values.yaml index 001d9b0..432a2b1 100644 --- a/charts/deepflow/values.yaml +++ b/charts/deepflow/values.yaml @@ -678,8 +678,8 @@ deepflow-agent: - "daemonset" # - "watcher" # - tke_sidecar: false - AgentWatchDisabled: false # Whether to disable the watch for Agent configured through daemonset + tkeSidecar: false + daemonsetWatchDisabled: false # Whether to disable the watch for Agent configured through daemonset podAnnotations: {} nodeIPInjection: true podSecurityContext: {}