Refactor agent environment variable configuration to use 'envs' instead of 'env'

chenzhiguo · chenzhiguo · commit 345d465ecf7b · 2025-04-09T17:04:16.000+08:00
diff --git a/deploy/all-cr.yaml b/deploy/all-cr.yaml
@@ -462,7 +462,7 @@ data:
     agent:
       image: ghcr.m.daocloud.io/jd-opensource/joylive-agent
       version: v1.6.0
-      env:
+      envs:
         JAVA_TOOL_OPTIONS: -javaagent:/joylive/live.jar
   logback.xml: |
     <?xml version="1.0" encoding="UTF-8"?>
diff --git a/deploy/joylive-injector/config/injector.yaml b/deploy/joylive-injector/config/injector.yaml
@@ -2,5 +2,5 @@
 agent:
   image: {{ .Values.agent.image.repository }}
   version: {{ .Values.agent.image.tag }}
-  env:
-    {{ .Values.agent.env }}: -javaagent:/joylive/live.jar
+  envs:
+    {{- toYaml .Values.agent.envs | nindent 4 }}
diff --git a/deploy/joylive-injector/values.yaml b/deploy/joylive-injector/values.yaml
@@ -35,7 +35,8 @@ serviceAccount:
   name: joylive-injector
 
 agent:
-  env: JAVA_TOOL_OPTIONS
+  envs:
+    JAVA_TOOL_OPTIONS: -javaagent:/joylive/live.jar
   image:
     repository: ghcr.m.daocloud.io/jd-opensource/joylive-agent
     tag: v1.6.0
diff --git a/deploy/packages/joylive-injector-1.3.7.tgz b/deploy/packages/joylive-injector-1.3.7.tgz
diff --git a/pkg/config/injector.go b/pkg/config/injector.go
@@ -13,7 +13,7 @@ type AgentInjectorConfig struct {
 type Agent struct {
 	Image   string            `yaml:"image"`
 	Version string            `yaml:"version"`
-	Env     map[string]string `json:"env"`
+	Envs    map[string]string `json:"envs"`
 }
 
 func GetAgentInjectConfig(yamlData string) (*AgentInjectorConfig, error) {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ type AgentInjectorConfig struct {`
`13`	`13`	`type Agent struct {`
`14`	`14`	Image string `yaml:"image"`
`15`	`15`	Version string `yaml:"version"`
`16`		- Env map[string]string `json:"env"`
	`16`	+ Envs map[string]string `json:"envs"`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`func GetAgentInjectConfig(yamlData string) (*AgentInjectorConfig, error) {`