Skip to content

Commit 139906d

Browse files
committed
Set default value for laneSpaceId and enable CONFIG_LANE_ENABLED in environment mapping
1 parent d5fa1fa commit 139906d

File tree

4 files changed

+3
-2
lines changed

4 files changed

+3
-2
lines changed

deploy/all-cr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ data:
111111
app.location.unitRuleId=${APPLICATION_LOCATION_UNIT_RULE_ID}
112112
app.location.unit=${APPLICATION_LOCATION_UNIT:}
113113
app.location.cell=${APPLICATION_LOCATION_CELL:${NODE_CELL:}}
114-
app.location.laneSpaceId=${APPLICATION_LOCATION_LANESPACE_ID:}
114+
app.location.laneSpaceId=${APPLICATION_LOCATION_LANESPACE_ID:default}
115115
app.location.lane=${APPLICATION_LOCATION_LANE:base}
116116
agent.enhance.shutdownOnError=${CONFIG_ENHANCE_SHUTDOWN_ON_ERROR:true}
117117
agent.enhance.excludeApp=${CONFIG_ENHANCE_EXCLUDE_APPS:com.taobao.arthas.boot.Bootstrap,org.netbeans.Main,com.jdk.JDKVersionHelper,com.tongweb.srv.commons.utils.*}

deploy/joylive-injector/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ agent:
7878
unitRuleId:
7979
unit:
8080
cell:
81-
laneSpaceId:
81+
laneSpaceId: default
8282
lane: base
8383
otel:
8484
replicas: 2
2 Bytes
Binary file not shown.

pkg/resource/control.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ func GetApplicationEnvironments(labels map[string]string) (map[string]string, er
7979
envMaps["APPLICATION_LOCATION_CLUSTER"] = config.ClusterId
8080

8181
if swimlane, ok := labels[config.SwimLaneLabel]; ok {
82+
envMaps["CONFIG_LANE_ENABLED"] = "true"
8283
envMaps["APPLICATION_LOCATION_LANE"] = swimlane
8384
}
8485

0 commit comments

Comments
 (0)