fix:修复javaagent默认properties文件的key名称

polarismesh · Feb 1, 2024 · bdabec5 · bdabec5
1 parent 89111f7
commit bdabec5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/deploy/kubernetes_v1.21/helm/templates/controller-configmap-javaagent.yaml b/deploy/kubernetes_v1.21/helm/templates/controller-configmap-javaagent.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: sidecar-injector
 data:
-  springcloud2020-default-properties: |+
+  spring-cloud2020-default-properties: |+
     # 应用名称
     spring.application.name={{ .MicroserviceName }}
     # 配置北极星服务端地址
@@ -56,7 +56,7 @@ data:
     # 指标上报暴露的 http path
     spring.cloud.polaris.stat.path=/metrics
 
-  springcloud2021-default-properties: |+
+  spring-cloud2021-default-properties: |+
     # 应用名称
     spring.application.name={{ .MicroserviceName }}
     # 配置北极星服务端地址
@@ -106,7 +106,7 @@ data:
     # 指标上报暴露的 http path
     spring.cloud.polaris.stat.path=/metrics
 
-  springcloudhoxton-default-properties: |+
+  spring-cloudhoxton-default-properties: |+
     # 应用名称
     spring.application.name={{ .MicroserviceName }}
     # 配置北极星服务端地址
@@ -155,3 +155,4 @@ data:
     spring.cloud.polaris.stat.port=0
     # 指标上报暴露的 http path
     spring.cloud.polaris.stat.path=/metrics
+
diff --git a/deploy/kubernetes_v1.21/kubernetes/javaagent-configmap.yaml b/deploy/kubernetes_v1.21/kubernetes/javaagent-configmap.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: sidecar-injector
 data:
-  springcloud2020-default-properties: |+
+  spring-cloud2020-default-properties: |+
     # 应用名称
     spring.application.name={{ .MicroserviceName }}
     # 配置北极星服务端地址
@@ -56,7 +56,7 @@ data:
     # 指标上报暴露的 http path
     spring.cloud.polaris.stat.path=/metrics
 
-  springcloud2021-default-properties: |+
+  spring-cloud2021-default-properties: |+
     # 应用名称
     spring.application.name={{ .MicroserviceName }}
     # 配置北极星服务端地址
@@ -106,7 +106,7 @@ data:
     # 指标上报暴露的 http path
     spring.cloud.polaris.stat.path=/metrics
 
-  springcloudhoxton-default-properties: |+
+  spring-cloudhoxton-default-properties: |+
     # 应用名称
     spring.application.name={{ .MicroserviceName }}
     # 配置北极星服务端地址
@@ -155,3 +155,4 @@ data:
     spring.cloud.polaris.stat.port=0
     # 指标上报暴露的 http path
     spring.cloud.polaris.stat.path=/metrics
+
diff --git a/deploy/kubernetes_v1.22/helm/templates/controller-configmap-javaagent.yaml b/deploy/kubernetes_v1.22/helm/templates/controller-configmap-javaagent.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: sidecar-injector
 data:
-  springcloud2020-default-properties: |+
+  spring-cloud2020-default-properties: |+
     # 应用名称
     spring.application.name={{ .MicroserviceName }}
     # 配置北极星服务端地址
@@ -56,7 +56,7 @@ data:
     # 指标上报暴露的 http path
     spring.cloud.polaris.stat.path=/metrics
 
-  springcloud2021-default-properties: |+
+  spring-cloud2021-default-properties: |+
     # 应用名称
     spring.application.name={{ .MicroserviceName }}
     # 配置北极星服务端地址
@@ -106,7 +106,7 @@ data:
     # 指标上报暴露的 http path
     spring.cloud.polaris.stat.path=/metrics
 
-  springcloudhoxton-default-properties: |+
+  spring-cloudhoxton-default-properties: |+
     # 应用名称
     spring.application.name={{ .MicroserviceName }}
     # 配置北极星服务端地址

diff --git a/deploy/kubernetes_v1.22/kubernetes/javaagent-configmap.yaml b/deploy/kubernetes_v1.22/kubernetes/javaagent-configmap.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: sidecar-injector
 data:
-  springcloud2020-default-properties: |+
+  spring-cloud2020-default-properties: |+
     # 应用名称
     spring.application.name={{ .MicroserviceName }}
     # 配置北极星服务端地址
@@ -56,7 +56,7 @@ data:
     # 指标上报暴露的 http path
     spring.cloud.polaris.stat.path=/metrics
 
-  springcloud2021-default-properties: |+
+  spring-cloud2021-default-properties: |+
     # 应用名称
     spring.application.name={{ .MicroserviceName }}
     # 配置北极星服务端地址
@@ -106,7 +106,7 @@ data:
     # 指标上报暴露的 http path
     spring.cloud.polaris.stat.path=/metrics
 
-  springcloudhoxton-default-properties: |+
+  spring-cloudhoxton-default-properties: |+
     # 应用名称
     spring.application.name={{ .MicroserviceName }}
     # 配置北极星服务端地址

diff --git a/pkg/inject/pkg/kube/inject/apply/javaagent/patch.go b/pkg/inject/pkg/kube/inject/apply/javaagent/patch.go
@@ -84,11 +84,13 @@ func (pb *PodPatchBuilder) PatchContainer(req *inject.OperateContainerRequest) (
 
 func (pb *PodPatchBuilder) handleJavaAgentInit(opt *inject.PatchOptions, pod *corev1.Pod, add *corev1.Container) error {
 	annonations := pod.Annotations
-	log.InjectScope().Infof("handle polaris-javaagent-init inject for pod=[%s, %s] annonations: %#v",
-		pod.Namespace, pod.Name, pod.Annotations)
+	log.InjectScope().Infof("handle polaris-javaagent-init inject for pod=[%s, %s] annonations: %#v image: %s",
+		pod.Namespace, pod.Name, pod.Annotations, add.Image)
 	// 判断用户是否自定义了 javaagent 的版本
 	oldImageInfo := strings.Split(add.Image, ":")
-	opt.ExternalInfo[customJavaAgentVersion] = oldImageInfo[1]
+	if len(oldImageInfo) > 1 {
+		opt.ExternalInfo[customJavaAgentVersion] = oldImageInfo[1]
+	}
 	if val, ok := annonations[customJavaAgentVersion]; ok {
 		add.Image = fmt.Sprintf("%s:%s", oldImageInfo[0], val)
 		opt.ExternalInfo[customJavaAgentVersion] = val