Skip to content

Commit bdabec5

Browse files
chuntaojunchuntaojun
authored
fix:修复javaagent默认properties文件的key名称
1 parent 89111f7 commit bdabec5

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

‎deploy/kubernetes_v1.21/helm/templates/controller-configmap-javaagent.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
app: sidecar-injector
88
data:
9-
springcloud2020-default-properties: |+
9+
spring-cloud2020-default-properties: |+
1010
# 应用名称
1111
spring.application.name={{ .MicroserviceName }}
1212
# 配置北极星服务端地址
@@ -56,7 +56,7 @@ data:
5656
# 指标上报暴露的 http path
5757
spring.cloud.polaris.stat.path=/metrics
5858
59-
springcloud2021-default-properties: |+
59+
spring-cloud2021-default-properties: |+
6060
# 应用名称
6161
spring.application.name={{ .MicroserviceName }}
6262
# 配置北极星服务端地址
@@ -106,7 +106,7 @@ data:
106106
# 指标上报暴露的 http path
107107
spring.cloud.polaris.stat.path=/metrics
108108
109-
springcloudhoxton-default-properties: |+
109+
spring-cloudhoxton-default-properties: |+
110110
# 应用名称
111111
spring.application.name={{ .MicroserviceName }}
112112
# 配置北极星服务端地址
@@ -155,3 +155,4 @@ data:
155155
spring.cloud.polaris.stat.port=0
156156
# 指标上报暴露的 http path
157157
spring.cloud.polaris.stat.path=/metrics
158+

‎deploy/kubernetes_v1.21/kubernetes/javaagent-configmap.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
app: sidecar-injector
88
data:
9-
springcloud2020-default-properties: |+
9+
spring-cloud2020-default-properties: |+
1010
# 应用名称
1111
spring.application.name={{ .MicroserviceName }}
1212
# 配置北极星服务端地址
@@ -56,7 +56,7 @@ data:
5656
# 指标上报暴露的 http path
5757
spring.cloud.polaris.stat.path=/metrics
5858
59-
springcloud2021-default-properties: |+
59+
spring-cloud2021-default-properties: |+
6060
# 应用名称
6161
spring.application.name={{ .MicroserviceName }}
6262
# 配置北极星服务端地址
@@ -106,7 +106,7 @@ data:
106106
# 指标上报暴露的 http path
107107
spring.cloud.polaris.stat.path=/metrics
108108
109-
springcloudhoxton-default-properties: |+
109+
spring-cloudhoxton-default-properties: |+
110110
# 应用名称
111111
spring.application.name={{ .MicroserviceName }}
112112
# 配置北极星服务端地址
@@ -155,3 +155,4 @@ data:
155155
spring.cloud.polaris.stat.port=0
156156
# 指标上报暴露的 http path
157157
spring.cloud.polaris.stat.path=/metrics
158+

‎deploy/kubernetes_v1.22/helm/templates/controller-configmap-javaagent.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
app: sidecar-injector
88
data:
9-
springcloud2020-default-properties: |+
9+
spring-cloud2020-default-properties: |+
1010
# 应用名称
1111
spring.application.name={{ .MicroserviceName }}
1212
# 配置北极星服务端地址
@@ -56,7 +56,7 @@ data:
5656
# 指标上报暴露的 http path
5757
spring.cloud.polaris.stat.path=/metrics
5858
59-
springcloud2021-default-properties: |+
59+
spring-cloud2021-default-properties: |+
6060
# 应用名称
6161
spring.application.name={{ .MicroserviceName }}
6262
# 配置北极星服务端地址
@@ -106,7 +106,7 @@ data:
106106
# 指标上报暴露的 http path
107107
spring.cloud.polaris.stat.path=/metrics
108108
109-
springcloudhoxton-default-properties: |+
109+
spring-cloudhoxton-default-properties: |+
110110
# 应用名称
111111
spring.application.name={{ .MicroserviceName }}
112112
# 配置北极星服务端地址

‎deploy/kubernetes_v1.22/kubernetes/javaagent-configmap.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
app: sidecar-injector
88
data:
9-
springcloud2020-default-properties: |+
9+
spring-cloud2020-default-properties: |+
1010
# 应用名称
1111
spring.application.name={{ .MicroserviceName }}
1212
# 配置北极星服务端地址
@@ -56,7 +56,7 @@ data:
5656
# 指标上报暴露的 http path
5757
spring.cloud.polaris.stat.path=/metrics
5858
59-
springcloud2021-default-properties: |+
59+
spring-cloud2021-default-properties: |+
6060
# 应用名称
6161
spring.application.name={{ .MicroserviceName }}
6262
# 配置北极星服务端地址
@@ -106,7 +106,7 @@ data:
106106
# 指标上报暴露的 http path
107107
spring.cloud.polaris.stat.path=/metrics
108108
109-
springcloudhoxton-default-properties: |+
109+
spring-cloudhoxton-default-properties: |+
110110
# 应用名称
111111
spring.application.name={{ .MicroserviceName }}
112112
# 配置北极星服务端地址

‎pkg/inject/pkg/kube/inject/apply/javaagent/patch.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,13 @@ func (pb *PodPatchBuilder) PatchContainer(req *inject.OperateContainerRequest) (
8484

8585
func (pb *PodPatchBuilder) handleJavaAgentInit(opt *inject.PatchOptions, pod *corev1.Pod, add *corev1.Container) error {
8686
annonations := pod.Annotations
87-
log.InjectScope().Infof("handle polaris-javaagent-init inject for pod=[%s, %s] annonations: %#v",
88-
pod.Namespace, pod.Name, pod.Annotations)
87+
log.InjectScope().Infof("handle polaris-javaagent-init inject for pod=[%s, %s] annonations: %#v image: %s",
88+
pod.Namespace, pod.Name, pod.Annotations, add.Image)
8989
// 判断用户是否自定义了 javaagent 的版本
9090
oldImageInfo := strings.Split(add.Image, ":")
91-
opt.ExternalInfo[customJavaAgentVersion] = oldImageInfo[1]
91+
if len(oldImageInfo) > 1 {
92+
opt.ExternalInfo[customJavaAgentVersion] = oldImageInfo[1]
93+
}
9294
if val, ok := annonations[customJavaAgentVersion]; ok {
9395
add.Image = fmt.Sprintf("%s:%s", oldImageInfo[0], val)
9496
opt.ExternalInfo[customJavaAgentVersion] = val

0 commit comments

Comments
 (0)